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

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="危化品")
+@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/WaterResourceDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import java.util.Date;
+import java.util.List;
+
+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 com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 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="WaterResourceDto", description="")
+@ApiModel(value = "WaterResourceDto", description = "水资源")
 public class WaterResourceDto extends BaseDto {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
-
-
+    @ExcelProperty(value = "名称", index = 0)
     @ApiModelProperty(value = "资源名称")
     private String name;
 
+    @ExcelProperty(value = "地址", index = 1)
     @ApiModelProperty(value = "地址")
     private String address;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "经纬度坐标")
     private String latLang;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "资源类型（消火栓、消防水鹤、天然水源、消防水池）")
-    private String type;
+    private String resourceType;
+
+    @ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = ExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "资源类型", index = 2)
+    @ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
+    private String resourceTypeName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "所在建筑id")
     private Long belongBuildingId;
 
+//    @ExplicitConstraint(indexNum = 3, sourceClass = SelectionDataFromInterface.class, method = "getBuildingList")
+    //动态下拉内容
+    @ExcelProperty(value = "所在建筑", index = 3)
     @ApiModelProperty(value = "所在建筑")
     private String belongBuilding;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "所属消防系统id")
     private Long belongFightingSystemId;
 
+//    @ExplicitConstraint(indexNum = 4, sourceClass = SelectionDataFromInterface.class, method = "getFireSystemList")
+    //动态下拉内容
+    @ExcelProperty(value = "所属消防系统", index = 4)
     @ApiModelProperty(value = "所属消防系统")
     private String belongFightingSystem;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "管理单位id")
     private Long managementUnitId;
 
+    @ExcelProperty(value = "管理单位", index = 5)
     @ApiModelProperty(value = "管理单位")
     private String managementUnit;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "维保单位id")
     private Long maintenanceUnitId;
 
+    @ExcelProperty(value = "维保单位", index = 6)
     @ApiModelProperty(value = "维保单位")
     private String maintenanceUnit;
 
+    @ExcelProperty(value = "建造日期", index = 7)
     @ApiModelProperty(value = "建造日期")
     private Date buildDate;
 
+    @ExcelProperty(value = "启用日期", index = 8)
     @ApiModelProperty(value = "启用日期")
     private Date enableDate;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "方位图集合")
+    private List<Object> orientationImgList;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "实景图集合")
+    private List<Object> realityImgList;
+
+    @ExcelProperty(value = "方位图", index = 9)
     @ApiModelProperty(value = "方位图")
     private String orientationImg;
 
+    @ExcelProperty(value = "实景图", index = 10)
     @ApiModelProperty(value = "实景图")
     private String realityImg;
 
+    @ExcelProperty(value = "联系人姓名", index = 11)
     @ApiModelProperty(value = "联系人姓名")
     private String contactUser;
 
+    @ExcelProperty(value = "联系人电话", index = 12)
     @ApiModelProperty(value = "联系人电话")
     private String contactPhone;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "是否有物联参数（1有，0没有）")
     private Boolean isIot;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "消防救援机构_通用唯一识别码")
     private String rescueOrgCode;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "行政区划代码")
     private String administrativeCode;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "更新人员")
     private String recUserName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "组织机构代码")
     private String orgCode;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "资源id")
+    private Long resourceId;
+
+    @ExcelProperty(value = "高度（cm）", index = 13)
+    @ApiModelProperty(value = "高度（cm）")
+    private Float height;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "水源可用状态类别代码")
+    private String statusCode;
+
+    @ExcelProperty(value = "水源可用状态", index = 14)
+    @ApiModelProperty(value = "水源可用状态类别名称")
+    private String status;
+
+    @ExcelProperty(value = "所属路段", index = 15)
+    @ApiModelProperty(value = "所属路段")
+    private String section;
+
+    @ExcelProperty(value = "所属管网", index = 16)
+    @ApiModelProperty(value = "所属管网")
+    private String pipeNetwork;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "消防给水管网形式类型代码")
+    private String pipeTypeCode;
+
+    @ExcelProperty(value = "消防给水管网形式", index = 17)
+    @ApiModelProperty(value = "消防给水管网形式")
+    private String pipeTypeName;
+
+    @ExcelProperty(value = "管网直径（cm）", index = 18)
+    @ApiModelProperty(value = "管网直径（cm）")
+    private Float pipeDiameter;
+
+    @ExcelProperty(value = "进水管直径(cm)", index = 19)
+    @ApiModelProperty(value = "进水管直径(cm)")
+    private Float inletPipeDiameter;
+
+    @ExcelProperty(value = "出水管直径(cm)", index = 20)
+    @ApiModelProperty(value = "出水管直径(cm)")
+    private Float outletPipeDiameter;
+
+    @ExcelProperty(value = "加水车道数量(个)", index = 21)
+    @ApiModelProperty(value = "加水车道数量(个)")
+    private Integer waterfillingLaneNum;
+
+    @ExcelProperty(value = "供水单位名称", index = 22)
+    @ApiModelProperty(value = "供水单位名称")
+    private String waterSupplyName;
+
+    @ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = ExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消火栓系统类型", index = 23)
+    @ApiModelProperty(value = "消火栓系统类型")
+    private String systemType;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "消火栓系统类型code")
+    private String systemTypeCode;
+
+    @ExcelProperty(value = "消防设施状况", index = 24)
+    @ApiModelProperty(value = "消防设施状况分类")
+    private String facilitiesCategory;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "消防设施状况分类code")
+    private String facilitiesCategoryCode;
+
+    @ExcelProperty(value = "道路路口路段", index = 25)
+    @ApiModelProperty(value = "道路路口路段简要情况")
+    private String roadJunctionInfo;
+
+    @ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = ExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消火栓放置形式", index = 26)
+    @ApiModelProperty(value = "消火栓放置形式")
+    private String placeForm;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "消火栓放置形式code")
+    private String placeFormCode;
+
+    @ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = ExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防水带接口", index = 27)
+    @ApiModelProperty(value = "消防水带接口")
+    private String hoseConnection;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "消防水带接口code")
+    private String hoseConnectionCode;
+
+    @ExcelProperty(value = "取水方式", index = 28)
+    @ApiModelProperty(value = "取水方式")
+    private String intakeForm;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "水源类型代码")
+    private String typeCode;
+
+    @ExcelProperty(value = "水源类型", index = 29)
+    @ApiModelProperty(value = "水源类型")
+    private String type;
+
+    @ExcelProperty(value = "容积（m³）", index = 30)
+    @ApiModelProperty(value = "容积（m³）")
+    private Float volume;
+
+    @ExcelProperty(value = "面积（㎡）", index = 31)
+    @ApiModelProperty(value = "面积（㎡）")
+    private Float area;
+
+    @ExcelProperty(value = "水质情况", index = 32)
+    @ApiModelProperty(value = "水质情况")
+    private String qualitySituationInfo;
+
+    @ExcelProperty(value = "四季变化简要情况", index = 33)
+    @ApiModelProperty(value = "四季变化简要情况")
+    private String seasonChangeInfo;
+
+    @ExplicitConstraint(indexNum = 34, source = {"1", "0"}) //固定下拉内容
+    @ExcelProperty(value = "有无枯水期", index = 34)
+    @ApiModelProperty(value = "有无枯水期")
+    private Boolean hasDrySeason;
+
+    @ExcelProperty(value = "枯水期跨度简要情况", index = 35)
+    @ApiModelProperty(value = "枯水期跨度简要情况")
+    private String dryPeriodSpan;
+
+    @ExcelProperty(value = "取水高度(cm)", index = 36)
+    @ApiModelProperty(value = "取水高度(cm)")
+    private Float intakeHeight;
+
+    @ExcelProperty(value = "水源标高差(cm)", index = 37)
+    @ApiModelProperty(value = "水源标高差(cm)")
+    private Float elevationDifference;
+
+    @ExcelProperty(value = "停车位置", index = 38)
+    @ApiModelProperty(value = "停车位置")
+    private String parkingPosition;
+
+    @ExcelProperty(value = "停车数量(个)", index = 39)
+    @ApiModelProperty(value = "停车数量(个)")
+    private Integer parkingNum;
+
+    @ExcelProperty(value = "储水量容积", index = 40)
+    @ApiModelProperty(value = "储水量容积物联编码")
+    private String iotWaterStorage;
+
+    @ExcelProperty(value = "流量", index = 41)
+    @ApiModelProperty(value = "流量物联编码")
+    private String iotFlowRate;
+
+    @ExcelProperty(value = "状态", index = 42)
+    @ApiModelProperty(value = "状态物联编码")
+    private String iotStatus;
+
+    @ExcelProperty(value = "管网压力", index = 43)
+    @ApiModelProperty(value = "管网压力物联编码")
+    private String iotPipePressure;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "物联参数")
+    private WaterResourceIotDto waterResourceIotDto;
 }

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/ExcelUtil.java

+package com.yeejoin.amos.boot.module.common.api.excel;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.read.metadata.ReadSheet;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+
+public class ExcelUtil {
+	/**
+     * 生成excel模板
+     *
+     * @param response
+     * @param fileName    下载的文件名，
+     * @param sheetName   sheet名
+     * @param data        导出的数据
+     * @param model       导出的头
+     * @param heardHeight 头行高
+     * @param flag   true模板填充下拉  false 不填充
+     */
+    public static void createTemplate(HttpServletResponse response, String fileName,
+                                      String sheetName, List<? extends Object> data,
+                                      Class<?> model,  DataSources dataDictionaryMapper,boolean flag)  {
+ 
+        HorizontalCellStyleStrategy horizontalCellStyleStrategy = setMyCellStyle();
+        try {
+         	//下拉列表集合
+            Map<Integer, String[]> explicitListConstraintMap = new HashMap<>();
+            if(flag) {
+            	//循环获取对应列得下拉列表信息
+                Field[] declaredFields = model.getDeclaredFields();
+                for (int i = 0; i < declaredFields.length; i++) {
+                    Field field = declaredFields[i];
+                    //解析注解信息
+                    ExplicitConstraint explicitConstraint = field.getAnnotation(ExplicitConstraint.class);
+                     resolveExplicitConstraint(explicitListConstraintMap,explicitConstraint,dataDictionaryMapper);
+                } 
+            }                 	
+			EasyExcel.write(getOutputStream(fileName, response, ExcelTypeEnum.XLSX), model).
+			        excelType(ExcelTypeEnum.XLSX).sheet(sheetName)
+			        .registerWriteHandler(new TemplateCellWriteHandlerDate(explicitListConstraintMap))
+      		        .registerWriteHandler(new TemplateCellWriteHandler())
+			        .registerWriteHandler(horizontalCellStyleStrategy)
+			        .doWrite(data);			
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException("系统异常！");
+			
+		}
+    }
+    /**
+     * 读取 Excel(第一个 sheet)  指定行开始读取
+     * @param excel  文件
+     * @param rowType  模板实体类
+     * @param header   指定不读取的表头行数，
+     * @param <T>
+     * @return   集合数据
+     * @throws ExcelException
+     */
+    public static <T> List<T> readFirstSheetExcel(MultipartFile excel, Class<T> rowType,int header) throws Exception {
+        ExcelReader reader = getReader(excel, header);
+        if (reader == null) {
+            return new ArrayList<>();
+        }
+        return readExcel(reader, rowType, 0);
+    }
+    
+    
+    
+    /**
+     * 读取 Excel(多个 sheet)
+     * @param reader  读取的excel
+     * @param rowModel excel模板实体类
+     * @param sheetCount sheet
+     * @param <T>
+     * @return
+     */
+    public static <T> List<T> readExcel(ExcelReader reader, Class<T> rowModel, int sheetCount) {
+        if (reader == null) {
+            return new ArrayList<>();
+        }
+        ExcelListener<T> excelListener = new ExcelListener<>();
+        ReadSheet readSheet = EasyExcel.readSheet(sheetCount)
+                .head(rowModel)
+                .registerReadListener(excelListener)
+                .build();
+        reader.read(readSheet);
+        return excelListener.getList();
+    }
+    
+    
+   
+    
+    /**
+    *
+    * @param excel 需要解析的 Excel 文件
+    * @param header 指定不读取表头行数，
+    * @return
+    * @throws ExcelException
+    */
+   public static ExcelReader getReader(MultipartFile excel,int header) throws Exception {
+       String fileName = excel.getOriginalFilename();
+       if (fileName == null) {
+           throw new Exception("文件不存在！");
+       }
+       if (!fileName.toLowerCase().endsWith(ExcelTypeEnum.XLS.getValue()) && !fileName.toLowerCase().endsWith(ExcelTypeEnum.XLSX.getValue())) {
+           throw new Exception("文件类型异常！");
+       }
+       InputStream inputStream;
+       try {
+           inputStream = excel.getInputStream();
+           return EasyExcel.read(inputStream).
+                   headRowNumber(header).
+                   build();
+       } catch (IOException e) {
+           //do something
+       }
+       return null;
+   }
+    
+    
+    
+    /**
+     * 解析注解内容 获取下列表信息
+     * @param explicitConstraint
+     * @return
+     */
+    public static Map<Integer, String[]> resolveExplicitConstraint(  Map<Integer, String[]> explicitListConstraintMap,ExplicitConstraint explicitConstraint, DataSources dataDictionaryMapper){
+        if (explicitConstraint == null) {
+            return null;
+        }
+        //固定下拉信息
+        String[] source = explicitConstraint.source();
+        if (source.length > 0) {
+        	explicitListConstraintMap.put(explicitConstraint.indexNum(), source);
+        }
+        //动态下拉信息
+        Class<? extends ExplicitInterface>[] classes = explicitConstraint.sourceClass();
+        if (classes.length>0){
+            ExplicitInterface explicitInterface = null;
+            try {
+                explicitInterface = classes[0].newInstance();
+                String[] source1 = explicitInterface.source(explicitConstraint.type(),explicitConstraint.method(),dataDictionaryMapper);
+                if (source1.length>0){
+                	explicitListConstraintMap.put(explicitConstraint.indexNum(), source1);
+                }
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    
+    
+    
+    /**
+     * 导出文件时为Writer生成OutputStream
+     */
+    private static OutputStream getOutputStream(String fileName, HttpServletResponse response, ExcelTypeEnum excelTypeEnum) throws Exception {
+        //创建本地文件
+        String filePath = fileName + excelTypeEnum.getValue();
+        try {
+            fileName = new String(filePath.getBytes(), StandardCharsets.ISO_8859_1);
+            response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+            response.setContentType("application/vnd.ms-excel");
+            response.addHeader("Content-Disposition", "filename=" + fileName);
+            return response.getOutputStream();
+        } catch (IOException e) {
+            throw new Exception("系统异常");
+        }
+    }
+    
+    /**
+     * 创建我的cell  策略
+     *
+     * @return
+     */
+    public static HorizontalCellStyleStrategy setMyCellStyle() {
+     
+//        // 头的策略
+//        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+//        // 设置表头居中对齐
+//        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+//        // 颜色
+//        headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+//        
+//        WriteFont headWriteFont = new WriteFont();
+//        headWriteFont.setFontHeightInPoints((short) 10);
+//        // 字体
+//        headWriteCellStyle.setWriteFont(headWriteFont);
+//        headWriteCellStyle.setWrapped(true);    
+//        // 内容的策略
+//        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+//        // 设置内容靠中对齐
+//        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+//        // 这个策略是 头是头的样式 内容是内容的样式 其他的策略可以自己实现
+//        HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+//        // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭   
+//        return horizontalCellStyleStrategy;
+        
+        
+     // 表头样式策略
+        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+        //设置表头居中对齐
+        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+        //表头前景色
+        headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        WriteFont headWriteFont = new WriteFont();
+        headWriteFont.setBold(true);
+        headWriteFont.setFontName("宋体");
+        headWriteFont.setFontHeightInPoints((short) 10);
+        headWriteCellStyle.setWriteFont(headWriteFont);
+ 
+        //2 内容样式策略
+        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+        WriteFont contentWriteFont = new WriteFont();
+        //内容字体大小
+        contentWriteFont.setFontName("宋体");
+        contentWriteFont.setFontHeightInPoints((short) 10);
+        contentWriteCellStyle.setWriteFont(contentWriteFont);
+        //设置自动换行
+        contentWriteCellStyle.setWrapped(true);
+        //设置垂直居中
+        contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 头默认了 FillPatternType所以可以不指定。
+        //  contentWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND);
+        //设置水平居中
+        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+ 
+        //设置边框样式
+        contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
+ 
+        return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+
+   
+        
+        
+    }
+}

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.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.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;
 
 /**

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireTeamService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireTeamService.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/IFirefightersContactsService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersContactsService.java

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

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersContractService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersContractService.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/IFirefightersEducationService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersEducationService.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/IFirefightersPostService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersPostService.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/IFirefightersService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
+package com.yeejoin.amos.boot.module.common.api.service;
 
 import java.util.List;
 import java.util.Map;
 
-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;
+
 
 /**
 * 消防队员 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersThoughtService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersThoughtService.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/IFirefightersWorkexperienceService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersWorkexperienceService.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/IOrgUsrAuthService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrAuthService.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/IOrgUsrService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
+package com.yeejoin.amos.boot.module.common.api.service;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertFormValueMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/AlertFormValueMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormValueMapper">
-	 <select id="selectListByCalledId" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormValueDto">
+	 <select id="selectListByCalledId" resultType="com.yeejoin.amos.boot.module.common.api.dto.AlertFormValueDto">
 		SELECT
 			v.sequence_nbr sequenceNbr,
 			v.alert_form_id alertFormId,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireTeamMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.FireTeamMapper">
 
-    <select id="listMonitorFireBrigade" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.FireBrigadeResourceDto">
+    <select id="listMonitorFireBrigade" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto">
         SELECT
             ft.sequence_nbr id,
             ft.NAME,
@@ -16,7 +16,7 @@
         GROUP BY
             ft.sequence_nbr
     </select>
-    <select id="getFireTeamForPage" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamCardDto">
+    <select id="getFireTeamForPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto">
         SELECT
         a.sequence_nbr sequenceNbr,
         a.img,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FirefightersMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -5,7 +5,7 @@
 
 
 	<select id="getFirefighters"
-		resultType="com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters">
+		resultType="com.yeejoin.amos.boot.module.common.api.entity.Firefighters">
 		select a.* from cb_firefighters a LEFT JOIN cb_firefighters_post b on
 		a.sequence_nbr=b.firefighters_id where a.is_delete=0
 		<if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}  </if>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrgUsrMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -111,7 +111,7 @@
 		)a where a.sequenceNbr is not null
 	</select>
 
-	<select id="selectCompanyDepartmentMsg" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr">
+	<select id="selectCompanyDepartmentMsg" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
 		SELECT
 		sequence_nbr,
 		biz_org_name,
@@ -125,7 +125,7 @@
 		and biz_org_type = "COMPANY" or biz_org_type =  "DEPARTMENT"
 	</select>
 	
-	<select id="queryOrgUsrListByBizOrgCode" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr">
+	<select id="queryOrgUsrListByBizOrgCode" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
 		SELECT
 		sequence_nbr,
 		biz_org_name,

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceCraneMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceCraneMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceCraneMapper">
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceHydrantMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceHydrantMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceHydrantMapper">
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceIotMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceIotMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceIotMapper">
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceMapper">
 
+    <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
+        select r.name,
+               r.address,
+               r.resource_type_name,
+               r.belong_building,
+               r.belong_fighting_system,
+               r.management_unit,
+               r.maintenance_unit,
+               r.build_date,
+               r.enable_date,
+               r.orientation_img,
+               r.reality_img,
+               r.contact_user,
+               r.contact_phone,
+               (case r.resource_type when 'crane' then rc.height when 'natural' then rn.height end) height,
+               (case r.resource_type  when 'crane' then rc.status when 'pool' then rp.status when 'natural' then rn.status end) status,
+               (case r.resource_type when 'crane' then rc.section when 'pool'  then rp.section end) section,
+               (case r.resource_type when 'crane' then rc.pipe_network when 'hydarant' then rh.pipe_network end) pipe_network,
+               (case r.resource_type when 'crane' then rc.pipe_type_name when 'hydarant' then rh.pipe_type_name when 'pool' then rp.pipe_type_name end) pipe_type_name,
+               (case r.resource_type when 'crane' then rc.pipe_diameter when 'hydarant' then rh.pipe_diameter end) pipe_diameter,
+               rc.inlet_pipe_diameter,
+               rc.outlet_pipe_diameter,
+               rc.waterfilling_lane_num,
+               (case r.resource_type when 'crane' then rc.water_supply_name when 'hydarant' then rh.water_supply_name when 'pool' then rp.water_supply_name end) water_supply_name,
+               (case when 'hydrant' then rh.type when 'natural' then rn.type end) type,
+               rh.system_type,
+               rh.facilities_category,
+               rh.road_junction_info,
+               rh.place_form,
+               rh.hose_connection,
+               (case r.resource_type when 'hydrant' then rh.intake_form when 'pool' then rp.intake_form end) intake_form,
+               (case r.resource_type when 'natural' then rn.volume when 'pool' then rp.volume end) volume,
+               rn.area,
+               rn.quality_situation_info,
+               rn.season_change_info,
+               rn.has_dry_season,
+               rn.dry_period_span,
+               rp.intake_height,
+               rp.elevation_difference,
+               rp.parking_position,
+               rp.parking_num,
+               ri.iot_water_storage,
+               ri.iot_flow_rate,
+               ri.iot_status,
+               ri.iot_pipe_pressure
+        from cb_water_resource r
+            left join cb_water_resource_pool rp
+        on r.sequence_nbr = rp.resource_id
+            left join cb_water_resource_crane rc on r.sequence_nbr = rc.resource_id
+            left join cb_water_resource_hydrant rh on r.sequence_nbr = rh.resource_id
+            left join cb_water_resource_natural rn on r.sequence_nbr = rn.resource_id
+            left join cb_water_resource_iot ri on r.sequence_nbr = ri.resource_id
+        where r.is_delete = #{isDelete}
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceNaturalMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceNaturalMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceNaturalMapper">
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourcePoolMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourcePoolMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourcePoolMapper">
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AircraftDto.java

@@ -3,9 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.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 com.yeejoin.amos.boot.module.jcs.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.jcs.api.excel.RoleNameExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -57,7 +56,7 @@ public class AircraftDto extends BaseDto {
     @ApiModelProperty(value = "翼展面积")
     private Double wingspanArea;
 
-    @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = ExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "发动机类型", index = 8)
     @ApiModelProperty(value = "发动机类型")
     private String engineType;
@@ -74,7 +73,7 @@ public class AircraftDto extends BaseDto {
     @ApiModelProperty(value = "发动机型号")
     private String engineModel;
 
-    @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = ExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "燃油类型", index = 11)
     @ApiModelProperty(value = "燃油类型")
     private String fuelType;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledFormDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 
 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/AlertCalledObjsDto.java

@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 import java.util.List;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.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/FireChemicalDto.java

-package com.yeejoin.amos.boot.module.jcs.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.jcs.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.jcs.api.excel.RoleNameExplicitConstraint;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * 危化品
- *
- * @author system_generator
- * @date 2021-06-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@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 = RoleNameExplicitConstraint.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-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FireExpertsDto.java

-package com.yeejoin.amos.boot.module.jcs.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.jcs.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.jcs.api.excel.RoleNameExplicitConstraint;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * @author system_generator
- * @date 2021-06-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@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 = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "证件类型", index = 2)
-    @ApiModelProperty(value = "证件类型")
-    private String certificatesType;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "证件类型code")
-    private String certificatesTypeCode;
-
-    @ExcelProperty(value = "证件号", index = 3)
-    @ApiModelProperty(value = "证件号")
-    private String certificatesNum;
-
-    @ExplicitConstraint(indexNum = 4, source = {"男", "女"}) //固定下拉内容
-    @ExcelProperty(value = "性别", index = 4)
-    @ApiModelProperty(value = "性别")
-    private String gender;
-
-    @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;
-
-    @ExcelProperty(value = "居住地详情", index = 10)
-    @ApiModelProperty(value = "居住地详情")
-    private String residenceDetails;
-
-    @ExcelProperty(value = "办公电话", index = 11)
-    @ApiModelProperty(value = "办公电话")
-    private String officePhone;
-
-    @ExcelProperty(value = "移动电话", index = 12)
-    @ApiModelProperty(value = "移动电话")
-    private String mobilePhone;
-
-    @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "最高学历", index = 13)
-    @ApiModelProperty(value = "最高学历")
-    private String highestEducation;
-
-    @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "岗位名称", index = 14)
-    @ApiModelProperty(value = "岗位名称")
-    private String jobs;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "岗位名称code")
-    private String jobsCode;
-
-    @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = RoleNameExplicitConstraint.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;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "年龄")
-    private Integer age;
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.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;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-/**
-* 微型消防站
-*
-* @author system_generator
-* @date 2021-06-28
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="FireStationDto", description="微型消防站")
-public class FireStationDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
-
-
-    @ApiModelProperty(value = "微型消防站名称")
-    private String name;
-
-    @ApiModelProperty(value = "所在建筑物id")
-    private String whereBuildingId;
-
-    @ApiModelProperty(value = "所在建筑物名称")
-    private String whereBuilding;
-
-    @ApiModelProperty(value = "装备简要情况")
-    private String equipmentBrief;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "行政区区划名称")
-    private String administrativeDivisions;
-
-    @ApiModelProperty(value = "行政区区划编号")
-    private String administrativeDivisionsCode;
-
-    @ApiModelProperty(value = "值班室电话")
-    private String dutyRoomTelephone;
-
-    @ApiModelProperty(value = "负责人名称")
-    private String personChargeName;
-
-    @ApiModelProperty(value = "负责人电话")
-    private String personChargeTelephone;
-
-    @ApiModelProperty(value = "单位id")
-    private Long bizCompanyId;
-
-    @ApiModelProperty(value = "所属单位名称")
-    private String bizCompany;
-
-    @ApiModelProperty(value = "所属单位code")
-    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 = "图片信息")
-    private String img;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-    
-    @ApiModelProperty(value = "战备装备数量")
-    private Integer eqNum;
-    
-    @ApiModelProperty(value = "战备人数量")
-    private Integer userNum;
-    
-    @ApiModelProperty(value = "战备车辆数量")
-    private Integer carNum;
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceCraneDto", description="消防水鹤")
-public class WaterResourceCraneDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
-
-
-    @ApiModelProperty(value = "资源id")
-    private Long resourceId;
-
-    @ApiModelProperty(value = "高度（cm）")
-    private Float height;
-
-    @ApiModelProperty(value = "水源可用状态类别代码")
-    private String statusCode;
-
-    @ApiModelProperty(value = "水源可用状态类别名称")
-    private String status;
-
-    @ApiModelProperty(value = "所属路段")
-    private String section;
-
-    @ApiModelProperty(value = "所属管网")
-    private String pipeNetwork;
-
-    @ApiModelProperty(value = "消防给水管网形式类型代码")
-    private String pipeTypeCode;
-
-    @ApiModelProperty(value = "消防给水管网形式类型名称")
-    private String pipeTypeName;
-
-    @ApiModelProperty(value = "官网直径（cm）")
-    private Float pipeDiameter;
-
-    @ApiModelProperty(value = "进水管直径(cm)")
-    private Float inletPipeDiameter;
-
-    @ApiModelProperty(value = "出水管直径(cm)")
-    private Float outletPipeDiameter;
-
-    @ApiModelProperty(value = "加水车道数量(个)")
-    private Integer waterfillingLaneNum;
-
-    @ApiModelProperty(value = "供水单位名称")
-    private String waterSupplyName;
-
-    @ApiModelProperty(value = "更新人员")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/WaterResourceDto.java

-package com.yeejoin.amos.boot.module.jcs.api.dto;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.yeejoin.amos.boot.module.jcs.api.excel.ExplicitConstraint;
-import com.yeejoin.amos.boot.module.jcs.api.excel.RoleNameExplicitConstraint;
-import com.yeejoin.amos.boot.module.jcs.api.excel.SelectionDataFromInterface;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author system_generator
- * @date 2021-06-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "WaterResourceDto", description = "水资源")
-public class WaterResourceDto extends BaseDto {
-
-    @ExcelIgnore
-    private static final long serialVersionUID = 1L;
-
-    @ExcelProperty(value = "名称", index = 0)
-    @ApiModelProperty(value = "资源名称")
-    private String name;
-
-    @ExcelProperty(value = "地址", index = 1)
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "经纬度坐标")
-    private String latLang;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "资源类型（消火栓、消防水鹤、天然水源、消防水池）")
-    private String resourceType;
-
-    @ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "资源类型", index = 2)
-    @ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
-    private String resourceTypeName;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "所在建筑id")
-    private Long belongBuildingId;
-
-//    @ExplicitConstraint(indexNum = 3, sourceClass = SelectionDataFromInterface.class, method = "getBuildingList")
-    //动态下拉内容
-    @ExcelProperty(value = "所在建筑", index = 3)
-    @ApiModelProperty(value = "所在建筑")
-    private String belongBuilding;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "所属消防系统id")
-    private Long belongFightingSystemId;
-
-//    @ExplicitConstraint(indexNum = 4, sourceClass = SelectionDataFromInterface.class, method = "getFireSystemList")
-    //动态下拉内容
-    @ExcelProperty(value = "所属消防系统", index = 4)
-    @ApiModelProperty(value = "所属消防系统")
-    private String belongFightingSystem;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "管理单位id")
-    private Long managementUnitId;
-
-    @ExcelProperty(value = "管理单位", index = 5)
-    @ApiModelProperty(value = "管理单位")
-    private String managementUnit;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "维保单位id")
-    private Long maintenanceUnitId;
-
-    @ExcelProperty(value = "维保单位", index = 6)
-    @ApiModelProperty(value = "维保单位")
-    private String maintenanceUnit;
-
-    @ExcelProperty(value = "建造日期", index = 7)
-    @ApiModelProperty(value = "建造日期")
-    private Date buildDate;
-
-    @ExcelProperty(value = "启用日期", index = 8)
-    @ApiModelProperty(value = "启用日期")
-    private Date enableDate;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "方位图集合")
-    private List<Object> orientationImgList;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "实景图集合")
-    private List<Object> realityImgList;
-
-    @ExcelProperty(value = "方位图", index = 9)
-    @ApiModelProperty(value = "方位图")
-    private String orientationImg;
-
-    @ExcelProperty(value = "实景图", index = 10)
-    @ApiModelProperty(value = "实景图")
-    private String realityImg;
-
-    @ExcelProperty(value = "联系人姓名", index = 11)
-    @ApiModelProperty(value = "联系人姓名")
-    private String contactUser;
-
-    @ExcelProperty(value = "联系人电话", index = 12)
-    @ApiModelProperty(value = "联系人电话")
-    private String contactPhone;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "是否有物联参数（1有，0没有）")
-    private Boolean isIot;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "消防救援机构_通用唯一识别码")
-    private String rescueOrgCode;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "行政区划代码")
-    private String administrativeCode;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "更新人员")
-    private String recUserName;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "组织机构代码")
-    private String orgCode;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "资源id")
-    private Long resourceId;
-
-    @ExcelProperty(value = "高度（cm）", index = 13)
-    @ApiModelProperty(value = "高度（cm）")
-    private Float height;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "水源可用状态类别代码")
-    private String statusCode;
-
-    @ExcelProperty(value = "水源可用状态", index = 14)
-    @ApiModelProperty(value = "水源可用状态类别名称")
-    private String status;
-
-    @ExcelProperty(value = "所属路段", index = 15)
-    @ApiModelProperty(value = "所属路段")
-    private String section;
-
-    @ExcelProperty(value = "所属管网", index = 16)
-    @ApiModelProperty(value = "所属管网")
-    private String pipeNetwork;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "消防给水管网形式类型代码")
-    private String pipeTypeCode;
-
-    @ExcelProperty(value = "消防给水管网形式", index = 17)
-    @ApiModelProperty(value = "消防给水管网形式")
-    private String pipeTypeName;
-
-    @ExcelProperty(value = "管网直径（cm）", index = 18)
-    @ApiModelProperty(value = "管网直径（cm）")
-    private Float pipeDiameter;
-
-    @ExcelProperty(value = "进水管直径(cm)", index = 19)
-    @ApiModelProperty(value = "进水管直径(cm)")
-    private Float inletPipeDiameter;
-
-    @ExcelProperty(value = "出水管直径(cm)", index = 20)
-    @ApiModelProperty(value = "出水管直径(cm)")
-    private Float outletPipeDiameter;
-
-    @ExcelProperty(value = "加水车道数量(个)", index = 21)
-    @ApiModelProperty(value = "加水车道数量(个)")
-    private Integer waterfillingLaneNum;
-
-    @ExcelProperty(value = "供水单位名称", index = 22)
-    @ApiModelProperty(value = "供水单位名称")
-    private String waterSupplyName;
-
-    @ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消火栓系统类型", index = 23)
-    @ApiModelProperty(value = "消火栓系统类型")
-    private String systemType;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "消火栓系统类型code")
-    private String systemTypeCode;
-
-    @ExcelProperty(value = "消防设施状况", index = 24)
-    @ApiModelProperty(value = "消防设施状况分类")
-    private String facilitiesCategory;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "消防设施状况分类code")
-    private String facilitiesCategoryCode;
-
-    @ExcelProperty(value = "道路路口路段", index = 25)
-    @ApiModelProperty(value = "道路路口路段简要情况")
-    private String roadJunctionInfo;
-
-    @ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消火栓放置形式", index = 26)
-    @ApiModelProperty(value = "消火栓放置形式")
-    private String placeForm;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "消火栓放置形式code")
-    private String placeFormCode;
-
-    @ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防水带接口", index = 27)
-    @ApiModelProperty(value = "消防水带接口")
-    private String hoseConnection;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "消防水带接口code")
-    private String hoseConnectionCode;
-
-    @ExcelProperty(value = "取水方式", index = 28)
-    @ApiModelProperty(value = "取水方式")
-    private String intakeForm;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "水源类型代码")
-    private String typeCode;
-
-    @ExcelProperty(value = "水源类型", index = 29)
-    @ApiModelProperty(value = "水源类型")
-    private String type;
-
-    @ExcelProperty(value = "容积（m³）", index = 30)
-    @ApiModelProperty(value = "容积（m³）")
-    private Float volume;
-
-    @ExcelProperty(value = "面积（㎡）", index = 31)
-    @ApiModelProperty(value = "面积（㎡）")
-    private Float area;
-
-    @ExcelProperty(value = "水质情况", index = 32)
-    @ApiModelProperty(value = "水质情况")
-    private String qualitySituationInfo;
-
-    @ExcelProperty(value = "四季变化简要情况", index = 33)
-    @ApiModelProperty(value = "四季变化简要情况")
-    private String seasonChangeInfo;
-
-    @ExplicitConstraint(indexNum = 34, source = {"1", "0"}) //固定下拉内容
-    @ExcelProperty(value = "有无枯水期", index = 34)
-    @ApiModelProperty(value = "有无枯水期")
-    private Boolean hasDrySeason;
-
-    @ExcelProperty(value = "枯水期跨度简要情况", index = 35)
-    @ApiModelProperty(value = "枯水期跨度简要情况")
-    private String dryPeriodSpan;
-
-    @ExcelProperty(value = "取水高度(cm)", index = 36)
-    @ApiModelProperty(value = "取水高度(cm)")
-    private Float intakeHeight;
-
-    @ExcelProperty(value = "水源标高差(cm)", index = 37)
-    @ApiModelProperty(value = "水源标高差(cm)")
-    private Float elevationDifference;
-
-    @ExcelProperty(value = "停车位置", index = 38)
-    @ApiModelProperty(value = "停车位置")
-    private String parkingPosition;
-
-    @ExcelProperty(value = "停车数量(个)", index = 39)
-    @ApiModelProperty(value = "停车数量(个)")
-    private Integer parkingNum;
-
-    @ExcelProperty(value = "储水量容积", index = 40)
-    @ApiModelProperty(value = "储水量容积物联编码")
-    private String iotWaterStorage;
-
-    @ExcelProperty(value = "流量", index = 41)
-    @ApiModelProperty(value = "流量物联编码")
-    private String iotFlowRate;
-
-    @ExcelProperty(value = "状态", index = 42)
-    @ApiModelProperty(value = "状态物联编码")
-    private String iotStatus;
-
-    @ExcelProperty(value = "管网压力", index = 43)
-    @ApiModelProperty(value = "管网压力物联编码")
-    private String iotPipePressure;
-
-    @ExcelIgnore
-    @ApiModelProperty(value = "物联参数")
-    private WaterResourceIotDto waterResourceIotDto;
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceHydrantDto", description="消火栓")
-public class WaterResourceHydrantDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
-
-
-    @ApiModelProperty(value = "资源id")
-    private Long resourceId;
-
-    @ApiModelProperty(value = "消防栓类型")
-    private String type;
-
-    @ApiModelProperty(value = "类型code")
-    private String typeCode;
-
-    @ApiModelProperty(value = "消火栓系统类型")
-    private String systemType;
-
-    @ApiModelProperty(value = "消火栓系统类型code")
-    private String systemTypeCode;
-
-    @ApiModelProperty(value = "消防设施状况分类")
-    private String facilitiesCategory;
-
-    @ApiModelProperty(value = "消防设施状况分类code")
-    private String facilitiesCategoryCode;
-
-    @ApiModelProperty(value = "道路路口路段简要情况")
-    private String roadJunctionInfo;
-
-    @ApiModelProperty(value = "消火栓放置形式")
-    private String placeForm;
-
-    @ApiModelProperty(value = "消火栓放置形式code")
-    private String placeFormCode;
-
-    @ApiModelProperty(value = "消防水带接口")
-    private String hoseConnection;
-
-    @ApiModelProperty(value = "消防水带接口code")
-    private String hoseConnectionCode;
-
-    @ApiModelProperty(value = "取水方式")
-    private String intakeForm;
-
-    @ApiModelProperty(value = "所属管网")
-    private String pipeNetwork;
-
-    @ApiModelProperty(value = "消防给水管网形式类型代码")
-    private String pipeTypeCode;
-
-    @ApiModelProperty(value = "消防给水管网形式类型名称")
-    private String pipeTypeName;
-
-    @ApiModelProperty(value = "官网直径（cm）")
-    private Float pipeDiameter;
-
-    @ApiModelProperty(value = "供水单位名称")
-    private String waterSupplyName;
-
-    @ApiModelProperty(value = "更新人员")
-    private String recUserName;
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceIotDto", description="物联参数")
-public class WaterResourceIotDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
-
-
-    @ApiModelProperty(value = "主键id")
-    private Long sequenceNbr;
-
-    @ApiModelProperty(value = "资源类型")
-    private String resourceType;
-
-    @ApiModelProperty(value = "资源id")
-    private Long resourceId;
-
-    @ApiModelProperty(value = "储水量容积物联编码")
-    private String iotWaterStorage;
-
-    @ApiModelProperty(value = "流量物联编码")
-    private String iotFlowRate;
-
-    @ApiModelProperty(value = "状态物联编码")
-    private String iotStatus;
-
-    @ApiModelProperty(value = "管网压力物联编码")
-    private String iotPipePressure;
-
-    @ApiModelProperty(value = "更新人员")
-    private String recUserName;
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourceNaturalDto", description="天然水源")
-public class WaterResourceNaturalDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
-
-
-    @ApiModelProperty(value = "资源id")
-    private Long resourceId;
-
-    @ApiModelProperty(value = "高度（cm）")
-    private Float height;
-
-    @ApiModelProperty(value = "水源类型代码")
-    private String typeCode;
-
-    @ApiModelProperty(value = "水源类型")
-    private String type;
-
-    @ApiModelProperty(value = "容积（m³）")
-    private Float volume;
-
-    @ApiModelProperty(value = "面积（㎡）")
-    private Float area;
-
-    @ApiModelProperty(value = "水质情况")
-    private String qualitySituationInfo;
-
-    @ApiModelProperty(value = "四季变化简要情况")
-    private String seasonChangeInfo;
-
-    @ApiModelProperty(value = "水源可用状态类别代码")
-    private String statusCode;
-
-    @ApiModelProperty(value = "水源可用状态类别名称")
-    private String status;
-
-    @ApiModelProperty(value = "有无枯水期")
-    private Boolean hasDrySeason;
-
-    @ApiModelProperty(value = "枯水期跨度简要情况")
-    private String dryPeriodSpan;
-
-    @ApiModelProperty(value = "更新人员")
-    private String recUserName;
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="WaterResourcePoolDto", description="消防水池")
-public class WaterResourcePoolDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
-
-
-    @ApiModelProperty(value = "资源id")
-    private Long resourceId;
-
-    @ApiModelProperty(value = "容积（m³）")
-    private Float volume;
-
-    @ApiModelProperty(value = "水源可用状态类别代码")
-    private String statusCode;
-
-    @ApiModelProperty(value = "水源可用状态类别名称")
-    private String status;
-
-    @ApiModelProperty(value = "所属路段")
-    private String section;
-
-    @ApiModelProperty(value = "取水方式")
-    private String intakeForm;
-
-    @ApiModelProperty(value = "取水高度(cm)")
-    private Float intakeHeight;
-
-    @ApiModelProperty(value = "水源标高差(cm)")
-    private Float elevationDifference;
-
-    @ApiModelProperty(value = "停车位置")
-    private String parkingPosition;
-
-    @ApiModelProperty(value = "停车数量(个)")
-    private Integer parkingNum;
-
-    @ApiModelProperty(value = "消防给水管网形式类型代码")
-    private String pipeTypeCode;
-
-    @ApiModelProperty(value = "消防给水管网形式类型名称")
-    private String pipeTypeName;
-
-    @ApiModelProperty(value = "供水单位名称")
-    private String waterSupplyName;
-
-    @ApiModelProperty(value = "更新人员")
-    private String recUserName;
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireChemical.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-/**
-* 危化品
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_fire_chemical")
-@ApiModel(value="FireChemical对象", description="危化品")
-public class FireChemical extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "casNo")
-    private String casNo;
-
-    @ApiModelProperty(value = "国际危险号")
-    private String dangerId;
-
-    @ApiModelProperty(value = "防护处理")
-    private String defendWay;
-
-    @ApiModelProperty(value = "处理措施")
-    private String dispose;
-
-    @ApiModelProperty(value = "英文名")
-    private String englishName;
-
-    @ApiModelProperty(value = "分子式")
-    private String formula;
-
-    @ApiModelProperty(value = "主要成分")
-    private String ingredient;
-
-    @ApiModelProperty(value = "泄漏处理")
-    private String leakWay;
-
-    @ApiModelProperty(value = "中文名")
-    private String name;
-
-    @ApiModelProperty(value = "性状")
-    private String property;
-
-    @ApiModelProperty(value = "贮藏方法")
-    private String store;
-
-    @ApiModelProperty(value = "症状")
-    private String symptom;
-
-    @ApiModelProperty(value = "禁忌物/禁忌")
-    private String tabu;
-
-    @ApiModelProperty(value = "类型code")
-    private String typeCode;
-
-    @ApiModelProperty(value = "类型名称")
-    private String type;
-
-    @ApiModelProperty(value = "国标号")
-    private String un;
-
-    @ApiModelProperty(value = "化学品图片")
-    private String image;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
- * @author system_generator
- * @date 2021-06-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_fire_experts")
-@ApiModel(value = "FireExperts对象", description = "")
-public class FireExperts extends BaseEntity {
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "证件类型")
-    private String certificatesType;
-
-    @ApiModelProperty(value = "证件类型code")
-    private String certificatesTypeCode;
-
-    @ApiModelProperty(value = "证件号")
-    private String certificatesNum;
-
-    @ApiModelProperty(value = "单位")
-    private String companyName;
-
-    @ApiModelProperty(value = "性别")
-    private String gender;
-
-    @ApiModelProperty(value = "名族")
-    private String nation;
-
-    @ApiModelProperty(value = "籍贯")
-    private String nativePlace;
-
-    @ApiModelProperty(value = "现居住地")
-    private String residence;
-
-    @ApiModelProperty(value = "现居住地")
-    private String residenceDetails;
-
-    @ApiModelProperty(value = "政治面貌")
-    private String politicalOutlook;
-
-    @ApiModelProperty(value = "办公用 电话")
-    private String officePhone;
-
-    @ApiModelProperty(value = "移动电话")
-    private String mobilePhone;
-
-    @ApiModelProperty(value = "最高学历")
-    private String highestEducation;
-
-    @ApiModelProperty(value = "岗位名称")
-    private String jobs;
-
-    @ApiModelProperty(value = "岗位名称code")
-    private String jobsCode;
-
-    @ApiModelProperty(value = "消防专家领域")
-    private String expert;
-
-    @ApiModelProperty(value = "消防专家领域code")
-    private String expertCode;
-
-    @ApiModelProperty(value = "人员照片")
-    private String personnelPhotos;
-
-    @ApiModelProperty(value = "资质证书")
-    private String qualificationCertificate;
-
-    @ApiModelProperty(value = "人员状态，在职/离职")
-    private String state;
-
-    @ApiModelProperty(value = "人员状态，在职/离职code")
-    private String stateCode;
-
-    @ApiModelProperty(value = "消防机构id")
-    private Long fireTeamId;
-
-    @ApiModelProperty(value = "消防机构name")
-    private Long fireTeamName;
-
-    @ApiModelProperty(value = "备注")
-    private String note;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-    @ApiModelProperty(value = "出生日期")
-    private Date birthdayTime;
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-/**
-* 微型消防站
-*
-* @author system_generator
-* @date 2021-06-28
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_fire_station")
-@ApiModel(value="FireStation对象", description="微型消防站")
-public class FireStation extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "微型消防站名称")
-    private String name;
-
-    @ApiModelProperty(value = "所在建筑物id")
-    private String whereBuildingId;
-
-    @ApiModelProperty(value = "所在建筑物名称")
-    private String whereBuilding;
-
-    @ApiModelProperty(value = "装备简要情况")
-    private String equipmentBrief;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "行政区区划名称")
-    private String administrativeDivisions;
-
-    @ApiModelProperty(value = "行政区区划编号")
-    private String administrativeDivisionsCode;
-
-    @ApiModelProperty(value = "值班室电话")
-    private String dutyRoomTelephone;
-
-    @ApiModelProperty(value = "负责人名称")
-    private String personChargeName;
-
-    @ApiModelProperty(value = "负责人电话")
-    private String personChargeTelephone;
-
-    @ApiModelProperty(value = "单位id")
-    private Long bizCompanyId;
-
-    @ApiModelProperty(value = "所属单位名称")
-    private String bizCompany;
-
-    @ApiModelProperty(value = "所属单位code")
-    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 = "图片信息")
-    private String img;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_water_resource")
-public class WaterResource extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-	  * 资源名称
-     */
-	@TableField("name")
-    private String name;
-    /**
-	  * 地址
-     */
-	@TableField("address")
-    private String address;
-    /**
-	  * 经纬度坐标
-     */
-	@TableField("lat_lang")
-    private String latLang;
-    /**
-	  * 资源类型（消火栓、消防水鹤、天然水源、消防水池）
-     */
-	@TableField("resource_type")
-    private String resourceType;
-    /**
-     * 资源类型名称（消火栓、消防水鹤、天然水源、消防水池）
-     */
-    @TableField("resource_type_name")
-    private String resourceTypeName;
-    /**
-	  * 所在建筑id
-     */
-	@TableField("belong_building_id")
-    private Long belongBuildingId;
-    /**
-	  * 所在建筑
-     */
-	@TableField("belong_building")
-    private String belongBuilding;
-    /**
-	  * 所属消防系统id
-     */
-	@TableField("belong_fighting_system_id")
-    private Long belongFightingSystemId;
-    /**
-	  * 所属消防系统
-     */
-	@TableField("belong_fighting_system")
-    private String belongFightingSystem;
-    /**
-	  * 管理单位id
-     */
-	@TableField("management_unit_id")
-    private Long managementUnitId;
-    /**
-	  * 管理单位
-     */
-	@TableField("management_unit")
-    private String managementUnit;
-    /**
-	  * 维保单位id
-     */
-	@TableField("maintenance_unit_id")
-    private Long maintenanceUnitId;
-    /**
-	  * 维保单位
-     */
-	@TableField("maintenance_unit")
-    private String maintenanceUnit;
-    /**
-	  * 建造日期
-     */
-	@TableField("build_date")
-    private Date buildDate;
-    /**
-	  * 启用日期
-     */
-	@TableField("enable_date")
-    private Date enableDate;
-    /**
-	  * 方位图
-     */
-	@TableField("orientation_img")
-    private String orientationImg;
-    /**
-	  * 实景图
-     */
-	@TableField("reality_img")
-    private String realityImg;
-    /**
-	  * 联系人姓名
-     */
-	@TableField("contact_user")
-    private String contactUser;
-    /**
-	  * 联系人电话
-     */
-	@TableField("contact_phone")
-    private String contactPhone;
-    /**
-	  * 是否有物联参数（1有，0没有）
-     */
-	@TableField("is_iot")
-    private Boolean isIot;
-    /**
-	  * 消防救援机构_通用唯一识别码
-     */
-	@TableField("rescue_org_code")
-    private String rescueOrgCode;
-    /**
-	  * 行政区划代码
-     */
-	@TableField("administrative_code")
-    private String administrativeCode;
-    /**
-	  * 更新人员
-     */
-	@TableField("rec_user_name")
-    private String recUserName;
-    /**
-	  * 组织机构代码
-     */
-	@TableField("org_code")
-    private String orgCode;
-    /**
-     * 是否启用
-     */
-    @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/entity/WaterResourceCrane.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_water_resource_crane")
-public class WaterResourceCrane extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-	  * 资源id
-     */
-	@TableField("resource_id")
-    private Long resourceId;
-    /**
-	  * 高度（cm）
-     */
-	@TableField("height")
-    private Float height;
-    /**
-	  * 水源可用状态类别代码
-     */
-	@TableField("status_code")
-    private String statusCode;
-    /**
-	  * 水源可用状态类别名称
-     */
-	@TableField("status")
-    private String status;
-    /**
-	  * 所属路段
-     */
-	@TableField("section")
-    private String section;
-    /**
-	  * 所属管网
-     */
-	@TableField("pipe_network")
-    private String pipeNetwork;
-    /**
-	  * 消防给水管网形式类型代码
-     */
-	@TableField("pipe_type_code")
-    private String pipeTypeCode;
-    /**
-	  * 消防给水管网形式类型名称
-     */
-	@TableField("pipe_type_name")
-    private String pipeTypeName;
-    /**
-	  * 官网直径（cm）
-     */
-	@TableField("pipe_diameter")
-    private Float pipeDiameter;
-    /**
-	  * 进水管直径(cm)
-     */
-	@TableField("inlet_pipe_diameter")
-    private Float inletPipeDiameter;
-    /**
-	  * 出水管直径(cm)
-     */
-	@TableField("outlet_pipe_diameter")
-    private Float outletPipeDiameter;
-    /**
-	  * 加水车道数量(个)
-     */
-	@TableField("waterfilling_lane_num")
-    private Integer waterfillingLaneNum;
-    /**
-	  * 供水单位名称
-     */
-	@TableField("water_supply_name")
-    private String waterSupplyName;
-    /**
-	  * 更新人员
-     */
-	@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/entity/WaterResourceHydrant.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_water_resource_hydrant")
-public class WaterResourceHydrant extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-	  * 资源id
-     */
-	@TableField("resource_id")
-    private Long resourceId;
-    /**
-	  * 消防栓类型
-     */
-	@TableField("type")
-    private String type;
-    /**
-	  * 类型code
-     */
-	@TableField("type_code")
-    private String typeCode;
-    /**
-	  * 消火栓系统类型
-     */
-	@TableField("system_type")
-    private String systemType;
-    /**
-	  * 消火栓系统类型code
-     */
-	@TableField("system_type_code")
-    private String systemTypeCode;
-    /**
-	  * 消防设施状况分类
-     */
-	@TableField("facilities_category")
-    private String facilitiesCategory;
-    /**
-	  * 消防设施状况分类code
-     */
-	@TableField("facilities_category_code")
-    private String facilitiesCategoryCode;
-    /**
-	  * 道路路口路段简要情况
-     */
-	@TableField("road_junction_info")
-    private String roadJunctionInfo;
-    /**
-	  * 消火栓放置形式
-     */
-	@TableField("place_form")
-    private String placeForm;
-    /**
-	  * 消火栓放置形式code
-     */
-	@TableField("place_form_code")
-    private String placeFormCode;
-    /**
-	  * 消防水带接口
-     */
-	@TableField("hose_connection")
-    private String hoseConnection;
-    /**
-	  * 消防水带接口code
-     */
-	@TableField("hose_connection_code")
-    private String hoseConnectionCode;
-    /**
-	  * 取水方式
-     */
-	@TableField("intake_form")
-    private String intakeForm;
-    /**
-	  * 所属管网
-     */
-	@TableField("pipe_network")
-    private String pipeNetwork;
-    /**
-	  * 消防给水管网形式类型代码
-     */
-	@TableField("pipe_type_code")
-    private String pipeTypeCode;
-    /**
-	  * 消防给水管网形式类型名称
-     */
-	@TableField("pipe_type_name")
-    private String pipeTypeName;
-    /**
-	  * 官网直径（cm）
-     */
-	@TableField("pipe_diameter")
-    private Float pipeDiameter;
-    /**
-	  * 供水单位名称
-     */
-	@TableField("water_supply_name")
-    private String waterSupplyName;
-    /**
-	  * 更新人员
-     */
-	@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/entity/WaterResourceIot.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_water_resource_iot")
-public class WaterResourceIot extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-	  * 资源类型
-     */
-	@TableField("resource_type")
-    private String resourceType;
-    /**
-	  * 资源id
-     */
-	@TableField("resource_id")
-    private Long resourceId;
-    /**
-	  * 储水量容积物联编码
-     */
-	@TableField("iot_water_storage")
-    private String iotWaterStorage;
-    /**
-	  * 流量物联编码
-     */
-	@TableField("iot_flow_rate")
-    private String iotFlowRate;
-    /**
-	  * 状态物联编码
-     */
-	@TableField("iot_status")
-    private String iotStatus;
-    /**
-	  * 管网压力物联编码
-     */
-	@TableField("iot_pipe_pressure")
-    private String iotPipePressure;
-    /**
-	  * 更新人员
-     */
-	@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/entity/WaterResourceNatural.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_water_resource_natural")
-public class WaterResourceNatural extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-	  * 资源id
-     */
-	@TableField("resource_id")
-    private Long resourceId;
-    /**
-	  * 高度（cm）
-     */
-	@TableField("height")
-    private Float height;
-    /**
-	  * 水源类型代码
-     */
-	@TableField("type_code")
-    private String typeCode;
-    /**
-	  * 水源类型
-     */
-	@TableField("type")
-    private String type;
-    /**
-	  * 容积（m³）
-     */
-	@TableField("volume")
-    private Float volume;
-    /**
-	  * 面积（㎡）
-     */
-	@TableField("area")
-    private Float area;
-    /**
-	  * 水质情况
-     */
-	@TableField("quality_situation_info")
-    private String qualitySituationInfo;
-    /**
-	  * 四季变化简要情况
-     */
-	@TableField("season_change_info")
-    private String seasonChangeInfo;
-    /**
-	  * 水源可用状态类别代码
-     */
-	@TableField("status_code")
-    private String statusCode;
-    /**
-	  * 水源可用状态类别名称
-     */
-	@TableField("status")
-    private String status;
-    /**
-	  * 有无枯水期
-     */
-	@TableField("has_dry_season")
-    private Boolean hasDrySeason;
-    /**
-	  * 枯水期跨度简要情况
-     */
-	@TableField("dry_period_span")
-    private String dryPeriodSpan;
-    /**
-	  * 更新人员
-     */
-	@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/entity/WaterResourcePool.java

-package com.yeejoin.amos.boot.module.jcs.api.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_water_resource_pool")
-public class WaterResourcePool extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-	  * 资源id
-     */
-	@TableField("resource_id")
-    private Long resourceId;
-    /**
-	  * 容积（m³）
-     */
-	@TableField("volume")
-    private Float volume;
-    /**
-	  * 水源可用状态类别代码
-     */
-	@TableField("status_code")
-    private String statusCode;
-    /**
-	  * 水源可用状态类别名称
-     */
-	@TableField("status")
-    private String status;
-    /**
-	  * 所属路段
-     */
-	@TableField("section")
-    private String section;
-    /**
-	  * 取水方式
-     */
-	@TableField("intake_form")
-    private String intakeForm;
-    /**
-	  * 取水高度(cm)
-     */
-	@TableField("intake_height")
-    private Float intakeHeight;
-    /**
-	  * 水源标高差(cm)
-     */
-	@TableField("elevation_difference")
-    private Float elevationDifference;
-    /**
-	  * 停车位置
-     */
-	@TableField("parking_position")
-    private String parkingPosition;
-    /**
-	  * 停车数量(个)
-     */
-	@TableField("parking_num")
-    private Integer parkingNum;
-    /**
-	  * 消防给水管网形式类型代码
-     */
-	@TableField("pipe_type_code")
-    private String pipeTypeCode;
-    /**
-	  * 消防给水管网形式类型名称
-     */
-	@TableField("pipe_type_name")
-    private String pipeTypeName;
-    /**
-	  * 供水单位名称
-     */
-	@TableField("water_supply_name")
-    private String waterSupplyName;
-    /**
-	  * 更新人员
-     */
-	@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/excel/ExcelListener.java

-package com.yeejoin.amos.boot.module.jcs.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) {
-	 
- }
-}
+//package com.yeejoin.amos.boot.module.jcs.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-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/excel/ExcelUtil.java

-package com.yeejoin.amos.boot.module.jcs.api.excel;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelReader;
-import com.alibaba.excel.read.metadata.ReadSheet;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import com.alibaba.excel.write.metadata.style.WriteCellStyle;
-import com.alibaba.excel.write.metadata.style.WriteFont;
-import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
-
-public class ExcelUtil {
-	/**
-     * 生成excel模板
-     *
-     * @param response
-     * @param fileName    下载的文件名，
-     * @param sheetName   sheet名
-     * @param data        导出的数据
-     * @param model       导出的头
-     * @param heardHeight 头行高
-     * @param flag   true模板填充下拉  false 不填充
-     */
-    public static void createTemplate(HttpServletResponse response, String fileName,
-                                      String sheetName, List<? extends Object> data,
-                                      Class<?> model,  DataDictionaryMapper dataDictionaryMapper,boolean flag)  {
- 
-        HorizontalCellStyleStrategy horizontalCellStyleStrategy = setMyCellStyle();
-        try {
-         	//下拉列表集合
-            Map<Integer, String[]> explicitListConstraintMap = new HashMap<>();
-            if(flag) {
-            	//循环获取对应列得下拉列表信息
-                Field[] declaredFields = model.getDeclaredFields();
-                for (int i = 0; i < declaredFields.length; i++) {
-                    Field field = declaredFields[i];
-                    //解析注解信息
-                    ExplicitConstraint explicitConstraint = field.getAnnotation(ExplicitConstraint.class);
-                     resolveExplicitConstraint(explicitListConstraintMap,explicitConstraint,dataDictionaryMapper);
-                } 
-            }                 	
-			EasyExcel.write(getOutputStream(fileName, response, ExcelTypeEnum.XLSX), model).
-			        excelType(ExcelTypeEnum.XLSX).sheet(sheetName)
-			        .registerWriteHandler(new TemplateCellWriteHandlerDate(explicitListConstraintMap))
-      		        .registerWriteHandler(new TemplateCellWriteHandler())
-			        .registerWriteHandler(horizontalCellStyleStrategy)
-			        .doWrite(data);			
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException("系统异常！");
-			
-		}
-    }
-    /**
-     * 读取 Excel(第一个 sheet)  指定行开始读取
-     * @param excel  文件
-     * @param rowType  模板实体类
-     * @param header   指定不读取的表头行数，
-     * @param <T>
-     * @return   集合数据
-     * @throws ExcelException
-     */
-    public static <T> List<T> readFirstSheetExcel(MultipartFile excel, Class<T> rowType,int header) throws Exception {
-        ExcelReader reader = getReader(excel, header);
-        if (reader == null) {
-            return new ArrayList<>();
-        }
-        return readExcel(reader, rowType, 0);
-    }
-    
-    
-    
-    /**
-     * 读取 Excel(多个 sheet)
-     * @param reader  读取的excel
-     * @param rowModel excel模板实体类
-     * @param sheetCount sheet
-     * @param <T>
-     * @return
-     */
-    public static <T> List<T> readExcel(ExcelReader reader, Class<T> rowModel, int sheetCount) {
-        if (reader == null) {
-            return new ArrayList<>();
-        }
-        ExcelListener<T> excelListener = new ExcelListener<>();
-        ReadSheet readSheet = EasyExcel.readSheet(sheetCount)
-                .head(rowModel)
-                .registerReadListener(excelListener)
-                .build();
-        reader.read(readSheet);
-        return excelListener.getList();
-    }
-    
-    
-   
-    
-    /**
-    *
-    * @param excel 需要解析的 Excel 文件
-    * @param header 指定不读取表头行数，
-    * @return
-    * @throws ExcelException
-    */
-   public static ExcelReader getReader(MultipartFile excel,int header) throws Exception {
-       String fileName = excel.getOriginalFilename();
-       if (fileName == null) {
-           throw new Exception("文件不存在！");
-       }
-       if (!fileName.toLowerCase().endsWith(ExcelTypeEnum.XLS.getValue()) && !fileName.toLowerCase().endsWith(ExcelTypeEnum.XLSX.getValue())) {
-           throw new Exception("文件类型异常！");
-       }
-       InputStream inputStream;
-       try {
-           inputStream = excel.getInputStream();
-           return EasyExcel.read(inputStream).
-                   headRowNumber(header).
-                   build();
-       } catch (IOException e) {
-           //do something
-       }
-       return null;
-   }
-    
-    
-    
-    /**
-     * 解析注解内容 获取下列表信息
-     * @param explicitConstraint
-     * @return
-     */
-    public static Map<Integer, String[]> resolveExplicitConstraint(  Map<Integer, String[]> explicitListConstraintMap,ExplicitConstraint explicitConstraint, DataDictionaryMapper dataDictionaryMapper){
-        if (explicitConstraint == null) {
-            return null;
-        }
-        //固定下拉信息
-        String[] source = explicitConstraint.source();
-        if (source.length > 0) {
-        	explicitListConstraintMap.put(explicitConstraint.indexNum(), source);
-        }
-        //动态下拉信息
-        Class<? extends ExplicitInterface>[] classes = explicitConstraint.sourceClass();
-        if (classes.length>0){
-            ExplicitInterface explicitInterface = null;
-            try {
-                explicitInterface = classes[0].newInstance();
-                String[] source1 = explicitInterface.source(explicitConstraint.type(),dataDictionaryMapper);
-                if (source1.length>0){
-                	explicitListConstraintMap.put(explicitConstraint.indexNum(), source1);
-                }
-            } catch (InstantiationException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-    
-    
-    
-    /**
-     * 导出文件时为Writer生成OutputStream
-     */
-    private static OutputStream getOutputStream(String fileName, HttpServletResponse response, ExcelTypeEnum excelTypeEnum) throws Exception {
-        //创建本地文件
-        String filePath = fileName + excelTypeEnum.getValue();
-        try {
-            fileName = new String(filePath.getBytes(), StandardCharsets.ISO_8859_1);
-            response.setCharacterEncoding(StandardCharsets.UTF_8.name());
-            response.setContentType("application/vnd.ms-excel");
-            response.addHeader("Content-Disposition", "filename=" + fileName);
-            return response.getOutputStream();
-        } catch (IOException e) {
-            throw new Exception("系统异常");
-        }
-    }
-    
-    /**
-     * 创建我的cell  策略
-     *
-     * @return
-     */
-    public static HorizontalCellStyleStrategy setMyCellStyle() {
-     
-//        // 头的策略
+//package com.yeejoin.amos.boot.module.jcs.api.excel;
+//
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.io.OutputStream;
+//import java.lang.reflect.Field;
+//import java.nio.charset.StandardCharsets;
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//import javax.servlet.http.HttpServletResponse;
+//
+//import org.apache.poi.ss.usermodel.BorderStyle;
+//import org.apache.poi.ss.usermodel.HorizontalAlignment;
+//import org.apache.poi.ss.usermodel.IndexedColors;
+//import org.apache.poi.ss.usermodel.VerticalAlignment;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import com.alibaba.excel.EasyExcel;
+//import com.alibaba.excel.ExcelReader;
+//import com.alibaba.excel.read.metadata.ReadSheet;
+//import com.alibaba.excel.support.ExcelTypeEnum;
+//import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+//import com.alibaba.excel.write.metadata.style.WriteFont;
+//import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+//import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
+//
+//public class ExcelUtil {
+//	/**
+//     * 生成excel模板
+//     *
+//     * @param response
+//     * @param fileName    下载的文件名，
+//     * @param sheetName   sheet名
+//     * @param data        导出的数据
+//     * @param model       导出的头
+//     * @param heardHeight 头行高
+//     * @param flag   true模板填充下拉  false 不填充
+//     */
+//    public static void createTemplate(HttpServletResponse response, String fileName,
+//                                      String sheetName, List<? extends Object> data,
+//                                      Class<?> model,  DataDictionaryMapper dataDictionaryMapper,boolean flag)  {
+// 
+//        HorizontalCellStyleStrategy horizontalCellStyleStrategy = setMyCellStyle();
+//        try {
+//         	//下拉列表集合
+//            Map<Integer, String[]> explicitListConstraintMap = new HashMap<>();
+//            if(flag) {
+//            	//循环获取对应列得下拉列表信息
+//                Field[] declaredFields = model.getDeclaredFields();
+//                for (int i = 0; i < declaredFields.length; i++) {
+//                    Field field = declaredFields[i];
+//                    //解析注解信息
+//                    ExplicitConstraint explicitConstraint = field.getAnnotation(ExplicitConstraint.class);
+//                     resolveExplicitConstraint(explicitListConstraintMap,explicitConstraint,dataDictionaryMapper);
+//                } 
+//            }                 	
+//			EasyExcel.write(getOutputStream(fileName, response, ExcelTypeEnum.XLSX), model).
+//			        excelType(ExcelTypeEnum.XLSX).sheet(sheetName)
+//			        .registerWriteHandler(new TemplateCellWriteHandlerDate(explicitListConstraintMap))
+//      		        .registerWriteHandler(new TemplateCellWriteHandler())
+//			        .registerWriteHandler(horizontalCellStyleStrategy)
+//			        .doWrite(data);			
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			throw new RuntimeException("系统异常！");
+//			
+//		}
+//    }
+//    /**
+//     * 读取 Excel(第一个 sheet)  指定行开始读取
+//     * @param excel  文件
+//     * @param rowType  模板实体类
+//     * @param header   指定不读取的表头行数，
+//     * @param <T>
+//     * @return   集合数据
+//     * @throws ExcelException
+//     */
+//    public static <T> List<T> readFirstSheetExcel(MultipartFile excel, Class<T> rowType,int header) throws Exception {
+//        ExcelReader reader = getReader(excel, header);
+//        if (reader == null) {
+//            return new ArrayList<>();
+//        }
+//        return readExcel(reader, rowType, 0);
+//    }
+//    
+//    
+//    
+//    /**
+//     * 读取 Excel(多个 sheet)
+//     * @param reader  读取的excel
+//     * @param rowModel excel模板实体类
+//     * @param sheetCount sheet
+//     * @param <T>
+//     * @return
+//     */
+//    public static <T> List<T> readExcel(ExcelReader reader, Class<T> rowModel, int sheetCount) {
+//        if (reader == null) {
+//            return new ArrayList<>();
+//        }
+//        ExcelListener<T> excelListener = new ExcelListener<>();
+//        ReadSheet readSheet = EasyExcel.readSheet(sheetCount)
+//                .head(rowModel)
+//                .registerReadListener(excelListener)
+//                .build();
+//        reader.read(readSheet);
+//        return excelListener.getList();
+//    }
+//    
+//    
+//   
+//    
+//    /**
+//    *
+//    * @param excel 需要解析的 Excel 文件
+//    * @param header 指定不读取表头行数，
+//    * @return
+//    * @throws ExcelException
+//    */
+//   public static ExcelReader getReader(MultipartFile excel,int header) throws Exception {
+//       String fileName = excel.getOriginalFilename();
+//       if (fileName == null) {
+//           throw new Exception("文件不存在！");
+//       }
+//       if (!fileName.toLowerCase().endsWith(ExcelTypeEnum.XLS.getValue()) && !fileName.toLowerCase().endsWith(ExcelTypeEnum.XLSX.getValue())) {
+//           throw new Exception("文件类型异常！");
+//       }
+//       InputStream inputStream;
+//       try {
+//           inputStream = excel.getInputStream();
+//           return EasyExcel.read(inputStream).
+//                   headRowNumber(header).
+//                   build();
+//       } catch (IOException e) {
+//           //do something
+//       }
+//       return null;
+//   }
+//    
+//    
+//    
+//    /**
+//     * 解析注解内容 获取下列表信息
+//     * @param explicitConstraint
+//     * @return
+//     */
+//    public static Map<Integer, String[]> resolveExplicitConstraint(  Map<Integer, String[]> explicitListConstraintMap,ExplicitConstraint explicitConstraint, DataDictionaryMapper dataDictionaryMapper){
+//        if (explicitConstraint == null) {
+//            return null;
+//        }
+//        //固定下拉信息
+//        String[] source = explicitConstraint.source();
+//        if (source.length > 0) {
+//        	explicitListConstraintMap.put(explicitConstraint.indexNum(), source);
+//        }
+//        //动态下拉信息
+//        Class<? extends ExplicitInterface>[] classes = explicitConstraint.sourceClass();
+//        if (classes.length>0){
+//            ExplicitInterface explicitInterface = null;
+//            try {
+//                explicitInterface = classes[0].newInstance();
+//                String[] source1 = explicitInterface.source(explicitConstraint.type(),dataDictionaryMapper);
+//                if (source1.length>0){
+//                	explicitListConstraintMap.put(explicitConstraint.indexNum(), source1);
+//                }
+//            } catch (InstantiationException e) {
+//                e.printStackTrace();
+//            } catch (IllegalAccessException e) {
+//                e.printStackTrace();
+//            }
+//        }
+//        return null;
+//    }
+//
+//    
+//    
+//    
+//    /**
+//     * 导出文件时为Writer生成OutputStream
+//     */
+//    private static OutputStream getOutputStream(String fileName, HttpServletResponse response, ExcelTypeEnum excelTypeEnum) throws Exception {
+//        //创建本地文件
+//        String filePath = fileName + excelTypeEnum.getValue();
+//        try {
+//            fileName = new String(filePath.getBytes(), StandardCharsets.ISO_8859_1);
+//            response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+//            response.setContentType("application/vnd.ms-excel");
+//            response.addHeader("Content-Disposition", "filename=" + fileName);
+//            return response.getOutputStream();
+//        } catch (IOException e) {
+//            throw new Exception("系统异常");
+//        }
+//    }
+//    
+//    /**
+//     * 创建我的cell  策略
+//     *
+//     * @return
+//     */
+//    public static HorizontalCellStyleStrategy setMyCellStyle() {
+//     
+////        // 头的策略
+////        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+////        // 设置表头居中对齐
+////        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+////        // 颜色
+////        headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+////        
+////        WriteFont headWriteFont = new WriteFont();
+////        headWriteFont.setFontHeightInPoints((short) 10);
+////        // 字体
+////        headWriteCellStyle.setWriteFont(headWriteFont);
+////        headWriteCellStyle.setWrapped(true);    
+////        // 内容的策略
+////        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+////        // 设置内容靠中对齐
+////        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+////        // 这个策略是 头是头的样式 内容是内容的样式 其他的策略可以自己实现
+////        HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+////        // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭   
+////        return horizontalCellStyleStrategy;
+//        
+//        
+//     // 表头样式策略
 //        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
-//        // 设置表头居中对齐
+//        //设置表头居中对齐
 //        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-//        // 颜色
+//        //表头前景色
 //        headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-//        
 //        WriteFont headWriteFont = new WriteFont();
+//        headWriteFont.setBold(true);
+//        headWriteFont.setFontName("宋体");
 //        headWriteFont.setFontHeightInPoints((short) 10);
-//        // 字体
 //        headWriteCellStyle.setWriteFont(headWriteFont);
-//        headWriteCellStyle.setWrapped(true);    
-//        // 内容的策略
+// 
+//        //2 内容样式策略
 //        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-//        // 设置内容靠中对齐
+//        WriteFont contentWriteFont = new WriteFont();
+//        //内容字体大小
+//        contentWriteFont.setFontName("宋体");
+//        contentWriteFont.setFontHeightInPoints((short) 10);
+//        contentWriteCellStyle.setWriteFont(contentWriteFont);
+//        //设置自动换行
+//        contentWriteCellStyle.setWrapped(true);
+//        //设置垂直居中
+//        contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+//        // 头默认了 FillPatternType所以可以不指定。
+//        //  contentWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND);
+//        //设置水平居中
 //        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-//        // 这个策略是 头是头的样式 内容是内容的样式 其他的策略可以自己实现
-//        HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
-//        // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭   
-//        return horizontalCellStyleStrategy;
-        
-        
-     // 表头样式策略
-        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
-        //设置表头居中对齐
-        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-        //表头前景色
-        headWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        WriteFont headWriteFont = new WriteFont();
-        headWriteFont.setBold(true);
-        headWriteFont.setFontName("宋体");
-        headWriteFont.setFontHeightInPoints((short) 10);
-        headWriteCellStyle.setWriteFont(headWriteFont);
- 
-        //2 内容样式策略
-        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-        WriteFont contentWriteFont = new WriteFont();
-        //内容字体大小
-        contentWriteFont.setFontName("宋体");
-        contentWriteFont.setFontHeightInPoints((short) 10);
-        contentWriteCellStyle.setWriteFont(contentWriteFont);
-        //设置自动换行
-        contentWriteCellStyle.setWrapped(true);
-        //设置垂直居中
-        contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-        // 头默认了 FillPatternType所以可以不指定。
-        //  contentWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND);
-        //设置水平居中
-        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
- 
-        //设置边框样式
-        contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
-        contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
-        contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
-        contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
- 
-        return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
-
-   
-        
-        
-    }
-}
+// 
+//        //设置边框样式
+//        contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
+//        contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
+//        contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
+//        contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
+// 
+//        return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+//
+//   
+//        
+//        
+//    }
+//}

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

-package com.yeejoin.amos.boot.module.jcs.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 "";
-	
-}
+//package com.yeejoin.amos.boot.module.jcs.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/ExplicitInterface.java

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

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

 package com.yeejoin.amos.boot.module.jcs.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.jcs.api.entity.DataDictionary;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitInterface;
 
 /***
  *
@@ -15,17 +11,8 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
 public class RoleNameExplicitConstraint implements ExplicitInterface {
 
 	@Override
-    public String[] source(String type, DataDictionaryMapper 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;
+	public String[] source(String type, String method, DataSources dataDictionaryMapper) {
+		
+		return dataDictionaryMapper.selectList(type, method);
 	}
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/excel/SelectionDataFromInterface.java

-package com.yeejoin.amos.boot.module.jcs.api.excel;
-
-import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/***
- *
- * 获取动态值
- *
- * **/
-public class SelectionDataFromInterface implements SelectionDataInterface {
-
-
-
-    @Override
-    public String[] source(String methodName) {
-        switch (methodName) {
-            case "getBuildingList":
-//                List<MenuFrom> buildingList = equipmentService.getBuildingList();
-//                List<String> buildingNameList = buildingList.stream().map(item -> {
-//                            return item.getName() + "@" + item.getKey();
+//package com.yeejoin.amos.boot.module.jcs.api.excel;
+//
+//import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+///***
+// *
+// * 获取动态值
+// *
+// * **/
+//public class SelectionDataFromInterface implements SelectionDataInterface {
+//
+//
+//
+//    @Override
+//    public String[] source(String methodName) {
+//        switch (methodName) {
+//            case "getBuildingList":
+////                List<MenuFrom> buildingList = equipmentService.getBuildingList();
+////                List<String> buildingNameList = buildingList.stream().map(item -> {
+////                            return item.getName() + "@" + item.getKey();
+////                        }
+////                ).collect(Collectors.toList());
+////                String[] buildingNameStr = buildingNameList.toArray(new String[buildingNameList.size()]);
+////                return buildingNameStr;
+//            case "getFireSystemList":
+////                List<MenuFrom> fireSystemList = equipmentService.getFireSystemList();
+////                List<String> fireSystemNameList = fireSystemList.stream().map(item -> {
+////                            return item.getName() + "@" + item.getKey();
+////                        }
+////                ).collect(Collectors.toList());
+////                String[] fireSystemNameStr = fireSystemNameList.toArray(new String[fireSystemNameList.size()]);
+////                return fireSystemNameStr;
 //        }
-//                ).collect(Collectors.toList());
-//                String[] buildingNameStr = buildingNameList.toArray(new String[buildingNameList.size()]);
-//                return buildingNameStr;
-            case "getFireSystemList":
-//                List<MenuFrom> fireSystemList = equipmentService.getFireSystemList();
-//                List<String> fireSystemNameList = fireSystemList.stream().map(item -> {
-//                            return item.getName() + "@" + item.getKey();
+//        return null;
 //    }
-//                ).collect(Collectors.toList());
-//                String[] fireSystemNameStr = fireSystemNameList.toArray(new String[fireSystemNameList.size()]);
-//                return fireSystemNameStr;
-        }
-        return null;
-    }
-}
+//}

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

-package com.yeejoin.amos.boot.module.jcs.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);
+//package com.yeejoin.amos.boot.module.jcs.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
+//		
 //	}
-//	        //设置日期
-//	        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);
+//
+//	@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 && 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);
+////	        //其他列
+////	        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-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/excel/TemplateCellWriteHandlerDate.java

-package com.yeejoin.amos.boot.module.jcs.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);
-	        });	
-		}
-
-		
-	}
-
-}
+//package com.yeejoin.amos.boot.module.jcs.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/FireChemicalMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
-
-/**
-* 危化品 Mapper 接口
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface FireChemicalMapper extends BaseMapper<FireChemical> {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireExpertsMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
-
-/**
-*  Mapper 接口
-*消防专家
-* @author system_generator
-* @date 2021-06-25
-*/
-public interface FireExpertsMapper extends BaseMapper<FireExperts> {
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireStationDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireStation;
-
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* 微型消防站 Mapper 接口
-*
-* @author system_generator
-* @date 2021-06-28
-*/
-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  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  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("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/WaterResourceCraneMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceCrane;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-*  Mapper 接口
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface WaterResourceCraneMapper extends BaseMapper<WaterResourceCrane> {
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceHydrant;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-*  Mapper 接口
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface WaterResourceHydrantMapper extends BaseMapper<WaterResourceHydrant> {
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceIot;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-*  Mapper 接口
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface WaterResourceIotMapper extends BaseMapper<WaterResourceIot> {
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResource;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * 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-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/WaterResourceNaturalMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceNatural;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-*  Mapper 接口
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface WaterResourceNaturalMapper extends BaseMapper<WaterResourceNatural> {
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourcePool;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-*  Mapper 接口
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface WaterResourcePoolMapper extends BaseMapper<WaterResourcePool> {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireChemicalService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-
-/**
-* 危化品接口类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface IFireChemicalService {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireExpertsService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-
-/**
-* 接口类
-*消防专家
-* @author system_generator
-* @date 2021-06-25
-*/
-public interface IFireExpertsService {
-
-}

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

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireStationDto;
-
-import org.apache.ibatis.annotations.Param;
-
-/**
-* 微型消防站接口类
-*
-* @author system_generator
-* @date 2021-06-28
-*/
-public interface IFireStationService {
-	Page<FireStationDto> getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@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/service/IFirefightersJacketService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
 import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 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/service/IPowerTransferService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireBrigadeResourceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceCraneService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-
-/**
-* 接口类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface IWaterResourceCraneService {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceHydrantService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-
-/**
-* 接口类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface IWaterResourceHydrantService {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceIotService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-
-/**
-* 接口类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface IWaterResourceIotService {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceNaturalService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-
-/**
-* 接口类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface IWaterResourceNaturalService {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourcePoolService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-
-/**
-* 接口类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface IWaterResourcePoolService {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IWaterResourceService.java

-package com.yeejoin.amos.boot.module.jcs.api.service;
-
-
-/**
-* 接口类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-public interface IWaterResourceService {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireChemicalMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireChemicalMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireExpertsMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireExpertsMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireStationMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceCraneMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceCraneMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceHydrantMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceHydrantMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceIotMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceIotMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceMapper">
-
-    <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceDto">
-        select r.name,
-               r.address,
-               r.resource_type_name,
-               r.belong_building,
-               r.belong_fighting_system,
-               r.management_unit,
-               r.maintenance_unit,
-               r.build_date,
-               r.enable_date,
-               r.orientation_img,
-               r.reality_img,
-               r.contact_user,
-               r.contact_phone,
-               (case r.resource_type when 'crane' then rc.height when 'natural' then rn.height end) height,
-               (case r.resource_type  when 'crane' then rc.status when 'pool' then rp.status when 'natural' then rn.status end) status,
-               (case r.resource_type when 'crane' then rc.section when 'pool'  then rp.section end) section,
-               (case r.resource_type when 'crane' then rc.pipe_network when 'hydarant' then rh.pipe_network end) pipe_network,
-               (case r.resource_type when 'crane' then rc.pipe_type_name when 'hydarant' then rh.pipe_type_name when 'pool' then rp.pipe_type_name end) pipe_type_name,
-               (case r.resource_type when 'crane' then rc.pipe_diameter when 'hydarant' then rh.pipe_diameter end) pipe_diameter,
-               rc.inlet_pipe_diameter,
-               rc.outlet_pipe_diameter,
-               rc.waterfilling_lane_num,
-               (case r.resource_type when 'crane' then rc.water_supply_name when 'hydarant' then rh.water_supply_name when 'pool' then rp.water_supply_name end) water_supply_name,
-               (case when 'hydrant' then rh.type when 'natural' then rn.type end) type,
-               rh.system_type,
-               rh.facilities_category,
-               rh.road_junction_info,
-               rh.place_form,
-               rh.hose_connection,
-               (case r.resource_type when 'hydrant' then rh.intake_form when 'pool' then rp.intake_form end) intake_form,
-               (case r.resource_type when 'natural' then rn.volume when 'pool' then rp.volume end) volume,
-               rn.area,
-               rn.quality_situation_info,
-               rn.season_change_info,
-               rn.has_dry_season,
-               rn.dry_period_span,
-               rp.intake_height,
-               rp.elevation_difference,
-               rp.parking_position,
-               rp.parking_num,
-               ri.iot_water_storage,
-               ri.iot_flow_rate,
-               ri.iot_status,
-               ri.iot_pipe_pressure
-        from cb_water_resource r
-            left join cb_water_resource_pool rp
-        on r.sequence_nbr = rp.resource_id
-            left join cb_water_resource_crane rc on r.sequence_nbr = rc.resource_id
-            left join cb_water_resource_hydrant rh on r.sequence_nbr = rh.resource_id
-            left join cb_water_resource_natural rn on r.sequence_nbr = rn.resource_id
-            left join cb_water_resource_iot ri on r.sequence_nbr = ri.resource_id
-        where r.is_delete = #{isDelete}
-    </select>
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourceNaturalMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceNaturalMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/WaterResourcePoolMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourcePoolMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/pom.xml

@@ -15,17 +15,17 @@
 			<artifactId>amos-boot-module-common-api</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
-      <dependency>
-          <groupId>com.amosframework.boot</groupId>
-          <artifactId>amos-boot-module-jcs-api</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
-      </dependency>
-      <dependency>
-          <groupId>com.amosframework.boot</groupId>
-          <artifactId>amos-boot-module-jcs-biz</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
-      </dependency>
+<!--      <dependency>-->
+<!--          <groupId>com.amosframework.boot</groupId>-->
+<!--          <artifactId>amos-boot-module-jcs-api</artifactId>-->
+<!--          <version>1.0.0</version>-->
+<!--          <scope>compile</scope>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>com.amosframework.boot</groupId>-->
+<!--          <artifactId>amos-boot-module-jcs-biz</artifactId>-->
+<!--          <version>1.0.0</version>-->
+<!--          <scope>compile</scope>-->
+<!--      </dependency>-->
   </dependencies>
 </project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFormController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/AlertFormController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,9 +8,10 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormInitDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertFormInitDto;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertForm;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFormTypeController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/AlertFormTypeController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormTypeServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormType;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormTypeServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertFormValueController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/AlertFormValueController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormValueServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DataDictionaryController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DataDictionaryController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.Menu;
-import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,11 +21,22 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataDictionaryServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireChemicalController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FireChemicalServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
+import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
+import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataSourcesImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireChemicalServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
-* 危化品
-*
-* @author system_generator
-* @date 2021-06-29
-*/
+ * 危化品
+ *
+ * @author system_generator
+ * @date 2021-06-29
+ */
 @RestController
 @Api(tags = "危化品Api")
 @RequestMapping(value = "/common/fire-chemical")
@@ -30,79 +52,132 @@ public class FireChemicalController extends BaseController {
 
     @Autowired
     FireChemicalServiceImpl fireChemicalServiceImpl;
+    @Autowired
+    DataSourcesImpl dataSourcesImpl;	
 
     /**
      * 新增危化品
+     *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增危化品", notes = "新增危化品")
-	public ResponseModel<FireChemicalDto> save(@RequestBody FireChemicalDto model)
-	{
-	    model=fireChemicalServiceImpl.createWithModel(model);
+    public ResponseModel<FireChemicalDto> save(@RequestBody FireChemicalDto model) {
+        model = fireChemicalServiceImpl.createWithModel(model);
         return ResponseHelper.buildResponse(model);
     }
+
     /**
      * 根据sequenceNbr更新
+     *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新危化品", notes = "根据sequenceNbr更新危化品")
-	public ResponseModel<FireChemicalDto> updateBySequenceNbrFireChemical(@RequestBody FireChemicalDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<FireChemicalDto> updateBySequenceNbrFireChemical(@RequestBody FireChemicalDto model,
+                                                                          @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         model.setSequenceNbr(sequenceNbr);
         return ResponseHelper.buildResponse(fireChemicalServiceImpl.updateWithModel(model));
     }
+
     /**
      * 根据sequenceNbr删除
+     *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
+    @DeleteMapping(value = "/batch")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除危化品", notes = "根据sequenceNbr删除危化品")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(fireChemicalServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "ids") String sequenceNbr) {
+
+        @SuppressWarnings("rawtypes")
+        List lt = Arrays.asList(sequenceNbr.split(","));
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.updateisDelete(lt));
     }
+
     /**
      * 根据sequenceNbr查询
+     *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个危化品",  notes = "根据sequenceNbr查询单个危化品")
-	public ResponseModel<FireChemicalDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个危化品", notes = "根据sequenceNbr查询单个危化品")
+    public ResponseModel<FireChemicalDto> seleteOne(@PathVariable Long sequenceNbr) {
         return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryBySeq(sequenceNbr));
     }
+
     /**
      * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
+     *
+     * @param current 当前页
+     * @param current 每页大小
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "危化品分页查询",  notes = "危化品分页查询")
-	public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<FireChemicalDto> page=new Page<FireChemicalDto>();
+    @ApiOperation(httpMethod = "GET", value = "危化品分页查询", notes = "危化品分页查询")
+    public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                             @RequestParam(value = "size") int size, String casNo,
+                                                             String formula, String name, String typeCode) {
+        Page<FireChemicalDto> page = new Page<FireChemicalDto>();
         page.setCurrent(current);
         page.setSize(size);
-	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page));
+        boolean isDelete = false;
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page, casNo, formula,
+                name, typeCode, isDelete));
     }
+
     /**
-	*列表全部数据查询
-	*@return
+     * 列表全部数据查询
+     *
+     * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "危化品列表全部数据查询",   notes = "危化品列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "危化品列表全部数据查询", notes = "危化品列表全部数据查询")
     @GetMapping(value = "/list")
-	public ResponseModel<List<FireChemicalDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalList());
+    public ResponseModel<List<FireChemicalDto>> selectForList() {
+        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalList(false));
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导入危化品")
+    @PostMapping("/import_batch")
+    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
+        List<FireChemicalDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireChemicalDto.class,
+                1);
+        List<FireChemical> excelEntityList = new ArrayList<>();
+        excelDtoList.forEach(
+                item -> {
+                    FireChemical fireChemical = new FireChemical();
+                    fireChemical = Bean.toPo(item, fireChemical);
+                    if (fireChemical.getType() != null) {
+                        String[] type = fireChemical.getType().split("@");
+                        fireChemical.setType(type[0]);
+                        fireChemical.setTypeCode(type[1]);
+                    }
+                    excelEntityList.add(fireChemical);
+                }
+        );
+        fireChemicalServiceImpl.saveBatch(excelEntityList);
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导出危化品")
+    @GetMapping("/export")
+    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
+        try {
+            List<FireChemicalDto> data = fireChemicalServiceImpl.queryForFireChemicalList(false);
+            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
+                    FireChemicalDto.class, dataSourcesImpl, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("系统异常！");
+        }
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,23 +36,20 @@ import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
+import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataSourcesImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.utils.BeanDtoVoUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 
 /**
@@ -47,6 +72,9 @@ public class FireExpertsController extends BaseController {
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
 
+    @Autowired
+    DataSourcesImpl dataSourcesImpl;	
+
     /**
      * 新增
      *
@@ -124,6 +152,7 @@ public class FireExpertsController extends BaseController {
         FireExperts fireExperts = BeanDtoVoUtils.convert(fireExpertsDto, FireExperts.class);
         Page<FireExperts> pageBean;
         QueryWrapper<FireExperts> fireExpertsQueryWrapper = new QueryWrapper<>();
+        fireExpertsQueryWrapper.eq("is_delete", false);
         Class<? extends FireExperts> aClass = fireExperts.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
             try {
@@ -170,7 +199,7 @@ public class FireExpertsController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<FireExpertsDto>> selectForList() {
-        List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList();
+        List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false);
         fireExpertsDtoList.stream().map(item -> {
             item.setAge(BeanDtoVoUtils.getAge(item.getBirthdayTime()));
             return item;
@@ -191,12 +220,60 @@ public class FireExpertsController extends BaseController {
         Collection<DataDictionary> list = dataDictionaryService.list(queryWrapper);
         List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
                 , "getParent");
-        Menu menu = new Menu(-1L, "专家领域", -1L, true, menus);
+        Menu menu = new Menu(-1L, "专家领域", -1L, menus);
         List<Menu> menuList = new ArrayList<>();
         menuList.add(menu);
         // 创建挂在主节点
         return ResponseHelper.buildResponse(menuList);
     }
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "批量导入消防专家")
+    @PostMapping("/import_batch")
+    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
+        List<FireExpertsDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireExpertsDto.class, 1);
+        List<FireExperts> excelEntityList = new ArrayList<>();
+        excelDtoList.forEach(
+                fireExpertsDto -> {
+                    FireExperts fireExperts = new FireExperts();
+                    fireExperts = Bean.toPo(fireExpertsDto, fireExperts);
+                    if (fireExperts.getCertificatesType() != null) {
+                        String[] certificates = fireExperts.getCertificatesType().split("@");
+                        fireExperts.setCertificatesType(certificates[0]);
+                        fireExperts.setCertificatesTypeCode(certificates[1]);
+                    }
+                    if (fireExperts.getJobs() != null) {
+                        String[] jobs = fireExperts.getJobs().split("@");
+                        fireExperts.setJobs(jobs[0]);
+                        fireExperts.setJobsCode(jobs[1]);
+                    }
+                    if (fireExperts.getExpert() != null) {
+                        String[] expert = fireExperts.getExpert().split("@");
+                        fireExperts.setExpert(expert[0]);
+                        fireExperts.setExpertCode(expert[1]);
+                    }
+                    if (fireExperts.getHighestEducation() != null) {
+                        String[] highestEducation = fireExperts.getHighestEducation().split("@");
+                        fireExperts.setHighestEducation(highestEducation[0]);
+                    }
+                    excelEntityList.add(fireExperts);
+                }
+        );
+        fireExpertsServiceImpl.saveBatch(excelEntityList);
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导出消防专家")
+    @GetMapping("/export")
+    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
+        try {
+            List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false);
+            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireExpertsDtoList,
+                    FireExpertsDto.class, dataSourcesImpl, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("系统异常");
+        }
+    }
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireStationController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
@@ -40,7 +51,7 @@ public class FireStationController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增微型消防站", notes = "新增微型消防站")
 	public ResponseModel<FireStationDto> save(@RequestBody FireStationDto model)
 	{
-	    model=fireStationServiceImpl.createWithModel(model);
+	    model=fireStationServiceImpl.add(model);
 	    return ResponseHelper.buildResponse(model);
 	}
 	/**
@@ -53,7 +64,7 @@ public class FireStationController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新微型消防站", notes = "根据sequenceNbr更新微型消防站")
 	public ResponseModel<FireStationDto> updateBySequenceNbrFireStation(@RequestBody FireStationDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(fireStationServiceImpl.updateWithModel(model));
+	    return ResponseHelper.buildResponse(fireStationServiceImpl.Update(model));
 	}
 	/**
              * 根据sequenceNbr删除

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContactsController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersContactsController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContactsServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContractController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersContractController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,23 +28,11 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContractServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersEducationController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersEducationController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersEducationServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersPostController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersPostController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDataDto;
-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.jcs.biz.service.impl.FirefightersContactsServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersWorkexperienceServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,8 +16,25 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDataDto;
+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;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContactsServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersEducationServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersPostServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersWorkexperienceServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersThoughtController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersThoughtController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,23 +28,11 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersThoughtServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersThoughtServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersWorkexperienceController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersWorkexperienceController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersWorkexperienceServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersWorkexperience;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersWorkexperienceServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgDepartmentController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgDepartmentController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.Arrays;
 
@@ -22,11 +22,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormValueServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgPersonController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;
@@ -23,12 +23,12 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormValueServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrAuthController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrAuthController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.Arrays;
 
@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrAuthServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsrAuth;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrAuthServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
+package com.yeejoin.amos.boot.module.common.biz.controller;
 
 
 import java.util.Arrays;
@@ -26,13 +26,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormValueServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
-import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.web.bind.annotation.*;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIotDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIot;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural;
+import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool;
+import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
+import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataSourcesImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceCraneServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceHydrantServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceIotServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceNaturalServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourcePoolServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
@@ -27,23 +64,94 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
  * @date 2021-06-29
  */
 @RestController
-@Api(tags = "Api")
-@RequestMapping(value = "/common/water-resource")
+@Api(tags = "消防水源Api")
+@RequestMapping(value = "/water-resource")
 public class WaterResourceController extends BaseController {
 
     @Autowired
     WaterResourceServiceImpl waterResourceServiceImpl;
+    @Autowired
+    WaterResourceCraneServiceImpl waterResourceCraneService;
+    @Autowired
+    WaterResourceHydrantServiceImpl waterResourceHydrantService;
+    @Autowired
+    WaterResourceNaturalServiceImpl waterResourceNaturalService;
+    @Autowired
+    WaterResourcePoolServiceImpl waterResourcePoolService;
+    @Autowired
+    WaterResourceIotServiceImpl waterResourceIotService;
+    @Autowired
+    DataSourcesImpl dataSourcesImpl;	
 
     /**
      * 新增
      *
-     * @return
+     * @return 返回结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<WaterResourceDto> save(@RequestBody WaterResourceDto model) {
-        model = waterResourceServiceImpl.createWithModel(model);
+        String resourceType = model.getResourceType();
+        Optional<WaterResourceTypeEnum> resourceTypeEnum = EnumsUtils.getEnumObject(WaterResourceTypeEnum.class,
+                e -> e.getCode().equals(resourceType));
+        model.setResourceTypeName(resourceTypeEnum.get().getName());
+        model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
+        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
+        if (!StringUtils.isEmpty(resourceType)) {
+            switch (resourceType) {
+                case "hydrant":
+                    // 新增基础信息
+                    model.setIsIot(true);
+                    waterResourceServiceImpl.createWithModel(model);
+                    // 新增属性信息
+                    WaterResourceHydrantDto waterResourceHydrantDto = new WaterResourceHydrantDto();
+                    BeanUtils.copyProperties(model, waterResourceHydrantDto);
+                    waterResourceHydrantDto.setSequenceNbr(null);
+                    waterResourceHydrantDto.setResourceId(model.getSequenceNbr());
+                    waterResourceHydrantService.createWithModel(waterResourceHydrantDto);
+                    break;
+                case "crane":
+                    // 新增基础信息
+                    model.setIsIot(true);
+                    waterResourceServiceImpl.createWithModel(model);
+                    WaterResourceCraneDto waterResourceCraneDto = new WaterResourceCraneDto();
+                    BeanUtils.copyProperties(model, waterResourceCraneDto);
+                    waterResourceCraneDto.setSequenceNbr(null);
+                    waterResourceCraneDto.setResourceId(model.getSequenceNbr());
+                    waterResourceCraneService.createWithModel(waterResourceCraneDto);
+                    break;
+                case "natural":
+                    // 新增基础信息
+                    model.setIsIot(false);
+                    waterResourceServiceImpl.createWithModel(model);
+                    WaterResourceNaturalDto waterResourceNaturalDto = new WaterResourceNaturalDto();
+                    BeanUtils.copyProperties(model, waterResourceNaturalDto);
+                    waterResourceNaturalDto.setSequenceNbr(null);
+                    waterResourceNaturalDto.setResourceId(model.getSequenceNbr());
+                    waterResourceNaturalService.createWithModel(waterResourceNaturalDto);
+                    break;
+                case "pool":
+                    // 新增基础信息
+                    model.setIsIot(true);
+                    waterResourceServiceImpl.createWithModel(model);
+                    WaterResourcePoolDto waterResourcePoolDto = new WaterResourcePoolDto();
+                    BeanUtils.copyProperties(model, waterResourcePoolDto);
+                    waterResourcePoolDto.setSequenceNbr(null);
+                    waterResourcePoolDto.setResourceId(model.getSequenceNbr());
+                    waterResourcePoolService.createWithModel(waterResourcePoolDto);
+                    break;
+            }
+            // 新增物联信息
+            if (model.getIsIot()) {
+                WaterResourceIotDto waterResourceIotDto = model.getWaterResourceIotDto();
+                waterResourceIotDto.setResourceType(model.getResourceType());
+                waterResourceIotDto.setResourceId(model.getSequenceNbr());
+                waterResourceIotService.createWithModel(waterResourceIotDto);
+            }
+        } else {
+            waterResourceServiceImpl.createWithModel(model);
+        }
         return ResponseHelper.buildResponse(model);
     }
 
@@ -51,71 +159,245 @@ public class WaterResourceController extends BaseController {
      * 根据sequenceNbr更新
      *
      * @param sequenceNbr 主键
-     * @return
+     * @return 返回结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
     public ResponseModel<WaterResourceDto> updateBySequenceNbrWaterResource(@RequestBody WaterResourceDto model,
                                                                             @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        // 更新基本信息
         model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.updateWithModel(model));
+        model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
+        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
+        WaterResourceDto waterResourceDto = waterResourceServiceImpl.updateWithModel(model);
+        // 更新属性信息
+        String resourceType = model.getResourceType();
+        if (!StringUtils.isEmpty(resourceType)) {
+            switch (resourceType) {
+                case "hydrant":
+                    WaterResourceHydrantDto waterResourceHydrantDto = new WaterResourceHydrantDto();
+                    WaterResourceHydrant waterResourceHydrant =
+                            waterResourceHydrantService.getOne(new QueryWrapper<WaterResourceHydrant>().eq(
+                                    "resource_id",
+                                    sequenceNbr));
+                    BeanUtils.copyProperties(model, waterResourceHydrantDto);
+                    waterResourceHydrantDto.setSequenceNbr(waterResourceHydrant.getSequenceNbr());
+                    waterResourceHydrantService.updateWithModel(waterResourceHydrantDto);
+                    break;
+                case "crane":
+                    WaterResourceCraneDto waterResourceCraneDto = new WaterResourceCraneDto();
+                    WaterResourceCrane waterResourceCrane =
+                            waterResourceCraneService.getOne(new QueryWrapper<WaterResourceCrane>().eq("resource_id",
+                                    sequenceNbr));
+                    BeanUtils.copyProperties(model, waterResourceCraneDto);
+                    waterResourceCraneDto.setSequenceNbr(waterResourceCrane.getSequenceNbr());
+                    waterResourceCraneService.updateWithModel(waterResourceCraneDto);
+                    break;
+                case "natural":
+                    WaterResourceNaturalDto waterResourceNaturalDto = new WaterResourceNaturalDto();
+                    WaterResourceNatural waterResourceNatural =
+                            waterResourceNaturalService.getOne(new QueryWrapper<WaterResourceNatural>().eq(
+                                    "resource_id",
+                                    sequenceNbr));
+                    BeanUtils.copyProperties(model, waterResourceNaturalDto);
+                    waterResourceNaturalDto.setSequenceNbr(waterResourceNatural.getSequenceNbr());
+                    waterResourceNaturalService.updateWithModel(waterResourceNaturalDto);
+                    break;
+                case "pool":
+                    WaterResourcePoolDto waterResourcePoolDto = new WaterResourcePoolDto();
+                    WaterResourcePool waterResourcePool =
+                            waterResourcePoolService.getOne(new QueryWrapper<WaterResourcePool>().eq("resource_id",
+                                    sequenceNbr));
+                    BeanUtils.copyProperties(model, waterResourcePoolDto);
+                    waterResourcePoolDto.setSequenceNbr(waterResourcePool.getSequenceNbr());
+                    waterResourcePoolService.updateWithModel(waterResourcePoolDto);
+                    break;
+            }
+        }
+        // 更新物联信息
+        if (model.getIsIot()) {
+            WaterResourceIotDto waterResourceIotDto = model.getWaterResourceIotDto();
+            waterResourceIotDto.setResourceId(sequenceNbr);
+            waterResourceIotService.updateWithModel(waterResourceIotDto);
+        }
+        return ResponseHelper.buildResponse(waterResourceDto);
     }
 
     /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
-     * @return
+     * @return 返回结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-													  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        WaterResource waterResource = waterResourceServiceImpl.getById(sequenceNbr);
+        WaterResourceDto waterResourceDto = new WaterResourceDto();
+        BeanUtils.copyProperties(waterResource, waterResourceDto);
+        waterResourceDto.setIsDelete(false);
+        waterResourceServiceImpl.updateWithModel(waterResourceDto);
+        return ResponseHelper.buildResponse(true);
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param sequenceNbrList 主键
+     * @return 返回结果
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete_batch")
+    @ApiOperation(httpMethod = "DELETE", value = "批量删除", notes = "批量删除")
+    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
+        List<WaterResourceDto> waterResourceDtos = waterResourceServiceImpl.queryBatchSeq(sequenceNbrList);
+        List<WaterResource> resourceList = waterResourceDtos.stream().map(item -> {
+            WaterResource waterResource = new WaterResource();
+            BeanUtils.copyProperties(item, waterResource);
+            waterResource.setIsDelete(false);
+            return waterResource;
+        }).collect(Collectors.toList());
+        boolean batchDelete = waterResourceServiceImpl.updateBatchById(resourceList);
+        return ResponseHelper.buildResponse(batchDelete);
     }
 
     /**
      * 根据sequenceNbr查询
      *
      * @param sequenceNbr 主键
-     * @return
+     * @return 返回结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<WaterResourceDto> seleteOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryBySeq(sequenceNbr));
+    public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long sequenceNbr) {
+        // 查询基本信息
+        WaterResourceDto waterResourceDto = waterResourceServiceImpl.queryBySeq(sequenceNbr);
+        waterResourceDto.setRealityImgList(JSONArray.parseArray(waterResourceDto.getRealityImg(), Object.class));
+        waterResourceDto.setOrientationImgList(JSONArray.parseArray(waterResourceDto.getOrientationImg()));
+        Boolean isDelete = waterResourceDto.getIsDelete();
+        // 查询属性信息
+        String resourceType = waterResourceDto.getResourceType();
+        if (!StringUtils.isEmpty(resourceType)) {
+            switch (resourceType) {
+                case "hydrant":
+                    WaterResourceHydrant waterResourceHydrant =
+                            waterResourceHydrantService.getOne(new QueryWrapper<WaterResourceHydrant>().eq(
+                                    "resource_id",
+                                    sequenceNbr));
+                    BeanUtils.copyProperties(waterResourceHydrant, waterResourceDto);
+                    break;
+                case "crane":
+                    WaterResourceCrane waterResourceCrane =
+                            waterResourceCraneService.getOne(new QueryWrapper<WaterResourceCrane>().eq("resource_id",
+                                    sequenceNbr));
+                    BeanUtils.copyProperties(waterResourceCrane, waterResourceDto);
+                    break;
+                case "natural":
+                    WaterResourceNatural waterResourceNatural =
+                            waterResourceNaturalService.getOne(new QueryWrapper<WaterResourceNatural>().eq(
+                                    "resource_id",
+                                    sequenceNbr));
+                    BeanUtils.copyProperties(waterResourceNatural, waterResourceDto);
+                    break;
+                case "pool":
+                    WaterResourcePool waterResourcePool =
+                            waterResourcePoolService.getOne(new QueryWrapper<WaterResourcePool>().eq("resource_id",
+                                    sequenceNbr));
+                    BeanUtils.copyProperties(waterResourcePool, waterResourceDto);
+                    break;
+            }
+        }
+        waterResourceDto.setSequenceNbr(sequenceNbr);
+        waterResourceDto.setIsDelete(isDelete);
+        // 查询物联参数
+        if (waterResourceDto.getIsIot()) {
+            WaterResourceIot waterResourceIot = waterResourceIotService.getOne(new QueryWrapper<WaterResourceIot>().eq(
+                    "resource_id", sequenceNbr));
+            WaterResourceIotDto waterResourceIotDto = new WaterResourceIotDto();
+            BeanUtils.copyProperties(waterResourceIot, waterResourceIotDto);
+            waterResourceDto.setWaterResourceIotDto(waterResourceIotDto);
+        }
+        return ResponseHelper.buildResponse(waterResourceDto);
     }
 
     /**
      * 列表分页查询
      *
      * @param current 当前页
-     * @param current 每页大小
-     * @return
+     * @param size    每页大小
+     * @return 返回结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
     public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "current") int current,
-															  @RequestParam(value = "size") int size) {
-        Page<WaterResourceDto> page = new Page<WaterResourceDto>();
+                                                              @RequestParam(value = "size") int size, String name,
+                                                              String resourceType) {
+        Page<WaterResourceDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourcePage(page));
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourcePage(page, name,
+                resourceType, true));
     }
 
     /**
      * 列表全部数据查询
      *
-     * @return
+     * @return 返回结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<WaterResourceDto>> selectForList() {
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourceList());
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourceList(true));
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "批量导入消防水源")
+    @PostMapping("/import_batch")
+    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
+        List<WaterResourceDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, WaterResourceDto.class, 1);
+        excelDtoList.forEach(
+                item -> {
+                    if (item.getResourceTypeName() != null) {
+                        String[] resourceTypeName = item.getResourceTypeName().split("@");
+                        item.setResourceTypeName(resourceTypeName[0]);
+                        item.setResourceType(resourceTypeName[1]);
+                    }
+                    if (item.getSystemType() != null) {
+                        String[] systemType = item.getSystemType().split("@");
+                        item.setSystemType(systemType[0]);
+                        item.setSystemTypeCode(systemType[1]);
+                    }
+                    if (item.getPlaceForm() != null) {
+                        String[] placeForm = item.getPlaceForm().split("@");
+                        item.setPlaceForm(placeForm[0]);
+                        item.setPlaceFormCode(placeForm[1]);
+                    }
+                    if (item.getHoseConnection() != null) {
+                        String[] hoseConnection = item.getHoseConnection().split("@");
+                        item.setHoseConnection(hoseConnection[0]);
+                        item.setHoseConnectionCode(hoseConnection[1]);
+                    }
+                    waterResourceServiceImpl.importByExcel(item);
+                }
+        );
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导出消防水源")
+    @GetMapping("/export")
+    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
+        try {
+            List<WaterResourceDto> waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true);
+            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
+                    WaterResourceDto.class, dataSourcesImpl, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("系统异常");
+        }
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceCraneController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.List;
-
-import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceCraneServiceImpl;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceCraneServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
- * @author system_generator
- * @date 2021-06-29
- */
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
 @RestController
 @Api(tags = "Api")
-@RequestMapping(value = "/common/water-resource-crane")
+@RequestMapping(value = "/jcs/water-resource-crane")
 public class WaterResourceCraneController extends BaseController {
 
     @Autowired
@@ -36,85 +43,76 @@ public class WaterResourceCraneController extends BaseController {
 
     /**
              * 新增
-     *
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<WaterResourceCraneDto> save(@RequestBody WaterResourceCraneDto model) {
-        model = waterResourceCraneServiceImpl.createWithModel(model);
+	public ResponseModel<WaterResourceCraneDto> save(@RequestBody WaterResourceCraneDto model)
+	{
+	    model=waterResourceCraneServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
-
 	/**
              * 根据sequenceNbr更新
-     *
     * @param sequenceNbr 主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<WaterResourceCraneDto> updateBySequenceNbrWaterResourceCrane(@RequestBody WaterResourceCraneDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<WaterResourceCraneDto> updateBySequenceNbrWaterResourceCrane(@RequestBody WaterResourceCraneDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.updateWithModel(model));
 	}
-
 	/**
              * 根据sequenceNbr删除
-     *
     * @param sequenceNbr 主键
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-													  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.removeById(sequenceNbr));
     }
-
     /**
              * 根据sequenceNbr查询
-     *
     * @param sequenceNbr  主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<WaterResourceCraneDto> seleteOne(@PathVariable Long sequenceNbr) {
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceCraneDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
 	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryBySeq(sequenceNbr));
 	}
-
 	/**
              * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
+    *@param current 当前页
+    *@param current 每页大小
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<WaterResourceCraneDto>> queryForPage(@RequestParam(value = "current") int current,
-																   @RequestParam(value = "size") int size) {
-        Page<WaterResourceCraneDto> page = new Page<WaterResourceCraneDto>();
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceCraneDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceCraneDto> page=new Page<WaterResourceCraneDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryForWaterResourceCranePage(page));
 	}
-
 	/**
-     * 列表全部数据查询
-     *
-     * @return
+	*列表全部数据查询
+	*@return
 	*/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-    public ResponseModel<List<WaterResourceCraneDto>> selectForList() {
+	public ResponseModel<List<WaterResourceCraneDto>>  selectForList()
+	{
 	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryForWaterResourceCraneList());
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceHydrantController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.List;
-
-import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceHydrantServiceImpl;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceHydrantServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
- * @author system_generator
- * @date 2021-06-29
- */
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
 @RestController
 @Api(tags = "Api")
-@RequestMapping(value = "/common/water-resource-hydrant")
+@RequestMapping(value = "/jcs/water-resource-hydrant")
 public class WaterResourceHydrantController extends BaseController {
 
     @Autowired
@@ -36,85 +43,76 @@ public class WaterResourceHydrantController extends BaseController {
 
     /**
              * 新增
-     *
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<WaterResourceHydrantDto> save(@RequestBody WaterResourceHydrantDto model) {
-        model = waterResourceHydrantServiceImpl.createWithModel(model);
+	public ResponseModel<WaterResourceHydrantDto> save(@RequestBody WaterResourceHydrantDto model)
+	{
+	    model=waterResourceHydrantServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
-
 	/**
              * 根据sequenceNbr更新
-     *
     * @param sequenceNbr 主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<WaterResourceHydrantDto> updateBySequenceNbrWaterResourceHydrant(@RequestBody WaterResourceHydrantDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<WaterResourceHydrantDto> updateBySequenceNbrWaterResourceHydrant(@RequestBody WaterResourceHydrantDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.updateWithModel(model));
 	}
-
 	/**
              * 根据sequenceNbr删除
-     *
     * @param sequenceNbr 主键
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-													  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.removeById(sequenceNbr));
     }
-
     /**
              * 根据sequenceNbr查询
-     *
     * @param sequenceNbr  主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<WaterResourceHydrantDto> seleteOne(@PathVariable Long sequenceNbr) {
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceHydrantDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
 	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryBySeq(sequenceNbr));
 	}
-
 	/**
              * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
+    *@param current 当前页
+    *@param current 每页大小
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<WaterResourceHydrantDto>> queryForPage(@RequestParam(value = "current") int current,
-																	 @RequestParam(value = "size") int size) {
-        Page<WaterResourceHydrantDto> page = new Page<WaterResourceHydrantDto>();
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceHydrantDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceHydrantDto> page=new Page<WaterResourceHydrantDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryForWaterResourceHydrantPage(page));
 	}
-
 	/**
-     * 列表全部数据查询
-     *
-     * @return
+	*列表全部数据查询
+	*@return
 	*/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-    public ResponseModel<List<WaterResourceHydrantDto>> selectForList() {
+	public ResponseModel<List<WaterResourceHydrantDto>>  selectForList()
+	{
 	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryForWaterResourceHydrantList());
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceIotController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.List;
-
-import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceIotServiceImpl;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIotDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceIotServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
- * @author system_generator
- * @date 2021-06-29
- */
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
 @RestController
 @Api(tags = "Api")
-@RequestMapping(value = "/common/water-resource-iot")
+@RequestMapping(value = "/jcs/water-resource-iot")
 public class WaterResourceIotController extends BaseController {
 
     @Autowired
@@ -36,85 +43,76 @@ public class WaterResourceIotController extends BaseController {
 
     /**
              * 新增
-     *
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<WaterResourceIotDto> save(@RequestBody WaterResourceIotDto model) {
-        model = waterResourceIotServiceImpl.createWithModel(model);
+	public ResponseModel<WaterResourceIotDto> save(@RequestBody WaterResourceIotDto model)
+	{
+	    model=waterResourceIotServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
-
 	/**
              * 根据sequenceNbr更新
-     *
     * @param sequenceNbr 主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<WaterResourceIotDto> updateBySequenceNbrWaterResourceIot(@RequestBody WaterResourceIotDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<WaterResourceIotDto> updateBySequenceNbrWaterResourceIot(@RequestBody WaterResourceIotDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.updateWithModel(model));
 	}
-
 	/**
              * 根据sequenceNbr删除
-     *
     * @param sequenceNbr 主键
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-													  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(waterResourceIotServiceImpl.removeById(sequenceNbr));
     }
-
     /**
              * 根据sequenceNbr查询
-     *
     * @param sequenceNbr  主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<WaterResourceIotDto> seleteOne(@PathVariable Long sequenceNbr) {
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceIotDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
 	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryBySeq(sequenceNbr));
 	}
-
 	/**
              * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
+    *@param current 当前页
+    *@param current 每页大小
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<WaterResourceIotDto>> queryForPage(@RequestParam(value = "current") int current,
-																 @RequestParam(value = "size") int size) {
-        Page<WaterResourceIotDto> page = new Page<WaterResourceIotDto>();
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceIotDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceIotDto> page=new Page<WaterResourceIotDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryForWaterResourceIotPage(page));
 	}
-
 	/**
-     * 列表全部数据查询
-     *
-     * @return
+	*列表全部数据查询
+	*@return
 	*/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-    public ResponseModel<List<WaterResourceIotDto>> selectForList() {
+	public ResponseModel<List<WaterResourceIotDto>>  selectForList()
+	{
 	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryForWaterResourceIotList());
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceNaturalController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.List;
-
-import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceNaturalServiceImpl;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceNaturalServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
- * @author system_generator
- * @date 2021-06-29
- */
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
 @RestController
 @Api(tags = "Api")
-@RequestMapping(value = "/common/water-resource-natural")
+@RequestMapping(value = "/jcs/water-resource-natural")
 public class WaterResourceNaturalController extends BaseController {
 
     @Autowired
@@ -36,85 +43,76 @@ public class WaterResourceNaturalController extends BaseController {
 
     /**
              * 新增
-     *
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<WaterResourceNaturalDto> save(@RequestBody WaterResourceNaturalDto model) {
-        model = waterResourceNaturalServiceImpl.createWithModel(model);
+	public ResponseModel<WaterResourceNaturalDto> save(@RequestBody WaterResourceNaturalDto model)
+	{
+	    model=waterResourceNaturalServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
-
 	/**
              * 根据sequenceNbr更新
-     *
     * @param sequenceNbr 主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<WaterResourceNaturalDto> updateBySequenceNbrWaterResourceNatural(@RequestBody WaterResourceNaturalDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<WaterResourceNaturalDto> updateBySequenceNbrWaterResourceNatural(@RequestBody WaterResourceNaturalDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.updateWithModel(model));
 	}
-
 	/**
              * 根据sequenceNbr删除
-     *
     * @param sequenceNbr 主键
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-													  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.removeById(sequenceNbr));
     }
-
     /**
              * 根据sequenceNbr查询
-     *
     * @param sequenceNbr  主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<WaterResourceNaturalDto> seleteOne(@PathVariable Long sequenceNbr) {
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourceNaturalDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
 	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryBySeq(sequenceNbr));
 	}
-
 	/**
              * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
+    *@param current 当前页
+    *@param current 每页大小
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<WaterResourceNaturalDto>> queryForPage(@RequestParam(value = "current") int current,
-																	 @RequestParam(value = "size") int size) {
-        Page<WaterResourceNaturalDto> page = new Page<WaterResourceNaturalDto>();
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourceNaturalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourceNaturalDto> page=new Page<WaterResourceNaturalDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryForWaterResourceNaturalPage(page));
 	}
-
 	/**
-     * 列表全部数据查询
-     *
-     * @return
+	*列表全部数据查询
+	*@return
 	*/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-    public ResponseModel<List<WaterResourceNaturalDto>> selectForList() {
+	public ResponseModel<List<WaterResourceNaturalDto>>  selectForList()
+	{
 	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryForWaterResourceNaturalList());
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourcePoolController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.List;
-
-import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourcePoolServiceImpl;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourcePoolServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
- * @author system_generator
- * @date 2021-06-29
- */
+* 
+*
+* @author system_generator
+* @date 2021-06-29
+*/
 @RestController
 @Api(tags = "Api")
-@RequestMapping(value = "/common/water-resource-pool")
+@RequestMapping(value = "/jcs/water-resource-pool")
 public class WaterResourcePoolController extends BaseController {
 
     @Autowired
@@ -36,85 +43,76 @@ public class WaterResourcePoolController extends BaseController {
 
     /**
              * 新增
-     *
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<WaterResourcePoolDto> save(@RequestBody WaterResourcePoolDto model) {
-        model = waterResourcePoolServiceImpl.createWithModel(model);
+	public ResponseModel<WaterResourcePoolDto> save(@RequestBody WaterResourcePoolDto model)
+	{
+	    model=waterResourcePoolServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
-
 	/**
              * 根据sequenceNbr更新
-     *
     * @param sequenceNbr 主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<WaterResourcePoolDto> updateBySequenceNbrWaterResourcePool(@RequestBody WaterResourcePoolDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<WaterResourcePoolDto> updateBySequenceNbrWaterResourcePool(@RequestBody WaterResourcePoolDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.updateWithModel(model));
 	}
-
 	/**
              * 根据sequenceNbr删除
-     *
     * @param sequenceNbr 主键
     * @return
     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-													  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.removeById(sequenceNbr));
     }
-
     /**
              * 根据sequenceNbr查询
-     *
     * @param sequenceNbr  主键
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<WaterResourcePoolDto> seleteOne(@PathVariable Long sequenceNbr) {
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<WaterResourcePoolDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
 	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryBySeq(sequenceNbr));
 	}
-
 	/**
              * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
+    *@param current 当前页
+    *@param current 每页大小
     * @return
     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<WaterResourcePoolDto>> queryForPage(@RequestParam(value = "current") int current,
-																  @RequestParam(value = "size") int size) {
-        Page<WaterResourcePoolDto> page = new Page<WaterResourcePoolDto>();
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<WaterResourcePoolDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<WaterResourcePoolDto> page=new Page<WaterResourcePoolDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryForWaterResourcePoolPage(page));
 	}
-
 	/**
-     * 列表全部数据查询
-     *
-     * @return
+	*列表全部数据查询
+	*@return
 	*/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-    public ResponseModel<List<WaterResourcePoolDto>> selectForList() {
+	public ResponseModel<List<WaterResourcePoolDto>>  selectForList()
+	{
 	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryForWaterResourcePoolList());
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertFormServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/AlertFormServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormInitDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertListvalue;
-import com.yeejoin.amos.boot.module.jcs.api.dto.Items;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormService;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertFormInitDto;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertListvalue;
+import com.yeejoin.amos.boot.module.common.api.dto.Items;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertForm;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.common.api.mapper.AlertFormMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IAlertFormService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertFormTypeServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/AlertFormTypeServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormTypeDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormTypeMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormTypeService;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertFormTypeDto;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormType;
+import com.yeejoin.amos.boot.module.common.api.mapper.AlertFormTypeMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IAlertFormTypeService;
 
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertFormValueServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/AlertFormValueServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.List;
 
@@ -6,10 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-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.jcs.api.mapper.AlertFormValueMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertFormValueDto;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.mapper.AlertFormValueMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IAlertFormValueService;
+
 
 /**
 *  服务实现类

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataDictionaryServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DataDictionaryServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.DataDictionaryDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IDataDictionaryService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.yeejoin.amos.boot.module.common.api.dto.DataDictionaryDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IDataDictionaryService;
+
 /**
 * 数据字典 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DataSourcesImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+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.excel.DataSources;
+import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+@Service
+public class DataSourcesImpl implements DataSources {
+
+	@Resource
+	DataDictionaryMapper dataDictionaryMapper;
+
+	@Override
+	public String[] selectList(String type, String method) {
+		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-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireChemicalServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
 import com.yeejoin.amos.boot.module.common.api.mapper.FireChemicalMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireChemicalService;
+
 import org.springframework.stereotype.Service;
+
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Arrays;
 import java.util.List;
 /**
 * 危化品服务实现类
@@ -20,14 +28,21 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
         /**
          * 分页查询
          */
-        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page)   {
-                return this.queryForPage(page, null, false);
+        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page,   @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode,boolean isDelete)   {
+           return this.queryForPage(page, "", false,casNo, formula, name,  typeCode, isDelete);
         }
 
         /**
          * 列表查询 示例
          */
-        public List<FireChemicalDto> queryForFireChemicalList()   {
-                return this.queryForList("" , false);
+        public List<FireChemicalDto> queryForFireChemicalList(@Condition(Operator.eq) Boolean isDelete)   {
+                return this.queryForList("" , false,isDelete);
+        }
+        /**
+         * 删除
+         * */
+        public Boolean updateisDelete( List sequenceNbr)   {
+        	
+        	return this.update(new UpdateWrapper<FireChemical>().in("sequence_nbr", sequenceNbr).set("is_delete", 1));         	
        }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireExpertsServiceImpl.java

@@ -5,18 +5,23 @@ import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
 import com.yeejoin.amos.boot.module.common.api.mapper.FireExpertsMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireExpertsService;
+
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
+
 /**
-* 服务实现类
-*消防专家
-* @author system_generator
-* @date 2021-06-25
-*/
+ * 服务实现类
+ * 消防专家
+ *
+ * @author system_generator
+ * @date 2021-06-25
+ */
 @Service
-public class FireExpertsServiceImpl extends BaseService<FireExpertsDto,FireExperts,FireExpertsMapper> implements IFireExpertsService {
+public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExperts, FireExpertsMapper> implements IFireExpertsService {
     /**
      * 分页查询
      */
@@ -27,7 +32,7 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto,FireExper
     /**
      * 列表查询 示例
      */
-        public List<FireExpertsDto> queryForFireExpertsList()   {
-                return this.queryForList("" , false);
+    public List<FireExpertsDto> queryForFireExpertsList(@Condition(Operator.eq) Boolean isDelete) {
+        return this.queryForList("", false, isDelete);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.List;
-import java.util.Map;
 /**
-* 微型消防站服务实现类
-*
-* @author system_generator
-* @date 2021-06-28
-*/
+ * 微型消防站服务实现类
+ *
+ * @author system_generator
+ * @date 2021-06-28
+ */
 @Service
-public class FireStationServiceImpl extends BaseService<FireStationDto,FireStation,FireStationMapper> implements IFireStationService {
+public class FireStationServiceImpl extends BaseService<FireStationDto, FireStation, FireStationMapper>
+		implements IFireStationService {
 
 	@Autowired
 	FireStationMapper fireStationMapper;
+	@Autowired
+	OrgUsrMapper orgUsrMapper;
 
 	/**
 	 * 分页查询
@@ -36,12 +43,13 @@ public class FireStationServiceImpl extends BaseService<FireStationDto,FireStati
 	 * 列表查询 示例
 	 */
 	public List<FireStationDto> queryForFireStationList() {
-                return this.queryForList("" , false);
+		return this.queryForList("", false);
 	}
+
 	/**
 	 * 删除
-         * */
-        public Boolean updateisDelete( Long sequenceNbr)   {
+	 */
+	public Boolean updateisDelete(Long sequenceNbr) {
 
 		return this.update(new UpdateWrapper<FireStation>().eq("sequence_nbr", sequenceNbr).set("is_delete", 1));
 	}
@@ -49,7 +57,7 @@ public class FireStationServiceImpl extends BaseService<FireStationDto,FireStati
 	@Override
 	public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {
 		List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par);
-		    Map<String, Long> num = fireStationMapper.getFireStationCount((pageNum - 1) * pageSize, pageSize, par);
+		Map<String, Long> num = fireStationMapper.getFireStationCount(par);
 		Page<FireStationDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
 		return pageBean.setRecords(list);
 	}
@@ -58,18 +66,30 @@ public class FireStationServiceImpl extends BaseService<FireStationDto,FireStati
 	 * 
 	 * 新增
 	 * 
-		 * ***/
+	 ***/
 	public FireStationDto add(FireStationDto model) {
+
+		if (model.getBizCompanyId() != null) {
+			OrgUsr orgUsr = orgUsrMapper.selectById(model.getBizCompanyId());
+			model.setBizCompany(orgUsr.getBizOrgName());
+			model.setBizCompanyCode(orgUsr.getBizOrgCode());
+		}
 		FireStation entity = this.prepareEntity(model);
 		this.save(entity);
 		return Bean.toModel(entity, model);
 	}
+
 	/**
 	 * 
 	 * 修改
 	 * 
-		 * ***/
+	 ***/
 	public FireStationDto Update(FireStationDto model) {
+		if (model.getBizCompanyId() != null) {
+			OrgUsr orgUsr = orgUsrMapper.selectById(model.getBizCompanyId());
+			model.setBizCompany(orgUsr.getBizOrgName());
+			model.setBizCompanyCode(orgUsr.getBizOrgCode());
+		}
 		FireStation entity = this.prepareEntity(model);
 		this.updateById(entity);
 		return Bean.toModel(entity, model);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersContactsServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersContactsServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersContactsDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersContactsMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContactsService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersContactsDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersContactsMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersContactsService;
+
 /**
 * l联系人 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersContractServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersContractServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersContractDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersContractMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContractService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersContractDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersContractMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersContractService;
+
 /**
 * 消防员合同 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersEducationServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersEducationServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersEducationDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersEducationMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersEducationDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersEducationMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersEducationService;
+
 /**
 * 人员学历 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersPostServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersPostServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersPostDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersPostMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersPostService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersPostDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersPostMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersPostService;
+
 /**
 * 岗位信息 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.List;
 import java.util.Map;
@@ -7,10 +7,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-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.jcs.api.mapper.FirefightersMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersService;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersService;
 
 /**
 * 消防队员 服务实现类

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersThoughtServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersThoughtServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersThoughtDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersThoughtMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersThoughtService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersThoughtDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersThoughtMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersThoughtService;
+
 /**
 * 消防员思想谈话记录 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersWorkexperienceServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersWorkexperienceServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersWorkexperienceDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersWorkexperienceMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersWorkexperienceService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersWorkexperienceDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersWorkexperience;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersWorkexperienceMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersWorkexperienceService;
+
 /**
 * 工作经历 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrAuthServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrAuthServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrAuthDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrAuthMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrAuthService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrAuthDto;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsrAuth;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrAuthMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrAuthService;
+
 /**
 *  服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 
 import java.lang.reflect.Method;
@@ -24,22 +24,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFormValueDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgDepartmentFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgPersonFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.enums.OrgPersonEnum;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.AlertFormValueDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertForm;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceCraneServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
 import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceCraneMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceCraneService;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
 /**
 * 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceHydrantServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
 import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceHydrantMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceHydrantService;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
 /**
 * 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceIotServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIotDto;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIot;
 import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceIotMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceIotService;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIotDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
 /**
 * 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceNaturalServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural;
 import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceNaturalMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceNaturalService;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
 /**
 * 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourcePoolServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool;
 import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourcePoolMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourcePoolService;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
 /**
 * 服务实现类
 *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.List;
+import java.util.Optional;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceIotDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceNaturalDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourcePoolDto;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
+import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+
 /**
-* 服务实现类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2021-06-29
+ */
 @Service
-public class WaterResourceServiceImpl extends BaseService<WaterResourceDto,WaterResource,WaterResourceMapper> implements IWaterResourceService {
+public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, WaterResource, WaterResourceMapper> implements IWaterResourceService {
+
+    @Autowired
+    WaterResourceCraneServiceImpl waterResourceCraneService;
+    @Autowired
+    WaterResourceHydrantServiceImpl waterResourceHydrantService;
+    @Autowired
+    WaterResourceNaturalServiceImpl waterResourceNaturalService;
+    @Autowired
+    WaterResourcePoolServiceImpl waterResourcePoolService;
+    @Autowired
+    WaterResourceIotServiceImpl waterResourceIotService;
+    @Resource
+    WaterResourceMapper waterResourceMapper;
+
     /**
      * 分页查询
      */
-        public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page)   {
-                return this.queryForPage(page, null, false);
+    public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page,
+                                                            @Condition(Operator.like) String name,
+                                                            @Condition(Operator.eq) String resourceType,
+                                                            @Condition(Operator.eq) Boolean isDelete) {
+        return this.queryForPage(page, null, false, name, resourceType, isDelete);
     }
 
     /**
      * 列表查询 示例
      */
-        public List<WaterResourceDto> queryForWaterResourceList()   {
-                return this.queryForList("" , false);
+    public List<WaterResourceDto> queryForWaterResourceList(@Condition(Operator.eq) Boolean isDelete) {
+        return this.queryForList("", false, isDelete);
+    }
+
+
+    /**
+     * excel导入
+     *
+     * @param model
+     * @return
+     */
+    public WaterResourceDto importByExcel(WaterResourceDto model) {
+        String resourceType = model.getResourceType();
+        Optional<WaterResourceTypeEnum> resourceTypeEnum = EnumsUtils.getEnumObject(WaterResourceTypeEnum.class,
+                e -> e.getCode().equals(resourceType));
+        model.setResourceTypeName(resourceTypeEnum.get().getName());
+        model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
+        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
+        if (!StringUtils.isEmpty(resourceType)) {
+            switch (resourceType) {
+                case "hydrant":
+                    // 新增基础信息
+                    model.setIsIot(true);
+                    createWithModel(model);
+                    // 新增属性信息
+                    WaterResourceHydrantDto waterResourceHydrantDto = new WaterResourceHydrantDto();
+                    BeanUtils.copyProperties(model, waterResourceHydrantDto);
+                    waterResourceHydrantDto.setSequenceNbr(null);
+                    waterResourceHydrantDto.setResourceId(model.getSequenceNbr());
+                    waterResourceHydrantService.createWithModel(waterResourceHydrantDto);
+                    break;
+                case "crane":
+                    // 新增基础信息
+                    model.setIsIot(true);
+                    createWithModel(model);
+                    WaterResourceCraneDto waterResourceCraneDto = new WaterResourceCraneDto();
+                    BeanUtils.copyProperties(model, waterResourceCraneDto);
+                    waterResourceCraneDto.setSequenceNbr(null);
+                    waterResourceCraneDto.setResourceId(model.getSequenceNbr());
+                    waterResourceCraneService.createWithModel(waterResourceCraneDto);
+                    break;
+                case "natural":
+                    // 新增基础信息
+                    model.setIsIot(false);
+                    createWithModel(model);
+                    WaterResourceNaturalDto waterResourceNaturalDto = new WaterResourceNaturalDto();
+                    BeanUtils.copyProperties(model, waterResourceNaturalDto);
+                    waterResourceNaturalDto.setSequenceNbr(null);
+                    waterResourceNaturalDto.setResourceId(model.getSequenceNbr());
+                    waterResourceNaturalService.createWithModel(waterResourceNaturalDto);
+                    break;
+                case "pool":
+                    // 新增基础信息
+                    model.setIsIot(true);
+                    createWithModel(model);
+                    WaterResourcePoolDto waterResourcePoolDto = new WaterResourcePoolDto();
+                    BeanUtils.copyProperties(model, waterResourcePoolDto);
+                    waterResourcePoolDto.setSequenceNbr(null);
+                    waterResourcePoolDto.setResourceId(model.getSequenceNbr());
+                    waterResourcePoolService.createWithModel(waterResourcePoolDto);
+                    break;
+            }
+            // 新增物联信息
+            if (model.getIsIot()) {
+                WaterResourceIotDto waterResourceIotDto = new WaterResourceIotDto();
+                BeanUtils.copyProperties(model, waterResourceIotDto);
+                waterResourceIotDto.setSequenceNbr(null);
+                waterResourceIotDto.setResourceType(model.getResourceType());
+                waterResourceIotDto.setResourceId(model.getSequenceNbr());
+                waterResourceIotService.createWithModel(waterResourceIotDto);
+            }
+        } else {
+            createWithModel(model);
+        }
+        return model;
+    }
+
+    /**
+     * 导出列表
+     */
+    public List<WaterResourceDto> exportToExcel(@Condition(Operator.eq) Boolean isDelete) {
+        return waterResourceMapper.exportToExcel(isDelete);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/pom.xml

@@ -15,6 +15,11 @@
 			<artifactId>amos-boot-module-jcs-api</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
+      <dependency>
+          <groupId>com.amosframework.boot</groupId>
+          <artifactId>amos-boot-module-common-biz</artifactId>
+          <version>${amos-biz-boot.version}</version>
+      </dependency>
   </dependencies>
 
 </project>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -3,13 +3,9 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
-import com.yeejoin.amos.boot.module.jcs.api.excel.ExcelUtil;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,15 +28,18 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
+import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
+import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataSourcesImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AircraftServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
 
 /**
  * 航空器信息
@@ -55,8 +54,8 @@ public class AircraftController extends BaseController {
 
     @Autowired
     private AircraftServiceImpl aircraftServiceImpl;
-    @Resource
-    DataDictionaryMapper dataDictionaryMapper;
+    @Autowired
+    DataSourcesImpl dataSourcesImpl;
 
     /**
      * 新增航空器信息
@@ -178,7 +177,7 @@ public class AircraftController extends BaseController {
         try {
             List<AircraftDto> data = aircraftServiceImpl.queryAircraftDtoForList(false);
             ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
-                    AircraftDto.class, dataDictionaryMapper, false);
+                    AircraftDto.class, dataSourcesImpl, false);
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("系统异常！");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -37,15 +37,15 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledRequestDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ESAlertCalledService;
 
 import io.swagger.annotations.Api;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -21,14 +20,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -16,12 +16,14 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
-import com.yeejoin.amos.boot.module.jcs.api.excel.ExcelUtil;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireChemicalServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
+import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
+import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataSourcesImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireChemicalServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,8 +41,8 @@ import io.swagger.annotations.ApiOperation;
 public class ExcelController extends BaseController {
 
 	
-	 @Resource
-	 DataDictionaryMapper dataDictionaryMapper;	
+	 @Autowired
+	    DataSourcesImpl dataSourcesImpl;	
 	 @Autowired
 	 FireChemicalServiceImpl fireChemicalServiceImpl;
 	 private final String  packageUrl="com.yeejoin.amos.boot.module.jcs.api.dto.";
@@ -52,7 +54,7 @@ public class ExcelController extends BaseController {
 	    try {
 	      String url=packageUrl+excelDto.getClassUrl();
 		  Class<?> clz = Class.forName(url);	    	
-	      ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,clz, dataDictionaryMapper,true);	 
+	      ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,clz, dataSourcesImpl,true);	 
 	    } catch (Exception e) {
 	        e.printStackTrace();
 	        throw new RuntimeException("系统异常！"); 
@@ -65,7 +67,7 @@ public class ExcelController extends BaseController {
 	public void getFireStationFile(HttpServletResponse response,ExcelDto excelDto ) {	 
 	    try {	        	
 	      List<FireChemicalDto> date=  fireChemicalServiceImpl.queryForFireChemicalList(false);
-	      ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), date,FireChemicalDto.class, dataDictionaryMapper,false);	 
+	      ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), date,FireChemicalDto.class, dataSourcesImpl,false);	 
 	    } catch (Exception e) {
 	        e.printStackTrace();
 	        throw new RuntimeException("系统异常！"); 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireChemicalController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
-import com.yeejoin.amos.boot.module.jcs.api.excel.ExcelUtil;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireChemicalServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-
-/**
- * 危化品
- *
- * @author system_generator
- * @date 2021-06-29
- */
-@RestController
-@Api(tags = "危化品Api")
-@RequestMapping(value = "/common/fire-chemical")
-public class FireChemicalController extends BaseController {
-
-    @Autowired
-    FireChemicalServiceImpl fireChemicalServiceImpl;
-    @Resource
-    DataDictionaryMapper dataDictionaryMapper;
-
-    /**
-     * 新增危化品
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增危化品", notes = "新增危化品")
-    public ResponseModel<FireChemicalDto> save(@RequestBody FireChemicalDto model) {
-        model = fireChemicalServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新危化品", notes = "根据sequenceNbr更新危化品")
-    public ResponseModel<FireChemicalDto> updateBySequenceNbrFireChemical(@RequestBody FireChemicalDto model,
-                                                                          @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(fireChemicalServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/batch")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除危化品", notes = "根据sequenceNbr删除危化品")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "ids") String sequenceNbr) {
-
-        @SuppressWarnings("rawtypes")
-        List lt = Arrays.asList(sequenceNbr.split(","));
-        return ResponseHelper.buildResponse(fireChemicalServiceImpl.updateisDelete(lt));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个危化品", notes = "根据sequenceNbr查询单个危化品")
-    public ResponseModel<FireChemicalDto> seleteOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "危化品分页查询", notes = "危化品分页查询")
-    public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,
-                                                             @RequestParam(value = "size") int size, String casNo,
-                                                             String formula, String name, String typeCode) {
-        Page<FireChemicalDto> page = new Page<FireChemicalDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        boolean isDelete = false;
-        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page, casNo, formula,
-                name, typeCode, isDelete));
-    }
-
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "危化品列表全部数据查询", notes = "危化品列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireChemicalDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalList(false));
-    }
-
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "导入危化品")
-    @PostMapping("/import_batch")
-    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
-        List<FireChemicalDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireChemicalDto.class,
-                1);
-        List<FireChemical> excelEntityList = new ArrayList<>();
-        excelDtoList.forEach(
-                item -> {
-                    FireChemical fireChemical = new FireChemical();
-                    fireChemical = Bean.toPo(item, fireChemical);
-                    if (fireChemical.getType() != null) {
-                        String[] type = fireChemical.getType().split("@");
-                        fireChemical.setType(type[0]);
-                        fireChemical.setTypeCode(type[1]);
-                    }
-                    excelEntityList.add(fireChemical);
-                }
-        );
-        fireChemicalServiceImpl.saveBatch(excelEntityList);
-    }
-
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "导出危化品")
-    @GetMapping("/export")
-    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
-        try {
-            List<FireChemicalDto> data = fireChemicalServiceImpl.queryForFireChemicalList(false);
-            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
-                    FireChemicalDto.class, dataDictionaryMapper, false);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("系统异常！");
-        }
-    }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireExpertsController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.Menu;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireExpertsDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
-import com.yeejoin.amos.boot.module.jcs.api.excel.ExcelUtil;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireExpertsServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.utils.BeanDtoVoUtils;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-/**
- * 消防专家
- *
- * @author system_generator
- * @date 2021-06-25
- */
-@RestController
-@Api(tags = "消防专家Api")
-@RequestMapping(value = "/common/fire-experts")
-public class FireExpertsController extends BaseController {
-
-    @Autowired
-    FireExpertsServiceImpl fireExpertsServiceImpl;
-
-    @Autowired
-    RedisUtils redisUtils;
-
-    @Autowired
-    DataDictionaryServiceImpl dataDictionaryService;
-
-    @Resource
-    DataDictionaryMapper dataDictionaryMapper;
-
-    /**
-     * 新增
-     *
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<FireExpertsDto> save(@RequestBody FireExpertsDto model) {
-        model = fireExpertsServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<FireExpertsDto> updateBySequenceNbrFireExperts(@RequestBody FireExpertsDto model,
-                                                                        @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(fireExpertsServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        FireExperts fireExperts = fireExpertsServiceImpl.getById(sequenceNbr);
-        fireExperts.setIsDelete(true);
-        return ResponseHelper.buildResponse(fireExpertsServiceImpl.updateById(fireExperts));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<FireExpertsDto> selectOne(@PathVariable Long sequenceNbr) throws Exception {
-        FireExpertsDto fireExpertsDto = fireExpertsServiceImpl.queryBySeq(sequenceNbr);
-        Date birthdayTime = fireExpertsDto.getBirthdayTime();
-        int age = BeanDtoVoUtils.getAge(birthdayTime);
-        fireExpertsDto.setAge(age);
-        return ResponseHelper.buildResponse(fireExpertsDto);
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current        当前页
-     * @param size           每页大小
-     * @param fireExpertsDto 查询参数
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<IPage<FireExpertsDto>> queryForPage(@RequestParam(value = "current") int current,
-                                                             @RequestParam(value = "size") int size,
-                                                             FireExpertsDto fireExpertsDto) {
-        FireExperts fireExperts = BeanDtoVoUtils.convert(fireExpertsDto, FireExperts.class);
-        Page<FireExperts> pageBean;
-        QueryWrapper<FireExperts> fireExpertsQueryWrapper = new QueryWrapper<>();
-        fireExpertsQueryWrapper.eq("is_delete", false);
-        Class<? extends FireExperts> aClass = fireExperts.getClass();
-        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
-            try {
-                field.setAccessible(true);
-                Class<?> type = field.getType();
-                Object o = field.get(fireExperts);
-                if (o != null) {
-                    String name = NameUtils.camel2Underline(field.getName());
-                    if ("name".equalsIgnoreCase(name)) {
-                        String fileValue = (String) o;
-                        fireExpertsQueryWrapper.like(name, fileValue);
-                    } else if ("expert_code".equalsIgnoreCase(name)) {
-                        String fileValue = (String) o;
-                        fireExpertsQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(Integer.class)) {
-                        Integer fileValue = (Integer) o;
-                        fireExpertsQueryWrapper.eq(name, fileValue);
-                    } else if (type.equals(Long.class)) {
-                        Long fileValue = (Long) o;
-                        fireExpertsQueryWrapper.eq(name, fileValue);
-                    } else {
-                        String fileValue = (String) o;
-                        fireExpertsQueryWrapper.like(name, fileValue);
-                    }
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new RuntimeException("系统异常");
-            }
-        });
-        IPage<FireExperts> page;
-        pageBean = new Page<>(current, size);
-        page = fireExpertsServiceImpl.page(pageBean, fireExpertsQueryWrapper);
-        IPage<FireExpertsDto> fireExpertsDtoIPage = BeanDtoVoUtils.iPageDtoStreamFireExperts(page);
-        return ResponseHelper.buildResponse(fireExpertsDtoIPage);
-    }
-
-    /**
-     * 列表全部数据查询
-     *
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireExpertsDto>> selectForList() {
-        List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false);
-        fireExpertsDtoList.stream().map(item -> {
-            item.setAge(BeanDtoVoUtils.getAge(item.getBirthdayTime()));
-            return item;
-        }).collect(Collectors.toList());
-
-        return ResponseHelper.buildResponse(fireExpertsDtoList);
-    }
-
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/getExpertsTree", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "获取专家领域树", notes = "获取专家领域树")
-    public ResponseModel<Object> getExpertsTree() throws Exception {
-        String type = "ZJLY";
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-        queryWrapper.orderByAsc("sort_num");
-
-        Collection<DataDictionary> list = dataDictionaryService.list(queryWrapper);
-        List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
-                , "getParent");
-        Menu menu = new Menu(-1L, "专家领域", -1L, menus);
-        List<Menu> menuList = new ArrayList<>();
-        menuList.add(menu);
-        // 创建挂在主节点
-        return ResponseHelper.buildResponse(menuList);
-    }
-
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "批量导入消防专家")
-    @PostMapping("/import_batch")
-    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
-        List<FireExpertsDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireExpertsDto.class, 1);
-        List<FireExperts> excelEntityList = new ArrayList<>();
-        excelDtoList.forEach(
-                fireExpertsDto -> {
-                    FireExperts fireExperts = new FireExperts();
-                    fireExperts = Bean.toPo(fireExpertsDto, fireExperts);
-                    if (fireExperts.getCertificatesType() != null) {
-                        String[] certificates = fireExperts.getCertificatesType().split("@");
-                        fireExperts.setCertificatesType(certificates[0]);
-                        fireExperts.setCertificatesTypeCode(certificates[1]);
-                    }
-                    if (fireExperts.getJobs() != null) {
-                        String[] jobs = fireExperts.getJobs().split("@");
-                        fireExperts.setJobs(jobs[0]);
-                        fireExperts.setJobsCode(jobs[1]);
-                    }
-                    if (fireExperts.getExpert() != null) {
-                        String[] expert = fireExperts.getExpert().split("@");
-                        fireExperts.setExpert(expert[0]);
-                        fireExperts.setExpertCode(expert[1]);
-                    }
-                    if (fireExperts.getHighestEducation() != null) {
-                        String[] highestEducation = fireExperts.getHighestEducation().split("@");
-                        fireExperts.setHighestEducation(highestEducation[0]);
-                    }
-                    excelEntityList.add(fireExperts);
-                }
-        );
-        fireExpertsServiceImpl.saveBatch(excelEntityList);
-    }
-
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "导出消防专家")
-    @GetMapping("/export")
-    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
-        try {
-            List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false);
-            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireExpertsDtoList,
-                    FireExpertsDto.class, dataDictionaryMapper, false);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("系统异常");
-        }
-    }
-
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireStationController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireStationDto;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireStationServiceImpl;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-
-/**
-* 微型消防站
-*
-* @author system_generator
-* @date 2021-06-28
-*/
-@RestController
-@Api(tags = "微型消防站Api")
-@RequestMapping(value = "/common/fire-station")
-public class FireStationController extends BaseController {
-
-    @Autowired
-    FireStationServiceImpl fireStationServiceImpl;
-
-    /**
-             * 新增微型消防站
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增微型消防站", notes = "新增微型消防站")
-	public ResponseModel<FireStationDto> save(@RequestBody FireStationDto model)
-	{
-	    model=fireStationServiceImpl.add(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新微型消防站", notes = "根据sequenceNbr更新微型消防站")
-	public ResponseModel<FireStationDto> updateBySequenceNbrFireStation(@RequestBody FireStationDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(fireStationServiceImpl.Update(model));
-	}
-	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除微型消防站", notes = "根据sequenceNbr删除微型消防站")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(fireStationServiceImpl.updateisDelete(sequenceNbr));
-    }
-    /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个微型消防站",  notes = "根据sequenceNbr查询单个微型消防站")
-	public ResponseModel<FireStationDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
-	    return ResponseHelper.buildResponse(fireStationServiceImpl.queryBySeq(sequenceNbr));
-	}
-	/**
-    * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "微型消防站分页查询",  notes = "微型消防站分页查询")
-	public ResponseModel<Page<FireStationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<FireStationDto> page=new Page<FireStationDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationPage(page));
-	}
-	
-	/**
-	    * 新列表分页查询
-	    *@param current 当前页
-	    *@param current 每页大小
-	    * @return
-	    */
-		@TycloudOperation(ApiLevel = UserType.AGENCY)
-		@GetMapping(value = "/list/page")
-		@ApiOperation(httpMethod = "GET",value = "新微型消防站分页查询",  notes = "新微型消防站分页查询")
-		public ResponseModel<Page<FireStationDto>> getFireStation(@RequestParam(value = "pageNum") int pageNum,@RequestParam(value = "pageSize") int pageSize, FireStationDto fireStationDto)
-		{			
-			return ResponseHelper.buildResponse(fireStationServiceImpl.getFirefighters(pageNum, pageSize, fireStationDto));
-		}
-	
-	
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "微型消防站列表全部数据查询",   notes = "微型消防站列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<FireStationDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationList());
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireTeamController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.Menu;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-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 com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -27,12 +21,21 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+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;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 消防队伍

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -6,7 +6,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersInfoDto;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,21 +29,22 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-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.jcs.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
+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.common.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContactsServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContractServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersEducationServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersPostServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersThoughtServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersThoughtServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersJacketController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
 import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 消防人员配装记录

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
-import com.yeejoin.amos.boot.module.jcs.api.dto.*;
-import com.yeejoin.amos.boot.module.jcs.api.entity.*;
-import com.yeejoin.amos.boot.module.jcs.api.enums.WaterResourceTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.excel.ExcelUtil;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.DataDictionaryMapper;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.*;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.springframework.web.multipart.MultipartFile;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-
-/**
- * @author system_generator
- * @date 2021-06-29
- */
-@RestController
-@Api(tags = "消防水源Api")
-@RequestMapping(value = "/water-resource")
-public class WaterResourceController extends BaseController {
-
-    @Autowired
-    WaterResourceServiceImpl waterResourceServiceImpl;
-    @Autowired
-    WaterResourceCraneServiceImpl waterResourceCraneService;
-    @Autowired
-    WaterResourceHydrantServiceImpl waterResourceHydrantService;
-    @Autowired
-    WaterResourceNaturalServiceImpl waterResourceNaturalService;
-    @Autowired
-    WaterResourcePoolServiceImpl waterResourcePoolService;
-    @Autowired
-    WaterResourceIotServiceImpl waterResourceIotService;
-    @Resource
-    DataDictionaryMapper dataDictionaryMapper;
-
-    /**
-     * 新增
-     *
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<WaterResourceDto> save(@RequestBody WaterResourceDto model) {
-        String resourceType = model.getResourceType();
-        Optional<WaterResourceTypeEnum> resourceTypeEnum = EnumsUtils.getEnumObject(WaterResourceTypeEnum.class,
-                e -> e.getCode().equals(resourceType));
-        model.setResourceTypeName(resourceTypeEnum.get().getName());
-        model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
-        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
-        if (!StringUtils.isEmpty(resourceType)) {
-            switch (resourceType) {
-                case "hydrant":
-                    // 新增基础信息
-                    model.setIsIot(true);
-                    waterResourceServiceImpl.createWithModel(model);
-                    // 新增属性信息
-                    WaterResourceHydrantDto waterResourceHydrantDto = new WaterResourceHydrantDto();
-                    BeanUtils.copyProperties(model, waterResourceHydrantDto);
-                    waterResourceHydrantDto.setSequenceNbr(null);
-                    waterResourceHydrantDto.setResourceId(model.getSequenceNbr());
-                    waterResourceHydrantService.createWithModel(waterResourceHydrantDto);
-                    break;
-                case "crane":
-                    // 新增基础信息
-                    model.setIsIot(true);
-                    waterResourceServiceImpl.createWithModel(model);
-                    WaterResourceCraneDto waterResourceCraneDto = new WaterResourceCraneDto();
-                    BeanUtils.copyProperties(model, waterResourceCraneDto);
-                    waterResourceCraneDto.setSequenceNbr(null);
-                    waterResourceCraneDto.setResourceId(model.getSequenceNbr());
-                    waterResourceCraneService.createWithModel(waterResourceCraneDto);
-                    break;
-                case "natural":
-                    // 新增基础信息
-                    model.setIsIot(false);
-                    waterResourceServiceImpl.createWithModel(model);
-                    WaterResourceNaturalDto waterResourceNaturalDto = new WaterResourceNaturalDto();
-                    BeanUtils.copyProperties(model, waterResourceNaturalDto);
-                    waterResourceNaturalDto.setSequenceNbr(null);
-                    waterResourceNaturalDto.setResourceId(model.getSequenceNbr());
-                    waterResourceNaturalService.createWithModel(waterResourceNaturalDto);
-                    break;
-                case "pool":
-                    // 新增基础信息
-                    model.setIsIot(true);
-                    waterResourceServiceImpl.createWithModel(model);
-                    WaterResourcePoolDto waterResourcePoolDto = new WaterResourcePoolDto();
-                    BeanUtils.copyProperties(model, waterResourcePoolDto);
-                    waterResourcePoolDto.setSequenceNbr(null);
-                    waterResourcePoolDto.setResourceId(model.getSequenceNbr());
-                    waterResourcePoolService.createWithModel(waterResourcePoolDto);
-                    break;
-            }
-            // 新增物联信息
-            if (model.getIsIot()) {
-                WaterResourceIotDto waterResourceIotDto = model.getWaterResourceIotDto();
-                waterResourceIotDto.setResourceType(model.getResourceType());
-                waterResourceIotDto.setResourceId(model.getSequenceNbr());
-                waterResourceIotService.createWithModel(waterResourceIotDto);
-            }
-        } else {
-            waterResourceServiceImpl.createWithModel(model);
-        }
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<WaterResourceDto> updateBySequenceNbrWaterResource(@RequestBody WaterResourceDto model,
-                                                                            @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        // 更新基本信息
-        model.setSequenceNbr(sequenceNbr);
-        model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
-        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
-        WaterResourceDto waterResourceDto = waterResourceServiceImpl.updateWithModel(model);
-        // 更新属性信息
-        String resourceType = model.getResourceType();
-        if (!StringUtils.isEmpty(resourceType)) {
-            switch (resourceType) {
-                case "hydrant":
-                    WaterResourceHydrantDto waterResourceHydrantDto = new WaterResourceHydrantDto();
-                    WaterResourceHydrant waterResourceHydrant =
-                            waterResourceHydrantService.getOne(new QueryWrapper<WaterResourceHydrant>().eq(
-                                    "resource_id",
-                                    sequenceNbr));
-                    BeanUtils.copyProperties(model, waterResourceHydrantDto);
-                    waterResourceHydrantDto.setSequenceNbr(waterResourceHydrant.getSequenceNbr());
-                    waterResourceHydrantService.updateWithModel(waterResourceHydrantDto);
-                    break;
-                case "crane":
-                    WaterResourceCraneDto waterResourceCraneDto = new WaterResourceCraneDto();
-                    WaterResourceCrane waterResourceCrane =
-                            waterResourceCraneService.getOne(new QueryWrapper<WaterResourceCrane>().eq("resource_id",
-                                    sequenceNbr));
-                    BeanUtils.copyProperties(model, waterResourceCraneDto);
-                    waterResourceCraneDto.setSequenceNbr(waterResourceCrane.getSequenceNbr());
-                    waterResourceCraneService.updateWithModel(waterResourceCraneDto);
-                    break;
-                case "natural":
-                    WaterResourceNaturalDto waterResourceNaturalDto = new WaterResourceNaturalDto();
-                    WaterResourceNatural waterResourceNatural =
-                            waterResourceNaturalService.getOne(new QueryWrapper<WaterResourceNatural>().eq(
-                                    "resource_id",
-                                    sequenceNbr));
-                    BeanUtils.copyProperties(model, waterResourceNaturalDto);
-                    waterResourceNaturalDto.setSequenceNbr(waterResourceNatural.getSequenceNbr());
-                    waterResourceNaturalService.updateWithModel(waterResourceNaturalDto);
-                    break;
-                case "pool":
-                    WaterResourcePoolDto waterResourcePoolDto = new WaterResourcePoolDto();
-                    WaterResourcePool waterResourcePool =
-                            waterResourcePoolService.getOne(new QueryWrapper<WaterResourcePool>().eq("resource_id",
-                                    sequenceNbr));
-                    BeanUtils.copyProperties(model, waterResourcePoolDto);
-                    waterResourcePoolDto.setSequenceNbr(waterResourcePool.getSequenceNbr());
-                    waterResourcePoolService.updateWithModel(waterResourcePoolDto);
-                    break;
-            }
-        }
-        // 更新物联信息
-        if (model.getIsIot()) {
-            WaterResourceIotDto waterResourceIotDto = model.getWaterResourceIotDto();
-            waterResourceIotDto.setResourceId(sequenceNbr);
-            waterResourceIotService.updateWithModel(waterResourceIotDto);
-        }
-        return ResponseHelper.buildResponse(waterResourceDto);
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        WaterResource waterResource = waterResourceServiceImpl.getById(sequenceNbr);
-        WaterResourceDto waterResourceDto = new WaterResourceDto();
-        BeanUtils.copyProperties(waterResource, waterResourceDto);
-        waterResourceDto.setIsDelete(false);
-        waterResourceServiceImpl.updateWithModel(waterResourceDto);
-        return ResponseHelper.buildResponse(true);
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param sequenceNbrList 主键
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/delete_batch")
-    @ApiOperation(httpMethod = "DELETE", value = "批量删除", notes = "批量删除")
-    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
-        List<WaterResourceDto> waterResourceDtos = waterResourceServiceImpl.queryBatchSeq(sequenceNbrList);
-        List<WaterResource> resourceList = waterResourceDtos.stream().map(item -> {
-            WaterResource waterResource = new WaterResource();
-            BeanUtils.copyProperties(item, waterResource);
-            waterResource.setIsDelete(false);
-            return waterResource;
-        }).collect(Collectors.toList());
-        boolean batchDelete = waterResourceServiceImpl.updateBatchById(resourceList);
-        return ResponseHelper.buildResponse(batchDelete);
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long sequenceNbr) {
-        // 查询基本信息
-        WaterResourceDto waterResourceDto = waterResourceServiceImpl.queryBySeq(sequenceNbr);
-        waterResourceDto.setRealityImgList(JSONArray.parseArray(waterResourceDto.getRealityImg(), Object.class));
-        waterResourceDto.setOrientationImgList(JSONArray.parseArray(waterResourceDto.getOrientationImg()));
-        Boolean isDelete = waterResourceDto.getIsDelete();
-        // 查询属性信息
-        String resourceType = waterResourceDto.getResourceType();
-        if (!StringUtils.isEmpty(resourceType)) {
-            switch (resourceType) {
-                case "hydrant":
-                    WaterResourceHydrant waterResourceHydrant =
-                            waterResourceHydrantService.getOne(new QueryWrapper<WaterResourceHydrant>().eq(
-                                    "resource_id",
-                                    sequenceNbr));
-                    BeanUtils.copyProperties(waterResourceHydrant, waterResourceDto);
-                    break;
-                case "crane":
-                    WaterResourceCrane waterResourceCrane =
-                            waterResourceCraneService.getOne(new QueryWrapper<WaterResourceCrane>().eq("resource_id",
-                                    sequenceNbr));
-                    BeanUtils.copyProperties(waterResourceCrane, waterResourceDto);
-                    break;
-                case "natural":
-                    WaterResourceNatural waterResourceNatural =
-                            waterResourceNaturalService.getOne(new QueryWrapper<WaterResourceNatural>().eq(
-                                    "resource_id",
-                                    sequenceNbr));
-                    BeanUtils.copyProperties(waterResourceNatural, waterResourceDto);
-                    break;
-                case "pool":
-                    WaterResourcePool waterResourcePool =
-                            waterResourcePoolService.getOne(new QueryWrapper<WaterResourcePool>().eq("resource_id",
-                                    sequenceNbr));
-                    BeanUtils.copyProperties(waterResourcePool, waterResourceDto);
-                    break;
-            }
-        }
-        waterResourceDto.setSequenceNbr(sequenceNbr);
-        waterResourceDto.setIsDelete(isDelete);
-        // 查询物联参数
-        if (waterResourceDto.getIsIot()) {
-            WaterResourceIot waterResourceIot = waterResourceIotService.getOne(new QueryWrapper<WaterResourceIot>().eq(
-                    "resource_id", sequenceNbr));
-            WaterResourceIotDto waterResourceIotDto = new WaterResourceIotDto();
-            BeanUtils.copyProperties(waterResourceIot, waterResourceIotDto);
-            waterResourceDto.setWaterResourceIotDto(waterResourceIotDto);
-        }
-        return ResponseHelper.buildResponse(waterResourceDto);
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param size    每页大小
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
-    public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "current") int current,
-                                                              @RequestParam(value = "size") int size, String name,
-                                                              String resourceType) {
-        Page<WaterResourceDto> page = new Page<>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourcePage(page, name,
-                resourceType, true));
-    }
-
-    /**
-     * 列表全部数据查询
-     *
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<WaterResourceDto>> selectForList() {
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourceList(true));
-    }
-
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "批量导入消防水源")
-    @PostMapping("/import_batch")
-    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
-        List<WaterResourceDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, WaterResourceDto.class, 1);
-        excelDtoList.forEach(
-                item -> {
-                    if (item.getResourceTypeName() != null) {
-                        String[] resourceTypeName = item.getResourceTypeName().split("@");
-                        item.setResourceTypeName(resourceTypeName[0]);
-                        item.setResourceType(resourceTypeName[1]);
-                    }
-                    if (item.getSystemType() != null) {
-                        String[] systemType = item.getSystemType().split("@");
-                        item.setSystemType(systemType[0]);
-                        item.setSystemTypeCode(systemType[1]);
-                    }
-                    if (item.getPlaceForm() != null) {
-                        String[] placeForm = item.getPlaceForm().split("@");
-                        item.setPlaceForm(placeForm[0]);
-                        item.setPlaceFormCode(placeForm[1]);
-                    }
-                    if (item.getHoseConnection() != null) {
-                        String[] hoseConnection = item.getHoseConnection().split("@");
-                        item.setHoseConnection(hoseConnection[0]);
-                        item.setHoseConnectionCode(hoseConnection[1]);
-                    }
-                    waterResourceServiceImpl.importByExcel(item);
-                }
-        );
-    }
-
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @ApiOperation(value = "导出消防水源")
-    @GetMapping("/export")
-    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
-        try {
-            List<WaterResourceDto> waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true);
-            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
-                    WaterResourceDto.class, dataDictionaryMapper, false);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("系统异常");
-        }
-    }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceCraneController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceCraneServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceCraneDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
-
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@RestController
-@Api(tags = "Api")
-@RequestMapping(value = "/jcs/water-resource-crane")
-public class WaterResourceCraneController extends BaseController {
-
-    @Autowired
-    WaterResourceCraneServiceImpl waterResourceCraneServiceImpl;
-
-    /**
-             * 新增
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<WaterResourceCraneDto> save(@RequestBody WaterResourceCraneDto model)
-	{
-	    model=waterResourceCraneServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<WaterResourceCraneDto> updateBySequenceNbrWaterResourceCrane(@RequestBody WaterResourceCraneDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.updateWithModel(model));
-	}
-	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.removeById(sequenceNbr));
-    }
-    /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<WaterResourceCraneDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
-	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryBySeq(sequenceNbr));
-	}
-	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<WaterResourceCraneDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<WaterResourceCraneDto> page=new Page<WaterResourceCraneDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryForWaterResourceCranePage(page));
-	}
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<WaterResourceCraneDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(waterResourceCraneServiceImpl.queryForWaterResourceCraneList());
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceHydrantController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceHydrantServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceHydrantDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
-
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@RestController
-@Api(tags = "Api")
-@RequestMapping(value = "/jcs/water-resource-hydrant")
-public class WaterResourceHydrantController extends BaseController {
-
-    @Autowired
-    WaterResourceHydrantServiceImpl waterResourceHydrantServiceImpl;
-
-    /**
-             * 新增
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<WaterResourceHydrantDto> save(@RequestBody WaterResourceHydrantDto model)
-	{
-	    model=waterResourceHydrantServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<WaterResourceHydrantDto> updateBySequenceNbrWaterResourceHydrant(@RequestBody WaterResourceHydrantDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.updateWithModel(model));
-	}
-	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.removeById(sequenceNbr));
-    }
-    /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<WaterResourceHydrantDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
-	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryBySeq(sequenceNbr));
-	}
-	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<WaterResourceHydrantDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<WaterResourceHydrantDto> page=new Page<WaterResourceHydrantDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryForWaterResourceHydrantPage(page));
-	}
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<WaterResourceHydrantDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(waterResourceHydrantServiceImpl.queryForWaterResourceHydrantList());
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceIotController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceIotServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceIotDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
-
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@RestController
-@Api(tags = "Api")
-@RequestMapping(value = "/jcs/water-resource-iot")
-public class WaterResourceIotController extends BaseController {
-
-    @Autowired
-    WaterResourceIotServiceImpl waterResourceIotServiceImpl;
-
-    /**
-             * 新增
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<WaterResourceIotDto> save(@RequestBody WaterResourceIotDto model)
-	{
-	    model=waterResourceIotServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<WaterResourceIotDto> updateBySequenceNbrWaterResourceIot(@RequestBody WaterResourceIotDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.updateWithModel(model));
-	}
-	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(waterResourceIotServiceImpl.removeById(sequenceNbr));
-    }
-    /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<WaterResourceIotDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
-	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryBySeq(sequenceNbr));
-	}
-	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<WaterResourceIotDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<WaterResourceIotDto> page=new Page<WaterResourceIotDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryForWaterResourceIotPage(page));
-	}
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<WaterResourceIotDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(waterResourceIotServiceImpl.queryForWaterResourceIotList());
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourceNaturalController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourceNaturalServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceNaturalDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
-
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@RestController
-@Api(tags = "Api")
-@RequestMapping(value = "/jcs/water-resource-natural")
-public class WaterResourceNaturalController extends BaseController {
-
-    @Autowired
-    WaterResourceNaturalServiceImpl waterResourceNaturalServiceImpl;
-
-    /**
-             * 新增
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<WaterResourceNaturalDto> save(@RequestBody WaterResourceNaturalDto model)
-	{
-	    model=waterResourceNaturalServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<WaterResourceNaturalDto> updateBySequenceNbrWaterResourceNatural(@RequestBody WaterResourceNaturalDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.updateWithModel(model));
-	}
-	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.removeById(sequenceNbr));
-    }
-    /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<WaterResourceNaturalDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
-	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryBySeq(sequenceNbr));
-	}
-	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<WaterResourceNaturalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<WaterResourceNaturalDto> page=new Page<WaterResourceNaturalDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryForWaterResourceNaturalPage(page));
-	}
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<WaterResourceNaturalDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(waterResourceNaturalServiceImpl.queryForWaterResourceNaturalList());
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/WaterResourcePoolController.java

-package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.WaterResourcePoolServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourcePoolDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
-
-/**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@RestController
-@Api(tags = "Api")
-@RequestMapping(value = "/jcs/water-resource-pool")
-public class WaterResourcePoolController extends BaseController {
-
-    @Autowired
-    WaterResourcePoolServiceImpl waterResourcePoolServiceImpl;
-
-    /**
-             * 新增
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<WaterResourcePoolDto> save(@RequestBody WaterResourcePoolDto model)
-	{
-	    model=waterResourcePoolServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<WaterResourcePoolDto> updateBySequenceNbrWaterResourcePool(@RequestBody WaterResourcePoolDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.updateWithModel(model));
-	}
-	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.removeById(sequenceNbr));
-    }
-    /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<WaterResourcePoolDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
-	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryBySeq(sequenceNbr));
-	}
-	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<WaterResourcePoolDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<WaterResourcePoolDto> page=new Page<WaterResourcePoolDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryForWaterResourcePoolPage(page));
-	}
-	/**
-	*列表全部数据查询
-	*@return
-	*/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<WaterResourcePoolDto>>  selectForList()
-	{
-	    return ResponseHelper.buildResponse(waterResourcePoolServiceImpl.queryForWaterResourcePoolList());
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
-import com.yeejoin.amos.boot.module.jcs.api.enums.AircraftFileTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.AircraftMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
@@ -22,9 +15,15 @@ import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AircraftFileTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.AircraftMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -13,10 +13,11 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
@@ -7,22 +30,24 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertBusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSchedulingTypeEnum;
@@ -35,28 +60,6 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
 import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 警情报送记录 服务实现类

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireChemicalServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireStation;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FireChemicalMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireChemicalService;
-
-import org.springframework.stereotype.Service;
-
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.Arrays;
-import java.util.List;
-/**
-* 危化品服务实现类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Service
-public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChemical,FireChemicalMapper> implements IFireChemicalService {
-        /**
-         * 分页查询
-         */
-        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page,   @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode,boolean isDelete)   {
-           return this.queryForPage(page, "", false,casNo, formula, name,  typeCode, isDelete);
-        }
-
-        /**
-         * 列表查询 示例
-         */
-        public List<FireChemicalDto> queryForFireChemicalList(@Condition(Operator.eq) Boolean isDelete)   {
-                return this.queryForList("" , false,isDelete);
-        }
-        /**
-         * 删除
-         * */
-        public Boolean updateisDelete( List sequenceNbr)   {
-        	
-        	return this.update(new UpdateWrapper<FireChemical>().in("sequence_nbr", sequenceNbr).set("is_delete", 1));         	
-       }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireExpertsServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireExpertsDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FireExpertsMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
-
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
-
-/**
- * 服务实现类
- * 消防专家
- *
- * @author system_generator
- * @date 2021-06-25
- */
-@Service
-public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExperts, FireExpertsMapper> implements IFireExpertsService {
-    /**
-     * 分页查询
-     */
-    public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page) {
-        return this.queryForPage(page, null, false);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<FireExpertsDto> queryForFireExpertsList(@Condition(Operator.eq) Boolean isDelete) {
-        return this.queryForList("", false, isDelete);
-    }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireStationServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireStationDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireStation;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FireStationMapper;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireStationService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 微型消防站服务实现类
- *
- * @author system_generator
- * @date 2021-06-28
- */
-@Service
-public class FireStationServiceImpl extends BaseService<FireStationDto, FireStation, FireStationMapper>
-		implements IFireStationService {
-
-	@Autowired
-	FireStationMapper fireStationMapper;
-	@Autowired
-	OrgUsrMapper orgUsrMapper;
-
-	/**
-	 * 分页查询
-	 */
-	public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page) {
-		return this.queryForPage(page, null, false);
-	}
-
-	/**
-	 * 列表查询 示例
-	 */
-	public List<FireStationDto> queryForFireStationList() {
-		return this.queryForList("", false);
-	}
-
-	/**
-	 * 删除
-	 */
-	public Boolean updateisDelete(Long sequenceNbr) {
-
-		return this.update(new UpdateWrapper<FireStation>().eq("sequence_nbr", sequenceNbr).set("is_delete", 1));
-	}
-
-	@Override
-	public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {
-		List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par);
-		Map<String, Long> num = fireStationMapper.getFireStationCount(par);
-		Page<FireStationDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
-		return pageBean.setRecords(list);
-	}
-
-	/**
-	 * 
-	 * 新增
-	 * 
-	 ***/
-	public FireStationDto add(FireStationDto model) {
-
-		if (model.getBizCompanyId() != null) {
-			OrgUsr orgUsr = orgUsrMapper.selectById(model.getBizCompanyId());
-			model.setBizCompany(orgUsr.getBizOrgName());
-			model.setBizCompanyCode(orgUsr.getBizOrgCode());
-		}
-		FireStation entity = this.prepareEntity(model);
-		this.save(entity);
-		return Bean.toModel(entity, model);
-	}
-
-	/**
-	 * 
-	 * 修改
-	 * 
-	 ***/
-	public FireStationDto Update(FireStationDto model) {
-		if (model.getBizCompanyId() != null) {
-			OrgUsr orgUsr = orgUsrMapper.selectById(model.getBizCompanyId());
-			model.setBizCompany(orgUsr.getBizOrgName());
-			model.setBizCompanyCode(orgUsr.getBizOrgCode());
-		}
-		FireStation entity = this.prepareEntity(model);
-		this.updateById(entity);
-		return Bean.toModel(entity, model);
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Maps;
-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.FireTeamDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireTeamListDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FireTeamMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireTeamService;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Maps;
+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.FireTeamDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireTeamListDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
+import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
 
 /**
 * 消防队伍 服务实现类

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersJacketServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
-import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersJacketDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
-import com.yeejoin.amos.boot.module.jcs.api.enums.EquipTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersJacketMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,11 +13,17 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersJacketDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersJacketMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
+import com.yeejoin.amos.boot.module.jcs.api.enums.EquipTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
 
 /**
  * 消防人员配装记录 服务实现类

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
@@ -20,23 +39,6 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 力量调派 服务实现类

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java

@@ -7,10 +7,10 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import com.yeejoin.amos.boot.module.common.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/WaterResourceCraneServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceCrane;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceCraneMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceCraneService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceCraneDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-/**
-* 服务实现类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Service
-public class WaterResourceCraneServiceImpl extends BaseService<WaterResourceCraneDto,WaterResourceCrane,WaterResourceCraneMapper> implements IWaterResourceCraneService {
-        /**
-                            * 分页查询
-         */
-        public Page<WaterResourceCraneDto> queryForWaterResourceCranePage(Page<WaterResourceCraneDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
-
-        /**
-                            * 列表查询 示例
-         */
-        public List<WaterResourceCraneDto> queryForWaterResourceCraneList()   {
-                return this.queryForList("" , false);
-        }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/WaterResourceHydrantServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceHydrant;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceHydrantMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceHydrantService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceHydrantDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-/**
-* 服务实现类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Service
-public class WaterResourceHydrantServiceImpl extends BaseService<WaterResourceHydrantDto,WaterResourceHydrant,WaterResourceHydrantMapper> implements IWaterResourceHydrantService {
-        /**
-                            * 分页查询
-         */
-        public Page<WaterResourceHydrantDto> queryForWaterResourceHydrantPage(Page<WaterResourceHydrantDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
-
-        /**
-                            * 列表查询 示例
-         */
-        public List<WaterResourceHydrantDto> queryForWaterResourceHydrantList()   {
-                return this.queryForList("" , false);
-        }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/WaterResourceIotServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceIot;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceIotMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceIotService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceIotDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-/**
-* 服务实现类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Service
-public class WaterResourceIotServiceImpl extends BaseService<WaterResourceIotDto,WaterResourceIot,WaterResourceIotMapper> implements IWaterResourceIotService {
-        /**
-                            * 分页查询
-         */
-        public Page<WaterResourceIotDto> queryForWaterResourceIotPage(Page<WaterResourceIotDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
-
-        /**
-                            * 列表查询 示例
-         */
-        public List<WaterResourceIotDto> queryForWaterResourceIotList()   {
-                return this.queryForList("" , false);
-        }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/WaterResourceNaturalServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourceNatural;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceNaturalMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceNaturalService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourceNaturalDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-/**
-* 服务实现类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Service
-public class WaterResourceNaturalServiceImpl extends BaseService<WaterResourceNaturalDto,WaterResourceNatural,WaterResourceNaturalMapper> implements IWaterResourceNaturalService {
-        /**
-                            * 分页查询
-         */
-        public Page<WaterResourceNaturalDto> queryForWaterResourceNaturalPage(Page<WaterResourceNaturalDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
-
-        /**
-                            * 列表查询 示例
-         */
-        public List<WaterResourceNaturalDto> queryForWaterResourceNaturalList()   {
-                return this.queryForList("" , false);
-        }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/WaterResourcePoolServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResourcePool;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourcePoolMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourcePoolService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.WaterResourcePoolDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-/**
-* 服务实现类
-*
-* @author system_generator
-* @date 2021-06-29
-*/
-@Service
-public class WaterResourcePoolServiceImpl extends BaseService<WaterResourcePoolDto,WaterResourcePool,WaterResourcePoolMapper> implements IWaterResourcePoolService {
-        /**
-                            * 分页查询
-         */
-        public Page<WaterResourcePoolDto> queryForWaterResourcePoolPage(Page<WaterResourcePoolDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
-
-        /**
-                            * 列表查询 示例
-         */
-        public List<WaterResourcePoolDto> queryForWaterResourcePoolList()   {
-                return this.queryForList("" , false);
-        }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/WaterResourceServiceImpl.java

-package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
-import com.yeejoin.amos.boot.module.jcs.api.dto.*;
-import com.yeejoin.amos.boot.module.jcs.api.entity.WaterResource;
-import com.yeejoin.amos.boot.module.jcs.api.enums.WaterResourceTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.WaterResourceMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IWaterResourceService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * 服务实现类
- *
- * @author system_generator
- * @date 2021-06-29
- */
-@Service
-public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, WaterResource, WaterResourceMapper> implements IWaterResourceService {
-
-    @Autowired
-    WaterResourceCraneServiceImpl waterResourceCraneService;
-    @Autowired
-    WaterResourceHydrantServiceImpl waterResourceHydrantService;
-    @Autowired
-    WaterResourceNaturalServiceImpl waterResourceNaturalService;
-    @Autowired
-    WaterResourcePoolServiceImpl waterResourcePoolService;
-    @Autowired
-    WaterResourceIotServiceImpl waterResourceIotService;
-    @Resource
-    WaterResourceMapper waterResourceMapper;
-
-    /**
-     * 分页查询
-     */
-    public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page,
-                                                            @Condition(Operator.like) String name,
-                                                            @Condition(Operator.eq) String resourceType,
-                                                            @Condition(Operator.eq) Boolean isDelete) {
-        return this.queryForPage(page, null, false, name, resourceType, isDelete);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<WaterResourceDto> queryForWaterResourceList(@Condition(Operator.eq) Boolean isDelete) {
-        return this.queryForList("", false, isDelete);
-    }
-
-
-    /**
-     * excel导入
-     *
-     * @param model
-     * @return
-     */
-    public WaterResourceDto importByExcel(WaterResourceDto model) {
-        String resourceType = model.getResourceType();
-        Optional<WaterResourceTypeEnum> resourceTypeEnum = EnumsUtils.getEnumObject(WaterResourceTypeEnum.class,
-                e -> e.getCode().equals(resourceType));
-        model.setResourceTypeName(resourceTypeEnum.get().getName());
-        model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
-        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
-        if (!StringUtils.isEmpty(resourceType)) {
-            switch (resourceType) {
-                case "hydrant":
-                    // 新增基础信息
-                    model.setIsIot(true);
-                    createWithModel(model);
-                    // 新增属性信息
-                    WaterResourceHydrantDto waterResourceHydrantDto = new WaterResourceHydrantDto();
-                    BeanUtils.copyProperties(model, waterResourceHydrantDto);
-                    waterResourceHydrantDto.setSequenceNbr(null);
-                    waterResourceHydrantDto.setResourceId(model.getSequenceNbr());
-                    waterResourceHydrantService.createWithModel(waterResourceHydrantDto);
-                    break;
-                case "crane":
-                    // 新增基础信息
-                    model.setIsIot(true);
-                    createWithModel(model);
-                    WaterResourceCraneDto waterResourceCraneDto = new WaterResourceCraneDto();
-                    BeanUtils.copyProperties(model, waterResourceCraneDto);
-                    waterResourceCraneDto.setSequenceNbr(null);
-                    waterResourceCraneDto.setResourceId(model.getSequenceNbr());
-                    waterResourceCraneService.createWithModel(waterResourceCraneDto);
-                    break;
-                case "natural":
-                    // 新增基础信息
-                    model.setIsIot(false);
-                    createWithModel(model);
-                    WaterResourceNaturalDto waterResourceNaturalDto = new WaterResourceNaturalDto();
-                    BeanUtils.copyProperties(model, waterResourceNaturalDto);
-                    waterResourceNaturalDto.setSequenceNbr(null);
-                    waterResourceNaturalDto.setResourceId(model.getSequenceNbr());
-                    waterResourceNaturalService.createWithModel(waterResourceNaturalDto);
-                    break;
-                case "pool":
-                    // 新增基础信息
-                    model.setIsIot(true);
-                    createWithModel(model);
-                    WaterResourcePoolDto waterResourcePoolDto = new WaterResourcePoolDto();
-                    BeanUtils.copyProperties(model, waterResourcePoolDto);
-                    waterResourcePoolDto.setSequenceNbr(null);
-                    waterResourcePoolDto.setResourceId(model.getSequenceNbr());
-                    waterResourcePoolService.createWithModel(waterResourcePoolDto);
-                    break;
-            }
-            // 新增物联信息
-            if (model.getIsIot()) {
-                WaterResourceIotDto waterResourceIotDto = new WaterResourceIotDto();
-                BeanUtils.copyProperties(model, waterResourceIotDto);
-                waterResourceIotDto.setSequenceNbr(null);
-                waterResourceIotDto.setResourceType(model.getResourceType());
-                waterResourceIotDto.setResourceId(model.getSequenceNbr());
-                waterResourceIotService.createWithModel(waterResourceIotDto);
-            }
-        } else {
-            createWithModel(model);
-        }
-        return model;
-    }
-
-    /**
-     * 导出列表
-     */
-    public List<WaterResourceDto> exportToExcel(@Condition(Operator.eq) Boolean isDelete) {
-        return waterResourceMapper.exportToExcel(isDelete);
-    }
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java

-package com.yeejoin.amos.boot.module.jcs.biz.utils;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.jcs.api.dto.FireExpertsDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDate;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @title: 实体类 Dto，Vo，entity 转换工具类
- * @Author fpy
- * @Date: 2021/6/3 13:53
- */
-@Component
-public class BeanDtoVoUtils {
-
-    /**
-     * Dot ,Vo ,Entity 相互转换
-     *
-     * @param source      原数据
-     * @param targetClass 目标类
-     * @param <T>         泛型类
-     * @return 转换返回值
-     */
-    public static <T> T convert(Object source, Class<T> targetClass) {
-        // 判断source是否为空
-        if (source == null) {
-            return null;
-        }
-        // 判断targetClass是否为空
-        if (targetClass == null) {
-            return null;
-        }
-        try {
-            // 创建新的对象实例
-            T target = targetClass.newInstance();
-            // 把原对象数据拷贝到新对象
-            BeanUtils.copyProperties(source, target);
-            // 返回新对象
-            return target;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * Dot ,Vo ,Entity 相互转换
-     *
-     * @param source 原数据
-     * @return 转换返回值
-     */
-    public static FireExpertsDto convertFireExperts(FireExperts source) {
-        // 判断source是否为空
-        if (source == null) {
-            return null;
-        }
-
-        try {
-            // 创建新的对象实例
-            FireExpertsDto target = FireExpertsDto.class.newInstance();
-            // 把原对象数据拷贝到新对象
-            BeanUtils.copyProperties(source, target);
-            // 计算年龄
-            int age = getAge(source.getBirthdayTime());
-            target.setAge(age);
-            // 返回新对象
-            return target;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * IPage<Entity> 分页对象转 Page<Dto>
-     *
-     * @param page 原分页对象
-     * @param v    目标vo类
-     * @param <E>  泛型类
-     * @param <V>  泛型类
-     * @return 转换后的分页对象
-     */
-    public static <E, V> IPage<V> iPageDtoStream(IPage<E> page, Class<V> v) {
-        return page.convert(item -> {
-            try {
-                return convert(item, v);
-            } catch (Exception e) {
-                return null;
-            }
-        });
-    }
-
-    /**
-     * IPage<Entity> 分页对象转 Page<Dto>
-     *
-     * @param page 原分页对象
-     * @return 转换后的分页对象
-     */
-    public static IPage<FireExpertsDto> iPageDtoStreamFireExperts(IPage<FireExperts> page) {
-        return page.convert(item -> {
-            try {
-                return convertFireExperts(item);
-            } catch (Exception e) {
-                return null;
-            }
-        });
-    }
-
-    // 根据LocalDate来计算年龄
-    public static int getAge(Date birthDay) {
-        if (birthDay == null) {
-            return 0;
-        }
-        LocalDate now = LocalDate.now();
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(birthDay);
-        int yearBirth = cal.get(Calendar.YEAR);
-        int monthBirth = cal.get(Calendar.MONTH) + 1;
-        int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
-
-        LocalDate birth = LocalDate.of(yearBirth, monthBirth, dayOfMonthBirth);
-        if (birth.isAfter(now)) {
-            return 0;
-        }
-        int age = birth.until(now).getYears();
-        return age;
-    }
-
-}
\ No newline at end of file