项目基础模块，业务模块分离

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertFormDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/AlertFormDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertFormInitDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/AlertFormInitDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import java.io.Serializable;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertFormTypeDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/AlertFormTypeDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertFormValueDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/AlertFormValueDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertListvalue.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/AlertListvalue.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 /*
 *
 * 下拉表单值

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/DataDictionaryDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DataDictionaryDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ExcelDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ExcelDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireBrigadeResourceDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 消防队伍下资源dto
+ *
+ * @author DELL
+ */
+@Data
+public class FireBrigadeResourceDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "资源id")
+    private String id;
+
+    @ApiModelProperty(value = "资源名称")
+    private String name;
+
+    @ApiModelProperty(value = "资源图片")
+    private List<String> image;
+
+    @ApiModelProperty(value = "资源类型")
+    private String type;
+
+    @ApiModelProperty(value = "所属队伍id")
+    private String teamId;
+
+    @ApiModelProperty(value = "所属队伍名称")
+    private String teamName;
+
+    @ApiModelProperty(value = "车辆牌号")
+    private String carNum;
+
+    @ApiModelProperty(value = "车辆状态code")
+    private String carState;
+
+    @ApiModelProperty(value = "车辆状态描述")
+    private String carStateDesc;
+
+    @ApiModelProperty(value = "队伍下人员数量")
+    private int personCount;
+
+    @ApiModelProperty(value = "车辆类型")
+    private String categoryName;
+
+    @ApiModelProperty(value = "执勤车辆个数")
+    private Integer onDutyCount;
+
+    @ApiModelProperty(value = "出动车辆个数")
+    private Integer outCount;
+
+    @ApiModelProperty(value = "子资源节点")
+    private List<FireBrigadeResourceDto> children = Lists.newArrayList();
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireChemicalDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,75 +13,91 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
-* 危化品
-*
-* @author system_generator
-* @date 2021-06-29
-*/
+ * 危化品
+ *
+ * @author system_generator
+ * @date 2021-06-29
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="FireChemicalDto", description="危化品")
-public class FireChemicalDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
+@ApiModel(value = "FireChemicalDto", description = "危化品")
+public class FireChemicalDto extends BaseDto {
+    @ExcelIgnore
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "casNo")
+    @ExcelProperty(value = "casNo", index = 1)
     private String casNo;
 
     @ApiModelProperty(value = "国际危险号")
+    @ExcelProperty(value = "国际危险号", index = 2)
     private String dangerId;
 
     @ApiModelProperty(value = "防护处理")
+    @ExcelProperty(value = "防护处理", index = 3)
     private String defendWay;
 
     @ApiModelProperty(value = "处理措施")
+    @ExcelProperty(value = "处理措施", index = 4)
     private String dispose;
 
     @ApiModelProperty(value = "英文名")
+    @ExcelProperty(value = "英文名", index = 5)
     private String englishName;
 
     @ApiModelProperty(value = "分子式")
+    @ExcelProperty(value = "分子式", index = 6)
     private String formula;
 
     @ApiModelProperty(value = "主要成分")
+    @ExcelProperty(value = "主要成分", index = 7)
     private String ingredient;
 
     @ApiModelProperty(value = "泄漏处理")
+    @ExcelProperty(value = "泄漏处理", index = 8)
     private String leakWay;
-
+    @ExcelProperty(value = "中文名", index = 0)
     @ApiModelProperty(value = "中文名")
     private String name;
 
     @ApiModelProperty(value = "性状")
+    @ExcelProperty(value = "性状", index = 9)
     private String property;
 
     @ApiModelProperty(value = "贮藏方法")
+    @ExcelProperty(value = "贮藏方法", index = 10)
     private String store;
 
     @ApiModelProperty(value = "症状")
+    @ExcelProperty(value = "症状", index = 11)
     private String symptom;
 
     @ApiModelProperty(value = "禁忌物/禁忌")
+    @ExcelProperty(value = "禁忌物/禁忌", index = 12)
     private String tabu;
-
+    @ExcelIgnore
     @ApiModelProperty(value = "类型code")
     private String typeCode;
 
+    @ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 13, sourceClass = ExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "类型名称")
+    @ExcelProperty(value = "类型名称", index = 13)
     private String type;
-
+    //    @ExplicitConstraint(indexNum=14,source = {"男","女"}) //固定下拉内容
+    @ExcelProperty(value = "国标号", index = 14)
     @ApiModelProperty(value = "国标号")
     private String un;
 
     @ApiModelProperty(value = "化学品图片")
+    @ExcelProperty(value = "化学品图片", index = 15)
     private String image;
-
+    @ExcelIgnore
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-
+    @ExcelIgnore
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireExpertsDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,90 +21,124 @@ import java.util.Date;
 @ApiModel(value = "FireExpertsDto", description = "")
 public class FireExpertsDto extends BaseDto {
 
+    @ExcelProperty(value = "姓名", index = 0)
     @ApiModelProperty(value = "姓名")
     private String name;
 
+    @ExcelProperty(value = "单位", index = 1)
+    @ApiModelProperty(value = "单位")
+    private String companyName;
+
+    @ExplicitConstraint(type = "RYZJLX", indexNum = 2, sourceClass = ExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "证件类型", index = 2)
     @ApiModelProperty(value = "证件类型")
     private String certificatesType;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "证件类型code")
     private String certificatesTypeCode;
 
+    @ExcelProperty(value = "证件号", index = 3)
     @ApiModelProperty(value = "证件号")
-    private Long certificatesNum;
-
-    @ApiModelProperty(value = "单位")
-    private String companyName;
+    private String certificatesNum;
 
+    @ExplicitConstraint(indexNum = 4, source = {"男", "女"}) //固定下拉内容
+    @ExcelProperty(value = "性别", index = 4)
     @ApiModelProperty(value = "性别")
     private String gender;
 
-    @ApiModelProperty(value = "名族")
+    @ExcelProperty(value = "出生日期", index = 5)
+    @ApiModelProperty(value = "出生日期")
+    private Date birthdayTime;
+
+    @ExcelProperty(value = "民族", index = 6)
+    @ApiModelProperty(value = "民族")
     private String nation;
 
+    @ExcelProperty(value = "籍贯", index = 7)
     @ApiModelProperty(value = "籍贯")
     private String nativePlace;
 
+    @ExcelProperty(value = "政治面貌", index = 8)
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalOutlook;
+
+    @ExcelProperty(value = "现居住地", index = 9)
     @ApiModelProperty(value = "现居住地")
     private String residence;
 
-    @ApiModelProperty(value = "现居住地")
+    @ExcelProperty(value = "居住地详情", index = 10)
+    @ApiModelProperty(value = "居住地详情")
     private String residenceDetails;
 
-    @ApiModelProperty(value = "政治面貌")
-    private String politicalOutlook;
-
-    @ApiModelProperty(value = "办公用 电话")
+    @ExcelProperty(value = "办公电话", index = 11)
+    @ApiModelProperty(value = "办公电话")
     private String officePhone;
 
+    @ExcelProperty(value = "移动电话", index = 12)
     @ApiModelProperty(value = "移动电话")
     private String mobilePhone;
 
+    @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = ExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "最高学历", index = 13)
     @ApiModelProperty(value = "最高学历")
     private String highestEducation;
 
+    @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = ExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位名称", index = 14)
     @ApiModelProperty(value = "岗位名称")
     private String jobs;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "岗位名称code")
     private String jobsCode;
 
+    @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = ExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防专家领域", index = 15)
     @ApiModelProperty(value = "消防专家领域")
     private String expert;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "消防专家领域code")
     private String expertCode;
 
+    @ExcelProperty(value = "人员照片", index = 16)
     @ApiModelProperty(value = "人员照片")
     private String personnelPhotos;
 
+    @ExcelProperty(value = "资质证书", index = 17)
     @ApiModelProperty(value = "资质证书")
     private String qualificationCertificate;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "人员状态，在职/离职")
     private String state;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "人员状态，在职/离职code")
     private String stateCode;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "消防机构id")
     private Long fireTeamId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "消防机构name")
     private Long fireTeamName;
 
+    @ExcelProperty(value = "备注", index = 18)
     @ApiModelProperty(value = "备注")
     private String note;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
-    @ApiModelProperty(value = "出生日期")
-    private Date birthdayTime;
-
+    @ExcelIgnore
     @ApiModelProperty(value = "年龄")
     private Integer age;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireStationDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -68,9 +69,11 @@ public class FireStationDto  extends BaseDto {
     private String bizCompanyCode;
 
     @ApiModelProperty(value = "建造日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date buildTime;
 
     @ApiModelProperty(value = "启用日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date enableTime;
 
     @ApiModelProperty(value = "图片信息")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireTeamCardDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamCardDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireTeamDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireTeamListDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamListDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersContactsDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersContactsDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersContractDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersContractDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersDataDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersDataDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersWorkexperience;
 
 /**
  * @author DELL

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersEducationDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersEducationDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersInfoDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersInfoDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersJacketDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersJacketDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersPostDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersPostDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersThoughtDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersThoughtDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersWorkexperienceDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersWorkexperienceDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FormValue.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FormValue.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import java.io.Serializable;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/Items.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/Items.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgDepartmentDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgDepartmentDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgDepartmentFormDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgDepartmentFormDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgMenuDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgMenuDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgPersonDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgPersonDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import java.util.List;
 
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgPersonFormDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgPersonFormDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgUsrAuthDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrAuthDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgUsrDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/OrgUsrFormDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrFormDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
+package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceCraneDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceCraneDto", description="")
+@ApiModel(value="WaterResourceCraneDto", description="消防水鹤")
 public class WaterResourceCraneDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceHydrantDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceHydrantDto", description="")
+@ApiModel(value="WaterResourceHydrantDto", description="消火栓")
 public class WaterResourceHydrantDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceIotDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceIotDto", description="")
+@ApiModel(value="WaterResourceIotDto", description="物联参数")
 public class WaterResourceIotDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
@@ -21,7 +21,7 @@ public class WaterResourceIotDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "主键id")
-    private Long sequencNbr;
+    private Long sequenceNbr;
 
     @ApiModelProperty(value = "资源类型")
     private String resourceType;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceNaturalDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceNaturalDto", description="")
+@ApiModel(value="WaterResourceNaturalDto", description="天然水源")
 public class WaterResourceNaturalDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourcePoolDto.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourcePoolDto", description="")
+@ApiModel(value="WaterResourcePoolDto", description="消防水池")
 public class WaterResourcePoolDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertForm.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/AlertForm.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormType.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/AlertFormType.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormValue.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/AlertFormValue.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/DataDictionary.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DataDictionary.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireExperts.java

@@ -31,7 +31,7 @@ public class FireExperts extends BaseEntity {
     private String certificatesTypeCode;
 
     @ApiModelProperty(value = "证件号")
-    private Long certificatesNum;
+    private String certificatesNum;
 
     @ApiModelProperty(value = "单位")
     private String companyName;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireStation.java

@@ -9,6 +9,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
 /**
 * 微型消防站
 *
@@ -71,9 +73,11 @@ public class FireStation extends BaseEntity {
     private String bizCompanyCode;
 
     @ApiModelProperty(value = "建造日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date buildTime;
 
     @ApiModelProperty(value = "启用日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date enableTime;
 
     @ApiModelProperty(value = "图片信息")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireTeam.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireTeam.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Firefighters.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/Firefighters.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersContacts.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersContacts.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersContract.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersContract.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersEducation.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersEducation.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersJacket.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersJacket.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersPost.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersPost.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersThought.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersThought.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersWorkexperience.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersWorkexperience.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/OrgUsr.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsr.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/OrgUsrAuth.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsrAuth.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
+package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResource.java

@@ -42,8 +42,13 @@ public class WaterResource extends BaseEntity {
     /**
 	  * 资源类型（消火栓、消防水鹤、天然水源、消防水池）
      */
-	@TableField("type")
-    private String type;
+	@TableField("resource_type")
+    private String resourceType;
+    /**
+     * 资源类型名称（消火栓、消防水鹤、天然水源、消防水池）
+     */
+    @TableField("resource_type_name")
+    private String resourceTypeName;
     /**
 	  * 所在建筑id
      */
@@ -139,4 +144,9 @@ public class WaterResource extends BaseEntity {
      */
 	@TableField("org_code")
     private String orgCode;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceCrane.java

@@ -91,4 +91,9 @@ public class WaterResourceCrane extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceHydrant.java

@@ -116,4 +116,9 @@ public class WaterResourceHydrant extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceIot.java

@@ -22,11 +22,6 @@ public class WaterResourceIot extends BaseEntity {
 
 
     /**
-	  * 主键id
-     */
-	@TableField("sequenc_nbr")
-    private Long sequencNbr;
-    /**
 	  * 资源类型
      */
 	@TableField("resource_type")
@@ -61,4 +56,9 @@ public class WaterResourceIot extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourceNatural.java

@@ -86,4 +86,9 @@ public class WaterResourceNatural extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java

@@ -91,4 +91,9 @@ public class WaterResourcePool extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+    /**
+     * 是否启用
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/OrgPersonEnum.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/OrgPersonEnum.java

-package com.yeejoin.amos.boot.module.jcs.api.enums;
+package com.yeejoin.amos.boot.module.common.api.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/WaterResourceTypeEnum.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/WaterResourceTypeEnum.java

-package com.yeejoin.amos.boot.module.jcs.api.enums;
+package com.yeejoin.amos.boot.module.common.api.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/DataSources.java

+package com.yeejoin.amos.boot.module.common.api.excel;
+
+import java.util.List;
+
+/**
+ * 
+ * 字段列动态值获取
+ * 
+ * ***/
+public interface DataSources {
+	String[]  selectList(String type,String method);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/ExcelListener.java

+package com.yeejoin.amos.boot.module.common.api.excel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+
+//如果没有特殊说明，下面的案例将默认使用这个监听器
+public class ExcelListener<T> extends AnalysisEventListener<T> {
+
+ List<T> list = new ArrayList<T>();
+ 
+ public List<T> getList() {
+	return list;
+}
+
+public void setList(List<T> list) {
+	this.list = list;
+}
+
+/**
+  * 如果使用了spring,请使用这个构造方法。每次创建Listener的时候需要把spring管理的类传进来
+  */
+ public ExcelListener() {}
+
+ /**
+  * 这个每一条数据解析都会来调用
+  *
+  * @param data
+  * @param context
+  */
+ @Override
+ public void invoke(T data, AnalysisContext context) {
+     list.add(data);
+ }
+
+ /**
+  * 所有数据解析完成了 都会来调用
+  *
+  * @param context
+  */
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+	 
+ }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/ExplicitConstraint.java

+package com.yeejoin.amos.boot.module.common.api.excel;
+
+import java.lang.annotation.*;
+/**
+* 导出模板数据
+*/
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface ExplicitConstraint {
+    //定义固定下拉内容
+    String[]source()default {};
+    //定义动态下拉内容，
+    Class[]sourceClass()default {};
+    //列标号必须和字段下标一致
+	int indexNum() default 0;
+	//字典type
+	String type() default "";
+	//接口查询
+	String method() default "";
+	
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/excel/SelectionDataInterface.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/ExplicitInterface.java

-package com.yeejoin.amos.boot.module.jcs.api.excel;
+package com.yeejoin.amos.boot.module.common.api.excel;
 
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
 
-public interface SelectionDataInterface {
+public interface ExplicitInterface {
     /**
      * 动态下拉列表的内容数组
      * @return
      * type 字典类型
      */
-    String[] source(String methodName);
+    String[] source(String type,String method,DataSources dataDictionaryMapper);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/RoleNameExplicitConstraint.java

+//package com.yeejoin.amos.boot.module.common.api.excel;
+//
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
+//import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+//
+///***
+// *
+// * 获取动态值
+// *
+// * **/
+//public class RoleNameExplicitConstraint implements ExplicitInterface {
+//
+//    @Override
+//    public String[] source(String type, DataSources dataDictionaryMapper) {
+//        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("type", type);
+//        queryWrapper.isNull("parent");
+//        queryWrapper.orderByAsc("sort_num");
+//        List<DataDictionary> list = dataDictionaryMapper.selectList(queryWrapper);
+//        List<String> names = list.stream().map(dataDictionary -> {
+//                    return dataDictionary.getName() + "@" + dataDictionary.getCode();
+//                }
+//        ).collect(Collectors.toList());
+//        String[] str = names.toArray(new String[names.size()]);
+//        return str;
+//    }
+//}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/TemplateCellWriteHandler.java

+package com.yeejoin.amos.boot.module.common.api.excel;
+
+import org.apache.poi.hssf.usermodel.HSSFRichTextString;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.DataFormat;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.Workbook;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+
+/**
+ * excel通用单元格格式类
+ */
+public class TemplateCellWriteHandler implements CellWriteHandler {
+ 
+	@Override
+	public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
+			Head head, int relativeRowIndex, boolean isHead) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData,
+			Cell cell, Head head, int relativeRowIndex, boolean isHead) {
+		   Workbook workbooks = writeSheetHolder.getSheet().getWorkbook();
+		   
+		   if (0 == cell.getRowIndex()) {
+		   writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), 20 * 256);
+	        CellStyle cellStyle = workbooks.createCellStyle();
+	        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//居中
+	        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+	        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);//设置前景填充样式
+	        cellStyle.setFillForegroundColor(IndexedColors.ROYAL_BLUE.getIndex());//前景填充色
+	        Font font1 = workbooks.createFont();//设置字体
+	        font1.setBold(true);
+	        font1.setColor((short)1);
+	        font1.setFontHeightInPoints((short)15);
+	        cellStyle.setFont(font1);
+	        cell.setCellStyle(cellStyle);
+		   }
+//	        //其他列
+//	        if (!isHead){
+//	            CellStyle style = workbooks.createCellStyle();
+//	            DataFormat dataFormat = workbooks.createDataFormat();
+//	            style.setDataFormat(dataFormat.getFormat("@"));
+//	            style.setVerticalAlignment(VerticalAlignment.CENTER);
+//	            style.setAlignment(HorizontalAlignment.CENTER);
+//	            cell.setCellStyle(style);
+//	        }
+//	        //设置日期
+//	        if (!isHead && cell.getColumnIndex()==19 || !isHead && cell.getColumnIndex()==21|| !isHead && cell.getColumnIndex()==20){
+//	            CellStyle style = workbooks.createCellStyle();
+//	            DataFormat dataFormat = workbooks.createDataFormat();
+//	            style.setDataFormat(dataFormat.getFormat("yyyy/mm/dd hh:mm:ss"));
+//	            style.setVerticalAlignment(VerticalAlignment.CENTER);
+//	            style.setAlignment(HorizontalAlignment.CENTER);
+//	            cell.setCellStyle(style);
+//	        }
+//	        //设置金额
+//	        if (!isHead && cell.getColumnIndex()==15 ||!isHead && cell.getColumnIndex()==16||!isHead && cell.getColumnIndex()==22 ||!isHead && cell.getColumnIndex()==24||!isHead && cell.getColumnIndex()==25){
+//	            CellStyle style = workbooks.createCellStyle();
+//	            DataFormat dataFormat = workbooks.createDataFormat();
+//	            style.setDataFormat(dataFormat.getFormat("0.00"));
+//	            style.setVerticalAlignment(VerticalAlignment.CENTER);
+//	            style.setAlignment(HorizontalAlignment.CENTER);
+//	            cell.setCellStyle(style);
+//	        }	
+		   
+	}
+		
+	
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/TemplateCellWriteHandlerDate.java

+package com.yeejoin.amos.boot.module.common.api.excel;
+
+
+import org.apache.poi.ss.usermodel.DataValidationHelper;
+import org.apache.poi.ss.usermodel.Name;
+import org.apache.poi.ss.usermodel.Workbook;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.handler.SheetWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
+import org.apache.poi.ss.usermodel.DataValidation;
+import org.apache.poi.ss.usermodel.DataValidationConstraint;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * excel通用单元格格式类下拉框赋值
+ */
+public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
+ 
+    /**
+     * 构造器注入
+     */
+   
+    private Map<Integer, String[]> explicitListConstraintMap = new HashMap<>();
+    public TemplateCellWriteHandlerDate(Map<Integer, String[]> explicitListConstraintMap) {
+        this.explicitListConstraintMap = explicitListConstraintMap;
+    }
+    /**
+     * 避免生成的导入模板下拉值获取不到
+     */
+    private static final Integer LIMIT_NUMBER = 50;
+   
+
+		
+	/**
+     * 返回excel列标A-Z-AA-ZZ
+     *
+     * @param num 列数
+     * @return java.lang.String
+     */
+    private String getExcelLine(int num) {
+        String line = "";
+        int first = num / 26;
+        int second = num % 26;
+        if (first > 0) {
+            line = (char) ('A' + first - 1) + "";
+        }
+        line += (char) ('A' + second) + "";
+        return line;
+    }
+
+	@Override
+	public void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+		
+		if(explicitListConstraintMap!=null) {
+			 // 这里可以对cell进行任何操作
+	        Sheet sheet = writeSheetHolder.getSheet();
+	        DataValidationHelper helper = sheet.getDataValidationHelper();
+
+	        // k 为存在下拉数据集的单元格下表 v为下拉数据集
+	        explicitListConstraintMap.forEach((k, v) -> {
+	            // 设置下拉单元格的首行 末行 首列 末列
+	            CellRangeAddressList rangeList = new CellRangeAddressList(1, 65536, k, k);
+	            // 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
+	            if (v.length > LIMIT_NUMBER) {
+	                //定义sheet的名称
+	                //1.创建一个隐藏的sheet 名称为 hidden + k
+	                String sheetName = "hidden" + k;
+	                Workbook workbook = writeWorkbookHolder.getWorkbook();
+	                Sheet hiddenSheet = workbook.createSheet(sheetName);
+	                for (int i = 0, length = v.length; i < length; i++) {
+	                    // 开始的行数i，列数k
+	                    hiddenSheet.createRow(i).createCell(k).setCellValue(v[i]);
+	                }
+	                Name category1Name = workbook.createName();
+	                category1Name.setNameName(sheetName);
+	                String excelLine = getExcelLine(k);
+	                // =hidden!$H:$1:$H$50  sheet为hidden的 H1列开始H50行数据获取下拉数组
+	                String refers = "=" + sheetName + "!$" + excelLine + "$1:$" + excelLine + "$" + (v.length + 1);
+	                // 将刚才设置的sheet引用到你的下拉列表中
+	                DataValidationConstraint constraint = helper.createFormulaListConstraint(refers);
+	                DataValidation dataValidation = helper.createValidation(constraint, rangeList);
+	                writeSheetHolder.getSheet().addValidationData(dataValidation);
+	                // 设置存储下拉列值得sheet为隐藏
+	                int hiddenIndex = workbook.getSheetIndex(sheetName);
+	                if (!workbook.isSheetHidden(hiddenIndex)) {
+	                    workbook.setSheetHidden(hiddenIndex, true);
+	                }
+	            }
+	            // 下拉列表约束数据
+	            DataValidationConstraint constraint = helper.createExplicitListConstraint(v);
+	            // 设置约束
+	            DataValidation validation = helper.createValidation(constraint, rangeList);
+	            // 阻止输入非下拉选项的值
+	            validation.setErrorStyle(DataValidation.ErrorStyle.STOP);
+	            validation.setShowErrorBox(true);
+	            validation.setSuppressDropDownArrow(true);
+	            validation.createErrorBox("提示", "此值与单元格定义格式不一致");
+	            // validation.createPromptBox("填写说明：","填写内容只能为下拉数据集中的单位，其他单位将会导致无法入仓");
+	            sheet.addValidationData(validation);
+	        });	
+		}
+
+		
+	}
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertFormMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/AlertFormMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertForm;
 
 /**
 * 警情表单 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertFormTypeMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/AlertFormTypeMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormType;
 
 /**
 * 动态表单类型 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertFormValueMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/AlertFormValueMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormValueDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertFormValueDto;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
 
 import java.util.List;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/DataDictionaryMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DataDictionaryMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
 
 /**
 * 数据字典 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
+
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -21,16 +22,18 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 	
 	@Select("<script>"
 			+ "select * from  cb_fire_station  where cb_fire_station.is_delete=0 "
-			+ "<if test='par.name!=null'> and cb_fire_station.name like  '%'#{par.name}'%' </if>"	
-			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"	
+			+ "<if test='par.name!=null'> and cb_fire_station.name like  CONCAT('%',#{par.name},'%') </if>"	
+			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
+			+ "<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
 			+"limit  #{pageNum},#{pageSize}"
 			+ "</script>")	
 	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
 	@Select("<script>"
 			+ "select COUNT(cb_fire_station.sequence_nbr) num from  cb_fire_station  where cb_fire_station.is_delete=0 "
-			+ "<if test='par.name!=null'> and cb_fire_station.name like  '%'#{par.name}'%' </if>"	
-			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"	
+			+ "<if test='par.name!=null'> and cb_fire_station.name like  CONCAT('%',#{par.name},'%') </if>"	
+			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
+			+ "<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
 			+ "</script>")	
-	 Map<String, Long> getFireStationCount(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
+	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par);
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireTeamMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireTeamMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireBrigadeResourceDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamCardDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamListDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
-
-import java.util.List;
+import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireTeamListDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 
 /**
 * 消防队伍 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersContactsMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersContactsMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 
 /**
 * l联系人 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersContractMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersContractMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
 
 /**
 * 消防员合同 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersEducationMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersEducationMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
 
 /**
 * 人员学历 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersJacketMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersJacketMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
 
 /**
 * 消防人员配装记录 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import java.util.List;
 import java.util.Map;
@@ -7,8 +7,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 
 /**
 * 消防队员 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersPostMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersPostMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
 
 /**
 * 岗位信息 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersThoughtMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersThoughtMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
 
 /**
 * 消防员思想谈话记录 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersWorkexperienceMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersWorkexperienceMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersWorkexperience;
 
 /**
 * 工作经历 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrgUsrAuthMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrAuthMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsrAuth;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrgUsrMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceCraneMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceHydrantMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceIotMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIot;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIot;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
+
+import java.util.List;
 
 /**
-*  Mapper 接口
-*
-* @author system_generator
-* @date 2021-06-29
-*/
+ * Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-06-29
+ */
 public interface WaterResourceMapper extends BaseMapper<WaterResource> {
 
+    List<WaterResourceDto> exportToExcel(Boolean isDelete);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceNaturalMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourcePoolMapper.java

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertFormService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IAlertFormService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
+package com.yeejoin.amos.boot.module.common.api.service;
 
 /**
 * 警情表单 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertFormTypeService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IAlertFormTypeService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
+package com.yeejoin.amos.boot.module.common.api.service;
 
 /**
 * 动态表单类型 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertFormValueService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IAlertFormValueService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
+package com.yeejoin.amos.boot.module.common.api.service;
 
 /**
 *  服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IDataDictionaryService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDataDictionaryService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
+package com.yeejoin.amos.boot.module.common.api.service;
 
 /**
 * 数据字典 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireStationService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+
 import org.apache.ibatis.annotations.Param;
 
 /**