导入导出

amos-boot-jcs-system/src/main/resources/application.properties

-spring.application.name=JCS-tb
+spring.application.name=JCS-FPY
 server.servlet.context-path=/jcs
 server.port=11100
 spring.profiles.active=dev

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+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.common.api.excel.ExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author fengwang
+ * @date 2021-06-18.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "OrgUsr对象", description = "人员信息")
+public class ExcelOrgPersonDto extends BaseDto {
+    @ExcelIgnore
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty(value = "姓名", index = 0)
+    @ApiModelProperty(value = "人员名称")
+    private String bizOrgName;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "人员编码")
+    private String bizOrgCode;
+
+    @ExcelProperty(value = "关联账户", index = 1)
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
+    private String bizOrgType = CommonConstant.BIZ_ORG_TYPE_PERSON;
+
+    @ExcelProperty(value = "所属单位/部门", index = 2)
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+
+    @ExcelProperty(value = "员工编号", index = 3)
+    @ApiModelProperty(value = "员工编号")
+    private String personNumber;
+
+    @ExplicitConstraint(type = "XB", indexNum = 4, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "性别", index = 4)
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "性别code")
+    private String genderCode;
+
+    @ExplicitConstraint(type = "RYZJLX", indexNum = 5, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "证件类型", index = 5)
+    @ApiModelProperty(value = "证件类型")
+    private String certificatesType;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "证件类型code")
+    private String certificatesTypeCode;
+
+    @ExcelProperty(value = "证件号码", index = 6)
+    @ApiModelProperty(value = "证件号码")
+    private String certificatesNumber;
+
+    @ExcelProperty(value = "联系电话", index = 7)
+    @ApiModelProperty(value = "联系电话")
+    private String telephone;
+
+    @ExplicitConstraint(type = "RYZT", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "人员状态", index = 8)
+    @ApiModelProperty(value = "人员状态")
+    private String state;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "人员状态code")
+    private String stateCode;
+
+    @ExplicitConstraint(type = "AQPX", indexNum = 9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "是否进行安全培训", index = 9)
+    @ApiModelProperty(value = "是否进行安全培训")
+    private String safetyTraining;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "是否进行安全培训code")
+    private String safetyTrainingCode;
+
+    @ExplicitConstraint(type = "XZZW", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "行政职务", index = 10)
+    @ApiModelProperty(value = "行政职务")
+    private String administrativePosition;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "行政职务code")
+    private String administrativePositionCode;
+
+    @ExplicitConstraint(type = "JGNBZW", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防管理组织机构内部职务", index = 11)
+    @ApiModelProperty(value = "消防管理组织机构内部职务")
+    private String internalPosition;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "消防管理组织机构内部职务code")
+    private String internalPositionCode;
+
+    @ExplicitConstraint(type = "XFGLGW", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防管理岗位", index = 12)
+    @ApiModelProperty(value = "消防管理岗位")
+    private String fireManagementPost;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "消防管理岗位code")
+    private String fireManagementPostCode;
+
+    @ExplicitConstraint(type = "GWMC", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位类型", index = 13)
+    @ApiModelProperty(value = "岗位类型")
+    private String positionType;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "岗位类型code")
+    private String positionTypeCode;
+
+    @ExplicitConstraint(type = "CZLB", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "持证类别", index = 14)
+    @ApiModelProperty(value = "持证类别")
+    private String certificateType;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "持证类别code")
+    private String certificateTypeCode;
+
+    @ExcelProperty(value = "持证时间", index = 15)
+    @ApiModelProperty(value = "持证时间")
+    private Date holdingTime;
+
+    @ExplicitConstraint(type = "SHZQ", indexNum = 16, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "审核周期", index = 16)
+    @ApiModelProperty(value = "审核周期")
+    private String auditCycle;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "审核周期code")
+    private String auditCycleCode;
+
+    @ExcelProperty(value = "人员照片", index = 17)
+    @ApiModelProperty(value = "人员照片")
+    private String personImg;
+
+    @ExcelProperty(value = "重点工种资质证书", index = 18)
+    @ApiModelProperty(value = "重点工种资质证书")
+    private String certificateImg;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "更新人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    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/FireStationDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
@@ -8,90 +10,112 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+
 /**
-* 微型消防站
-*
-* @author system_generator
-* @date 2021-06-28
-*/
+ * 微型消防站
+ *
+ * @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;
-
-
+@ApiModel(value = "FireStationDto", description = "微型消防站")
+public class FireStationDto extends BaseDto {
+    @ExcelIgnore
+    private static final long serialVersionUID = 1L;
 
+    @ExcelProperty(value = "微型消防站名称", index = 0)
     @ApiModelProperty(value = "微型消防站名称")
     private String name;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "所在建筑物id")
     private String whereBuildingId;
 
+    @ExcelProperty(value = "所在建筑", index = 1)
     @ApiModelProperty(value = "所在建筑物名称")
     private String whereBuilding;
 
-    @ApiModelProperty(value = "装备简要情况")
-    private String equipmentBrief;
-
+    @ExcelProperty(value = "地址", index = 2)
     @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;
-
+    @ExcelProperty(value = "联系电话", index = 3)
     @ApiModelProperty(value = "值班室电话")
     private String dutyRoomTelephone;
 
+    @ExcelProperty(value = "负责人名称", index = 4)
     @ApiModelProperty(value = "负责人名称")
     private String personChargeName;
 
+    @ExcelProperty(value = "负责人电话", index = 5)
     @ApiModelProperty(value = "负责人电话")
     private String personChargeTelephone;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "单位id")
     private Long bizCompanyId;
 
+    @ExcelProperty(value = "所属单位", index = 6)
     @ApiModelProperty(value = "所属单位名称")
     private String bizCompany;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "所属单位code")
     private String bizCompanyCode;
 
+    @ExcelProperty(value = "建造日期", index = 7)
     @ApiModelProperty(value = "建造日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date buildTime;
 
+    @ExcelProperty(value = "启用日期", index = 8)
     @ApiModelProperty(value = "启用日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date enableTime;
 
+    @ExcelProperty(value = "装备简要情况", index = 9)
+    @ApiModelProperty(value = "装备简要情况")
+    private String equipmentBrief;
+
+    @ExcelProperty(value = "微型消防站照片", index = 10)
     @ApiModelProperty(value = "图片信息")
     private String img;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "行政区区划名称")
+    private String administrativeDivisions;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "行政区区划编号")
+    private String administrativeDivisionsCode;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
-    
+
+    @ExcelIgnore
     @ApiModelProperty(value = "战备装备数量")
     private Integer eqNum;
-    
+
+    @ExcelIgnore
     @ApiModelProperty(value = "战备人数量")
     private Integer userNum;
-    
+
+    @ExcelIgnore
     @ApiModelProperty(value = "战备车辆数量")
     private Integer carNum;
 
-}
+}
\ No newline at end of file

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.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 com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,66 +14,100 @@ import java.util.Date;
 import java.util.List;
 
 /**
-* 消防队伍
-*
-* @author tb
-* @date 2021-06-07
-*/
+ * 消防队伍
+ *
+ * @author tb
+ * @date 2021-06-07
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="FireTeamDto", description="消防队伍")
+@ApiModel(value = "FireTeamDto", description = "消防队伍")
 public class FireTeamDto extends BaseDto {
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
+    @ExcelProperty(value = "所属单位", index = 0)
+    @ApiModelProperty(value = "机构名称")
+    private String companyName;
 
-    @ApiModelProperty(value = "消防队伍图片")
-    private String img;
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构id")
+    private Long company;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构code")
+    private String companyCode;
+
+    @ExcelProperty(value = "上级单位", index = 1)
+    @ApiModelProperty(value = "父级名称")
+    private String parentName;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "父级")
+    private Long parent;
+
+    @ExcelProperty(value = "队伍名称", index = 2)
     @ApiModelProperty(value = "单位名称")
     private String name;
 
-    @ApiModelProperty(value = "所属机构")
-    private Long company;
+    @ExplicitConstraint(type = "XFJGLX", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "队伍类型", index = 3)
+    @ApiModelProperty(value = "消防队类型（专职消防队，监控大队）")
+    private String type;
 
-    @ApiModelProperty(value = "机构code")
-    private String companyCode;
+    @ExcelIgnore
+    @ApiModelProperty(value = "队伍类型code")
+    private String typeCode;
+
+    @ExcelProperty(value = "队伍地址", index = 4)
+    @ApiModelProperty(value = "队伍地址")
+    private String address;
 
+    @ExcelProperty(value = "地球经度", index = 5)
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+
+    @ExcelProperty(value = "地球纬度", index = 6)
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
+
+    @ExcelIgnore
     @ApiModelProperty(value = "联系人id")
-    private Integer contactUserId;
+    private Long contactUserId;
 
+    @ExcelProperty(value = "联系人", index = 7)
     @ApiModelProperty(value = "联系人")
     private String contactUser;
 
+    @ExcelProperty(value = "联系电话", index = 8)
     @ApiModelProperty(value = "联系电话")
     private String contactPhone;
 
+    @ExcelProperty(value = "职责_简要情况", index = 9)
     @ApiModelProperty(value = "职责_简要情况")
     private String obligation;
 
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "机构名称")
-    private String companyName;
+    @ExcelProperty(value = "消防队伍图片", index = 10)
+    @ApiModelProperty(value = "消防队伍图片")
+    private String img;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
-    @ApiModelProperty(value = "消防队类型（专职消防队，监控大队）")
-    private String type;
-
+    @ExcelIgnore
     @ApiModelProperty(value = "执勤车辆数")
     private String onDutyCount;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "出动车辆数")
     private String outCount;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "队伍下车辆")
     private List<FireBrigadeResourceDto> children;
-}
+}
\ No newline at end of file

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 com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author system_generator
  * @date 2021-06-29
@@ -51,7 +50,7 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "所在建筑id")
     private Long belongBuildingId;
 
-//    @ExplicitConstraint(indexNum = 3, sourceClass = SelectionDataFromInterface.class, method = "getBuildingList")
+    //    @ExplicitConstraint(indexNum = 3, sourceClass = SelectionDataFromInterface.class, method = "getBuildingList")
     //动态下拉内容
     @ExcelProperty(value = "所在建筑", index = 3)
     @ApiModelProperty(value = "所在建筑")
@@ -61,7 +60,8 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "所属消防系统id")
     private Long belongFightingSystemId;
 
-//    @ExplicitConstraint(indexNum = 4, sourceClass = SelectionDataFromInterface.class, method = "getFireSystemList")
+    //    @ExplicitConstraint(indexNum = 4, sourceClass = SelectionDataFromInterface.class, method =
+    //    "getFireSystemList")
     //动态下拉内容
     @ExcelProperty(value = "所属消防系统", index = 4)
     @ApiModelProperty(value = "所属消防系统")

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

@@ -7,24 +7,23 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 /**
-* 
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * @author tb
+ * @date 2021-06-17
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("jc_alert_form_value")
-@ApiModel(value="AlertFormValue对象", description="")
+@ApiModel(value = "AlertFormValue对象", description = "AlertFormValue对象")
 public class AlertFormValue extends BaseEntity {
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+     *
+     */
+    private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty(value = "表单id")
+    @ApiModelProperty(value = "表单id")
     private Long alertFormId;
 
     @ApiModelProperty(value = "警情id")
@@ -51,9 +50,9 @@ public class AlertFormValue extends BaseEntity {
     @ApiModelProperty(value = "是否一行显示")
     private Boolean block;
 
-	public AlertFormValue() {
-		super();
-	}
+    public AlertFormValue() {
+        super();
+    }
 
     public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block) {
         this.alertFormId = alertFormId;
@@ -61,7 +60,7 @@ public class AlertFormValue extends BaseEntity {
         this.fieldCode = fieldCode;
         this.block = block;
     }
-    
+
     public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block, String alertTypeCode) {
         this.alertFormId = alertFormId;
         this.fieldName = fieldName;
@@ -70,7 +69,8 @@ public class AlertFormValue extends BaseEntity {
         this.alertTypeCode = alertTypeCode;
     }
 
-    public AlertFormValue(Long alertFormId,  String fieldName, String fieldCode,boolean block, String alertTypeCode,String fieldValue, String fieldValueCode) {
+    public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block, String alertTypeCode,
+                          String fieldValue, String fieldValueCode) {
         this.alertFormId = alertFormId;
         this.fieldName = fieldName;
         this.fieldCode = fieldCode;
@@ -78,7 +78,16 @@ public class AlertFormValue extends BaseEntity {
         this.alertTypeCode = alertTypeCode;
         this.fieldValue = fieldValue;
         this.fieldValueCode = fieldValueCode;
+    }
 
-
+    public AlertFormValue(Long alertFormId, String alertTypeCode, String fieldName, String fieldCode,
+                          String fieldValue, String fieldValueCode, Boolean block) {
+        this.alertFormId = alertFormId;
+        this.alertTypeCode = alertTypeCode;
+        this.fieldName = fieldName;
+        this.fieldCode = fieldCode;
+        this.fieldValue = fieldValue;
+        this.fieldValueCode = fieldValueCode;
+        this.block = block;
     }
 }

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.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.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 java.util.List;
+
 /**
 * 消防队伍 Mapper 接口
 *
@@ -50,4 +51,6 @@ public interface FireTeamMapper extends BaseMapper<FireTeam> {
 	 * @return
 	 */
 	IPage<FireTeamCardDto> getFireTeamForPage(Page page, FireTeamListDto par);
+
+	List<FireTeamDto> listFireTeamDto(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/OrgUsrMapper.java

 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.ExcelOrgPersonDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 
 import org.apache.ibatis.annotations.Param;
@@ -27,4 +28,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 	List<Map<String, Object>> selectPersonAllList(Map<String, Object> map);
 
 	List<OrgUsr> queryOrgUsrListByBizOrgCode(String bizOrgCode);
+
+    List<ExcelOrgPersonDto> queryOrgPersonDtoList(boolean isDelete);
 }

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

@@ -3,18 +3,15 @@
 <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.FireTeamMapper">
 
     <select id="listMonitorFireBrigade" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto">
-        SELECT
-            ft.sequence_nbr id,
-            ft.NAME,
-            ft.img,
-            COUNT( DISTINCT ff.sequence_nbr ) personCount
-        FROM
-            cb_fire_team ft
-                LEFT JOIN cb_firefighters ff ON ff.fire_team_id = ft.sequence_nbr
-        WHERE
-            ft.is_delete = 0 and ft.type_code = 118
-        GROUP BY
-            ft.sequence_nbr
+        SELECT ft.sequence_nbr                 id,
+               ft.NAME,
+               ft.img,
+               COUNT(DISTINCT ff.sequence_nbr) personCount
+        FROM cb_fire_team ft
+                 LEFT JOIN cb_firefighters ff ON ff.fire_team_id = ft.sequence_nbr
+        WHERE ft.is_delete = 0
+          and ft.type_code = 118
+        GROUP BY ft.sequence_nbr
     </select>
     <select id="getFireTeamForPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto">
         SELECT
@@ -34,4 +31,11 @@
         <if test='par.companyCode!=null'>and a.company_code = #{par.companyCode}</if>
         <if test='par.name!=null'>and a.name like concat('%', #{par.name}, '%')</if>
     </select>
+
+    <select id="listFireTeamDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto">
+        select t.*, p.name parentName
+        from cb_fire_team t
+                 left join cb_fire_team p on t.parent = p.sequence_nbr
+        where t.is_delete = #{isDelete}
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.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.OrgUsrMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper">
 
     <select id="selectUpUnitByParam" resultType="java.lang.String">
         SELECT
@@ -10,148 +10,195 @@
         WHERE
         1=1
         <if test="id != null and id != ''">
-        and `sequence_nbr` = ( SELECT parent_id FROM `cb_org_usr` WHERE sequence_nbr = #{id} and is_delete = 0 limit 1)
+            and `sequence_nbr` = ( SELECT parent_id FROM `cb_org_usr` WHERE sequence_nbr = #{id} and is_delete = 0 limit
+            1)
         </if>
 
     </select>
 
-	<select id="selectPersonListCount" resultType="Integer">
-		select count(1) from (
-		SELECT
-		DISTINCT
-		u.sequence_nbr sequenceNbr,
-		u.biz_org_name bizOrgName,
-		u.biz_org_code bizOrgCode,
-		<if test="fields != null">
-			<foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value  end) ${item}</foreach>
-		</if>
-		FROM
-		cb_org_usr u LEFT JOIN
-		jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
-		LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
-		where 
-		u.biz_org_type = #{bizOrgType}
-		AND u.is_delete = 0
-		<if  test="bizOrgName != null">
-			AND u.biz_org_name = #{bizOrgName}
-		</if>
-		<if  test="bizOrgCode != null and bizOrgCode != '-1'">
-			AND u.biz_org_code like concat(#{bizOrgCode}, '%')
-		</if>
-		GROUP BY
-		u.sequence_nbr ,
-		u.biz_org_name ,
-		u.biz_org_code
-		)a where a.sequenceNbr is not null
-		
-		<if test="fieldsValue != null">
-			<foreach collection="fieldsValue.keys" item="item"> AND a.${item} =  #{fieldsValue[${item}]}  </foreach>
-		</if>
-	</select>
+    <select id="selectPersonListCount" resultType="Integer">
+        select count(1) from (
+        SELECT
+        DISTINCT
+        u.sequence_nbr sequenceNbr,
+        u.biz_org_name bizOrgName,
+        u.biz_org_code bizOrgCode,
+        <if test="fields != null">
+            <foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value
+                end) ${item}
+            </foreach>
+        </if>
+        FROM
+        cb_org_usr u LEFT JOIN
+        jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
+        LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
+        where
+        u.biz_org_type = #{bizOrgType}
+        AND u.is_delete = 0
+        <if test="bizOrgName != null">
+            AND u.biz_org_name = #{bizOrgName}
+        </if>
+        <if test="bizOrgCode != null and bizOrgCode != '-1'">
+            AND u.biz_org_code like concat(#{bizOrgCode}, '%')
+        </if>
+        GROUP BY
+        u.sequence_nbr ,
+        u.biz_org_name ,
+        u.biz_org_code
+        )a where a.sequenceNbr is not null
+
+        <if test="fieldsValue != null">
+            <foreach collection="fieldsValue.keys" item="item">AND a.${item} = #{fieldsValue[${item}]}</foreach>
+        </if>
+    </select>
+
+
+    <select id="selectPersonList" resultType="Map">
+        select * from (
+        SELECT
+        DISTINCT
+        u.sequence_nbr sequenceNbr,
+        u.biz_org_name bizOrgName,
+        u.biz_org_code bizOrgCode,
+        <if test="fields != null">
+            <foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value
+                end) ${item}
+            </foreach>
+        </if>
+        FROM
+        cb_org_usr u LEFT JOIN
+        jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
+        LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
+        where
+        u.biz_org_type = #{bizOrgType}
+        AND u.is_delete = 0
+        <if test="bizOrgName != null">
+            AND u.biz_org_name = #{bizOrgName}
+        </if>
+        <if test="bizOrgCode != null and bizOrgCode != '-1'">
+            AND u.biz_org_code like concat(#{bizOrgCode}, '%')
+        </if>
+        GROUP BY
+        u.sequence_nbr ,
+        u.biz_org_name ,
+        u.biz_org_code
+        )a where a.sequenceNbr is not null
+        <if test="fieldsValue != null">
+            <foreach collection="fieldsValue.keys" item="item">AND a.${item} = #{fieldsValue[${item}]}</foreach>
+        </if>
+        LIMIT #{pageNum}, #{pageSize}
+    </select>
 
 
-	<select id="selectPersonList" resultType="Map">
-		select * from (
-		SELECT
-		DISTINCT
-		u.sequence_nbr sequenceNbr,
-		u.biz_org_name bizOrgName,
-		u.biz_org_code bizOrgCode,
-		<if test="fields != null">
-			<foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value  end) ${item}</foreach>
-		</if>
-		FROM
-		cb_org_usr u LEFT JOIN
-		jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
-		LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
-		where 
-		u.biz_org_type = #{bizOrgType}
-		AND u.is_delete = 0
-		<if  test="bizOrgName != null">
-			AND u.biz_org_name = #{bizOrgName}
-		</if>
-		<if  test="bizOrgCode != null and bizOrgCode != '-1'">
-			AND u.biz_org_code like concat(#{bizOrgCode}, '%')
-		</if>
-		GROUP BY
-		u.sequence_nbr ,
-		u.biz_org_name ,
-		u.biz_org_code
-		)a where a.sequenceNbr is not null
-		<if test="fieldsValue != null">
-			<foreach collection="fieldsValue.keys" item="item" > AND a.${item} = #{fieldsValue[${item}]} </foreach>
-		</if>
-		LIMIT #{pageNum}, #{pageSize}
-	</select>
-	
-	
-	
-	
-	<select id="selectPersonAllList" resultType="Map">
-		select * from (
-		SELECT
-		DISTINCT
-		u.sequence_nbr sequenceNbr,
-		u.biz_org_name bizOrgName,
-		u.biz_org_code bizOrgCode,
-		<if test="fields != null">
-			<foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value  end) ${item}</foreach>
-		</if>
-		FROM
-		cb_org_usr u LEFT JOIN
-		jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
-		LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
-		where u.parent_id = #{parentId}
-		AND u.biz_org_type = #{bizOrgType}
-		AND U.is_delete = 0
-		GROUP BY
-		u.sequence_nbr ,
-		u.biz_org_name ,
-		u.biz_org_code
-		)a where a.sequenceNbr is not null
-	</select>
+    <select id="selectPersonAllList" resultType="Map">
+        select * from (
+        SELECT
+        DISTINCT
+        u.sequence_nbr sequenceNbr,
+        u.biz_org_name bizOrgName,
+        u.biz_org_code bizOrgCode,
+        <if test="fields != null">
+            <foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value
+                end) ${item}
+            </foreach>
+        </if>
+        FROM
+        cb_org_usr u LEFT JOIN
+        jc_alert_form_value v on u.sequence_nbr = v.alert_called_id
+        LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
+        where u.parent_id = #{parentId}
+        AND u.biz_org_type = #{bizOrgType}
+        AND U.is_delete = 0
+        GROUP BY
+        u.sequence_nbr ,
+        u.biz_org_name ,
+        u.biz_org_code
+        )a where a.sequenceNbr is not null
+    </select>
+
+    <select id="selectCompanyDepartmentMsg" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT sequence_nbr,
+               biz_org_name,
+               biz_org_code,
+               biz_org_type,
+               parent_id
+        FROM `cb_org_usr`
+        WHERE is_delete = 0
+            and biz_org_type = "COMPANY"
+           or biz_org_type = "DEPARTMENT"
+    </select>
 
-	<select id="selectCompanyDepartmentMsg" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
-		SELECT
-		sequence_nbr,
-		biz_org_name,
-		biz_org_code,
-		biz_org_type,
-		parent_id
-		FROM
-		`cb_org_usr`
-		WHERE
-		is_delete = 0
-		and biz_org_type = "COMPANY" or biz_org_type =  "DEPARTMENT"
-	</select>
-	
-	<select id="queryOrgUsrListByBizOrgCode" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
-		SELECT
-		sequence_nbr,
-		biz_org_name,
-		biz_org_code,
-		amos_org_id,
-		amos_org_code,
-		biz_org_type,
-		build_name,
-		build_id,
-		parent_id,
-		org_expand_attr1,
-		org_expand_attr2,
-		org_expand_attr3,
-		org_expand_attr4,
-		org_expand_attr5,
-		org_expand_attr6,
-		org_expand_attr7,
-		org_expand_attr8,
-		rec_user_name,
-		rec_user_id,
-		rec_date,
-		is_delete
-		FROM
-		`cb_org_usr`
-		WHERE
-		is_delete = 0
-		and biz_org_code like concat(#{bizOrgCode}, '%')
-	</select>
+    <select id="queryOrgUsrListByBizOrgCode" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT sequence_nbr,
+               biz_org_name,
+               biz_org_code,
+               amos_org_id,
+               amos_org_code,
+               biz_org_type,
+               build_name,
+               build_id,
+               parent_id,
+               org_expand_attr1,
+               org_expand_attr2,
+               org_expand_attr3,
+               org_expand_attr4,
+               org_expand_attr5,
+               org_expand_attr6,
+               org_expand_attr7,
+               org_expand_attr8,
+               rec_user_name,
+               rec_user_id,
+               rec_date,
+               is_delete
+        FROM `cb_org_usr`
+        WHERE is_delete = 0
+          and biz_org_code like concat(#{bizOrgCode}, '%')
+    </select>
+
+    <select id="queryOrgPersonDtoList" resultType="com.yeejoin.amos.boot.module.common.api.dto.ExcelOrgPersonDto">
+        select u.*,
+               v.person_number,
+               v.certificates_type,
+               v.gender,
+               v.certificates_number,
+               v.telephone,
+               v.state,
+               v.safety_training,
+               v.administrative_position,
+               v.internal_position,
+               v.fireManagement_post,
+               v.position_type,
+               v.certificate_type,
+               v.holding_time,
+               v.audit_cycle,
+               v.person_img,
+               v.certificate_img
+        from cb_org_usr u
+                 left join
+             (
+                 select alert_called_id,
+                        max(case field_code when 'personNumber' then field_value end)                   person_number,
+                        max(case field_code when 'certificatesTypeCode' then field_value end)           certificates_type,
+                        max(case field_code when 'gender' then field_value end)                         gender,
+                        max(case field_code when 'certificatesNumber' then field_value end)             certificates_number,
+                        max(case field_code when 'telephone' then field_value end)                      telephone,
+                        max(case field_code when 'stateCode' then field_value end)                      state,
+                        max(case field_code when 'safetyTraining' then field_value end)                 safety_training,
+                        max(
+                                case field_code when 'administrativePositionCode' then field_value end) administrative_position,
+                        max(case field_code when 'internalPositionCode' then field_value end)           internal_position,
+                        max(case field_code when 'fireManagementPostCode' then field_value end)         fireManagement_post,
+                        max(case field_code when 'positionType' then field_value end)                   position_type,
+                        max(case field_code when 'certificateType' then field_value end)                certificate_type,
+                        max(case field_code when 'holdingTime' then field_value end)                    holding_time,
+                        max(case field_code when 'auditCycle' then field_value end)                     audit_cycle,
+                        max(case field_code when 'personImg' then field_value end)                      person_img,
+                        max(case field_code when 'certificateImg' then field_value end)                 certificate_img
+                 from jc_alert_form_value
+                 where alert_type_code = 246
+                 group by alert_called_id
+             ) v
+             on u.sequence_nbr = v.alert_called_id
+        where u.is_delete = #{isDelete}
+    </select>
 </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.jcs.api.mapper.WaterResourceMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper">
 
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
         select r.name,

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 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.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 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.FireChemicalServiceImpl;
-
 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.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -51,7 +37,6 @@ public class FireChemicalController extends BaseController {
 
     @Autowired
     FireChemicalServiceImpl fireChemicalServiceImpl;
-  
 
     /**
      * 新增危化品
@@ -146,7 +131,7 @@ public class FireChemicalController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导入危化品")
     @PostMapping("/import_batch")
-    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
+    public void importByExcel(MultipartFile multipartFile) throws Exception {
         List<FireChemicalDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireChemicalDto.class,
                 1);
         List<FireChemical> excelEntityList = new ArrayList<>();
@@ -165,5 +150,17 @@ public class FireChemicalController extends BaseController {
         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, null, 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;
@@ -40,15 +12,24 @@ 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.FireExpertsServiceImpl;
 import com.yeejoin.amos.boot.module.common.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.servlet.http.HttpServletResponse;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -71,8 +52,6 @@ public class FireExpertsController extends BaseController {
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
 
-    
-
     /**
      * 新增
      *
@@ -125,7 +104,7 @@ public class FireExpertsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<FireExpertsDto> selectOne(@PathVariable Long sequenceNbr) throws Exception {
+    public ResponseModel<FireExpertsDto> selectOne(@PathVariable Long sequenceNbr) {
         FireExpertsDto fireExpertsDto = fireExpertsServiceImpl.queryBySeq(sequenceNbr);
         Date birthdayTime = fireExpertsDto.getBirthdayTime();
         int age = BeanDtoVoUtils.getAge(birthdayTime);
@@ -228,7 +207,7 @@ public class FireExpertsController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "批量导入消防专家")
     @PostMapping("/import_batch")
-    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
+    public void importByExcel(MultipartFile multipartFile) throws Exception {
         List<FireExpertsDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireExpertsDto.class, 1);
         List<FireExperts> excelEntityList = new ArrayList<>();
         excelDtoList.forEach(
@@ -260,6 +239,18 @@ public class FireExpertsController extends BaseController {
         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, null, 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 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 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 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.FireStationDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
+import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.common.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.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 javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
-* 微型消防站
-*
-* @author system_generator
-* @date 2021-06-28
-*/
+ * 微型消防站
+ *
+ * @author system_generator
+ * @date 2021-06-28
+ */
 @RestController
 @Api(tags = "微型消防站Api")
 @RequestMapping(value = "/common/fire-station")
@@ -43,93 +39,134 @@ public class FireStationController extends BaseController {
     FireStationServiceImpl fireStationServiceImpl;
 
     /**
-             * 新增微型消防站
-    * @return
-    */
+     * 新增微型消防站
+     *
+     * @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)
-	@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
-    */
+    @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){
+    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));
+    }
+
     /**
-             * 根据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());
-	}
+     * 新列表分页查询
+     *
+     * @param pageNum 当前页
+     * @param pageSize 每页大小
+     * @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(false));
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导入微型消防站")
+    @PostMapping("/import_batch")
+    public void importByExcel(MultipartFile multipartFile) throws Exception {
+        List<FireStationDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireStationDto.class, 1);
+        List<FireStation> excelEntityList = new ArrayList<>();
+        excelDtoList.forEach(
+                item -> {
+                    FireStation fireStation = new FireStation();
+                    fireStation = Bean.toPo(item, fireStation);
+                    excelEntityList.add(fireStation);
+                }
+        );
+        fireStationServiceImpl.saveBatch(excelEntityList);
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导出微型消防站")
+    @GetMapping("/export")
+    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
+        try {
+            List<FireStationDto> data = fireStationServiceImpl.queryForFireStationList(false);
+            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
+                    FireStationDto.class, null, 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/OrgPersonController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-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.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 com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-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.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 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;
+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.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 javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author fengwang
@@ -41,55 +33,57 @@ import io.swagger.annotations.ApiOperation;
 @Api(tags = "人员Api")
 @RequestMapping(value = "/org-person")
 public class OrgPersonController {
-	@Autowired
-	OrgUsrServiceImpl iOrgUsrService;
-	@Autowired
-	AlertFormValueServiceImpl iAlertFromValueService;
-
-	/**
-	 * 新增人员信息
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/save", method = RequestMethod.POST)
-	@ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
-	public ResponseModel<?> saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo) throws Exception {
-		OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-		iOrgUsrService.saveOrgPerson(OrgPersonVo);
-		return ResponseHelper.buildResponse(null);
-	}
-
-	/**
-	 * 根据id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-	@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-	public ResponseModel<?> deleteById(HttpServletRequest request, @PathVariable Long id) {
-		// 删除时，只作逻辑删除
-		iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
-		return ResponseHelper.buildResponse(null);
-	}
-
-	/**
-	 * 更新人员数据
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
-	@ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-	public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo, @PathVariable Long id) throws Exception {
-		OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-		iOrgUsrService.updateByIdOrgPerson(OrgPersonVo,id);
-		return ResponseHelper.buildResponse(null);
-	}
-
-	
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+    @Autowired
+    AlertFormValueServiceImpl iAlertFromValueService;
+
+    /**
+     * 新增人员信息
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
+    public ResponseModel<?> saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo) throws Exception {
+        OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
+        iOrgUsrService.saveOrgPerson(OrgPersonVo);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 根据id删除
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public ResponseModel<?> deleteById(HttpServletRequest request, @PathVariable Long id) {
+        // 删除时，只作逻辑删除
+        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete",
+                CommonConstant.IS_DELETE_01));
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 更新人员数据
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
+    public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonDto OrgPersonVo,
+                                             @PathVariable Long id) throws Exception {
+        OrgPersonVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
+        iOrgUsrService.updateByIdOrgPerson(OrgPersonVo, id);
+        return ResponseHelper.buildResponse(null);
+    }
+
+
     /**
      * 根据id查询人员
      *
@@ -105,119 +99,144 @@ public class OrgPersonController {
         return ResponseHelper.buildResponse(iOrgUsrService.selectPersonById(id));
     }
 
-	/**
-	 *
-	 * @param request
-	 * @param id
-	 * @return
-	 * @throws Exception
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/{id}/detail", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
-	public ResponseModel<OrgPersonFormDto> selectByIdDetail(HttpServletRequest request, @PathVariable Long id) throws Exception {
-		return ResponseHelper.buildResponse(iOrgUsrService.selectPersonByIdDetail(id));
-	}
-	
-	/**
-	 * 根据id查询人员
-	 *
-	 * @param id
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/show/{id}", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "获取人员详情(map类型)", notes = "获取人员详情")
-	public ResponseModel<Map<String, Object>> selectForShowById(HttpServletRequest request, @PathVariable Long id) throws Exception {
-		OrgUsr orgUsr = iOrgUsrService.getById(id);
-		Map<String, Object> result = iOrgUsrService.selectForShowById(orgUsr, id);
-		return ResponseHelper.buildResponse(result);
-	}
-
-
-	/**
-	 * 获取人员树
-	 *
-	 * @param
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/companyTree", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "获取人员树", notes = "获取人员树")
-	public ResponseModel<List<OrgMenuDto> > selectPersonTree() throws Exception {
-		return ResponseHelper.buildResponse(iOrgUsrService.selectPersonTree());
-	}
-
-	/**
-	 * 列表分页查询
-	 *
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-	public ResponseModel<Object> listPage(@RequestParam Map<String, Object> requestBody) {
-		return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(requestBody.get("pageNum").toString(), requestBody.get("pageSize").toString(), requestBody));
-	}
-
-	/**
-	 *
-	 * 根据orgCode查询
-	 * @param orgCode
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/{orgCode}/users", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "根据orgCode查询", notes = "根据orgCode查询")
-	public ResponseModel<Collection<OrgUsr>> selectUsersByOrgCode(HttpServletRequest request, String pageNum, String pageSize, @PathVariable Long orgCode) {
-		Map<String, Object> columnMap = new HashMap<>();
-		columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
-		columnMap.put("biz_org_code", orgCode);
-		columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
-		return ResponseHelper.buildResponse(iOrgUsrService.listByMap(columnMap));
-	}
-
-	/**
-	 * 导出人员模板
-	 *
-	 * @param response
-	 * @param OrgUsrDownloadTemplateVO
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/download-template", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "导出人员模板", notes = "导出人员模板")
+    /**
+     * @param request
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}/detail", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
+    public ResponseModel<OrgPersonFormDto> selectByIdDetail(HttpServletRequest request, @PathVariable Long id) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.selectPersonByIdDetail(id));
+    }
+
+    /**
+     * 根据id查询人员
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/show/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取人员详情(map类型)", notes = "获取人员详情")
+    public ResponseModel<Map<String, Object>> selectForShowById(HttpServletRequest request, @PathVariable Long id) throws Exception {
+        OrgUsr orgUsr = iOrgUsrService.getById(id);
+        Map<String, Object> result = iOrgUsrService.selectForShowById(orgUsr, id);
+        return ResponseHelper.buildResponse(result);
+    }
+
+
+    /**
+     * 获取人员树
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取人员树", notes = "获取人员树")
+    public ResponseModel<List<OrgMenuDto>> selectPersonTree() throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.selectPersonTree());
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public ResponseModel<Object> listPage(@RequestParam Map<String, Object> requestBody) {
+        return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(requestBody.get("pageNum").toString(),
+                requestBody.get("pageSize").toString(), requestBody));
+    }
+
+    /**
+     * 根据orgCode查询
+     *
+     * @param orgCode
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{orgCode}/users", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据orgCode查询", notes = "根据orgCode查询")
+    public ResponseModel<Collection<OrgUsr>> selectUsersByOrgCode(HttpServletRequest request, String pageNum,
+                                                                  String pageSize, @PathVariable Long orgCode) {
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
+        columnMap.put("biz_org_code", orgCode);
+        columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
+        return ResponseHelper.buildResponse(iOrgUsrService.listByMap(columnMap));
+    }
+
+    /**
+     * 导出人员模板
+     *
+     * @param response
+     * @param
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/download-template", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "导出人员模板", notes = "导出人员模板")
     public ResponseModel<?> downloadTemplate(HttpServletResponse response) throws UnsupportedEncodingException {
 //        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
 //        List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO = new ArrayList<OrgUsrDownloadTemplateVO>();
-//        ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "人员信息", "人员信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
+//        ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "人员信息", "人员信息", OrgUsrDownloadTemplateVO.class,
+//        simpleDateFormat.format(new Date()) + ".xls", response);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 导入人员信息
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/savePerson", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "导入人员信息", notes = "导入人员信息")
+    public ResponseModel<?> savePerson(HttpServletRequest request, @RequestBody List<OrgPersonDto> OrgPersonVo) throws Exception {
+        iOrgUsrService.savePersonList(OrgPersonVo);
         return ResponseHelper.buildResponse(null);
-	}
-
-	/**
-	 * 导入人员信息
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/savePerson", method = RequestMethod.POST)
-	@ApiOperation(httpMethod = "POST", value = "导入人员信息", notes = "导入人员信息")
-	public ResponseModel<?> savePerson(HttpServletRequest request, @RequestBody List<OrgPersonDto> OrgPersonVo) throws Exception {
-		iOrgUsrService.savePersonList(OrgPersonVo);
-		return ResponseHelper.buildResponse(null);
-	}
-
-	/**
-	 * 根据id查询人员
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/showPersonList/{ids}", method = RequestMethod.GET)
-	@ApiOperation(httpMethod = "GET", value = "获取人员列表详情(map类型)", notes = "获取人员详情")
-	public ResponseModel<List<Map<String, Object>> > selectForShowByListId(HttpServletRequest request, @PathVariable List<Long> ids) throws Exception {
-		return ResponseHelper.buildResponse(iOrgUsrService.selectForShowByListId(ids)
+    }
+
+    /**
+     * 根据id查询人员
+     *
+     * @param ids
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/showPersonList/{ids}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取人员列表详情(map类型)", notes = "获取人员详情")
+    public ResponseModel<List<Map<String, Object>>> selectForShowByListId(HttpServletRequest request,
+                                                                          @PathVariable List<Long> ids) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.selectForShowByListId(ids)
         );
-	}
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导入机场单位")
+    @PostMapping("/import_batch")
+    public void importByExcel(MultipartFile multipartFile) throws Exception {
+        List<ExcelOrgPersonDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, ExcelOrgPersonDto.class, 1);
+        iOrgUsrService.importByExcel(excelDtoList);
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导出机场单位")
+    @GetMapping("/export")
+    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
+        try {
+            List<ExcelOrgPersonDto> data = iOrgUsrService.queryOrgPersonDtoList(false);
+            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
+                    ExcelOrgPersonDto.class, null, 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/WaterResourceController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-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 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 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.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.*;
 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.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 com.yeejoin.amos.boot.module.common.biz.service.impl.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+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.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 
 /**
@@ -79,7 +49,6 @@ public class WaterResourceController extends BaseController {
     WaterResourcePoolServiceImpl waterResourcePoolService;
     @Autowired
     WaterResourceIotServiceImpl waterResourceIotService;
-   
 
     /**
      * 新增
@@ -356,7 +325,7 @@ public class WaterResourceController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "批量导入消防水源")
     @PostMapping("/import_batch")
-    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
+    public void importByExcel(MultipartFile multipartFile) throws Exception {
         List<WaterResourceDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, WaterResourceDto.class, 1);
         excelDtoList.forEach(
                 item -> {
@@ -385,5 +354,17 @@ public class WaterResourceController extends BaseController {
         );
     }
 
-    
+    @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, null, 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/service/impl/DataSourcesImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+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;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@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);
+        if ("ZJLY".equals(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/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;
@@ -16,6 +8,15 @@ 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.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 微型消防站服务实现类
@@ -25,73 +26,69 @@ import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
  */
 @Service
 public class FireStationServiceImpl extends BaseService<FireStationDto, FireStation, FireStationMapper>
-		implements IFireStationService {
+        implements IFireStationService {
 
-	@Autowired
-	FireStationMapper fireStationMapper;
-	@Autowired
-	OrgUsrMapper orgUsrMapper;
+    @Autowired
+    FireStationMapper fireStationMapper;
+    @Autowired
+    OrgUsrMapper orgUsrMapper;
 
-	/**
-	 * 分页查询
-	 */
-	public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page) {
-		return this.queryForPage(page, null, false);
-	}
+    /**
+     * 分页查询
+     */
+    public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page) {
+        return this.queryForPage(page, null, false);
+    }
 
-	/**
-	 * 列表查询 示例
-	 */
-	public List<FireStationDto> queryForFireStationList() {
-		return this.queryForList("", false);
-	}
+    /**
+     * 列表查询 示例
+     */
+    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete) {
+        return this.queryForList("", false, isDelete);
+    }
 
-	/**
-	 * 删除
-	 */
-	public Boolean updateisDelete(Long sequenceNbr) {
+    /**
+     * 删除
+     */
+    public Boolean updateisDelete(Long sequenceNbr) {
 
-		return this.update(new UpdateWrapper<FireStation>().eq("sequence_nbr", sequenceNbr).set("is_delete", 1));
-	}
+        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);
-	}
+    @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) {
+    /**
+     * 新增
+     ***/
+    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);
-	}
+        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);
-	}
+    /**
+     * 修改
+     ***/
+    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-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-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.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 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.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.dto.*;
 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;
@@ -42,6 +14,19 @@ 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;
+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.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 机构/部门/人员表 服务实现类
@@ -56,28 +41,32 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     AlertFormValueServiceImpl alertFormValueServiceImpl;
     @Autowired
     AlertFormServiceImpl alertFormServiceImpl;
+    @Resource
+    OrgUsrMapper orgUsrMapper;
 
     @Override
     public String selectUpUnitByParam(String id) {
         return this.baseMapper.selectUpUnitByParam(id);
     }
-    
-    
+
+
     public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
 
         List<OrgMenuDto> menuList = list.stream().map(o -> {
-        	OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(), ObjectUtils.isEmpty(o.getParentId()) ? 0L :Long.valueOf(o.getParentId()), o.getBizOrgType(), false, o.getBizOrgCode());
-        	return menu;
+            OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
+                    ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(),
+                    false, o.getBizOrgCode());
+            return menu;
         }).collect(Collectors.toList());
-        
+
         List<OrgMenuDto> result = new ArrayList<>();
         Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
         menuList.forEach(e -> map.put(e.getKey(), e));
         Set<? extends Map.Entry<Long, ? extends OrgMenuDto>> entries = map.entrySet();
         entries.parallelStream().forEach(entry -> {
-        	OrgMenuDto value = entry.getValue();
+            OrgMenuDto value = entry.getValue();
             if (value != null) {
-            	OrgMenuDto treeDto = map.get(value.getParentId());
+                OrgMenuDto treeDto = map.get(value.getParentId());
                 if (treeDto != null) {
                     List<OrgMenuDto> children = treeDto.getChildren();
                     if (children == null) {
@@ -94,7 +83,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-    public List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception {
+    public List<OrgMenuDto> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName,
+                                    int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName,
+                                    String OrgTypeMethodName) throws Exception {
         List<OrgMenuDto> resultList = new ArrayList<>();
         Class<?> clazz = Class.forName(packageURL);
         Method IDMethodNameme = null;
@@ -122,23 +113,29 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
             Object entity = clazz.cast(ob);
 
-            parentId = PARENTIDMethodNameme.invoke(entity) != null ? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null;
+            parentId = PARENTIDMethodNameme.invoke(entity) != null ?
+                    Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null;
 
             if (parentId == null || topId == parentId) {
-                OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
+                OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
+                        String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
+                        String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
                 resultList.add(menu);
             }
         }
         //获取每个顶层元素的子数据集合
         for (OrgMenuDto entity : resultList) {
-            entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
+            entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy,
+                    NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
         }
         return resultList;
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public List<OrgMenuDto> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception {
+    public List<OrgMenuDto> getSub(Long topId, @SuppressWarnings("rawtypes") Collection entityList, String packageURL
+            , String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName,
+                                   String OrgTypeMethodName) throws Exception {
         List<OrgMenuDto> childList = new ArrayList<>();
         @SuppressWarnings("rawtypes")
         Class clazz = Class.forName(packageURL);
@@ -166,16 +163,21 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         for (Object ob : entityList) {
             Object entity = clazz.cast(ob);
 
-            parentId = PARENTIDMethodNameme.invoke(entity) != null ? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null;
+            parentId = PARENTIDMethodNameme.invoke(entity) != null ?
+                    Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity))) : null;
 
             if (parentId == null) {
                 if (topId == parentId) {
-                    OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)));
+                    OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
+                            String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
+                            String.valueOf(OrgTypeMethodNameme.invoke(entity)));
                     childList.add(menu);
                 }
             } else {
                 if (topId.longValue() == parentId.longValue()) {
-                    OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId, String.valueOf(OrgTypeMethodNameme.invoke(entity)));
+                    OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
+                            String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
+                            String.valueOf(OrgTypeMethodNameme.invoke(entity)));
                     childList.add(menu);
                 }
             }
@@ -184,7 +186,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
         //子集的间接子对象
         for (OrgMenuDto entity : childList) {
-            entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy, NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
+            entity.setChildren(getSub(entity.getKey(), entityList, packageURL, IDMethodName, IDHierarchy,
+                    NAMEMethodName, PARENTIDMethodName, OrgTypeMethodName));
             if (entity.getChildren() != null) {
                 entity.setLeaf(false);
             }
@@ -207,7 +210,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             OrgUsr company = getById(ids.get(i));
             resultMap.put("id", company.getSequenceNbr());
             // 上级单位
-            resultMap.put("upUnit", selectUpUnitByParam(company.getSequenceNbr()+""));
+            resultMap.put("upUnit", selectUpUnitByParam(company.getSequenceNbr() + ""));
             // 当前单位
             resultMap.put("currentUnit", company.getBizOrgName());
             // 下级单位
@@ -232,10 +235,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             int personNum = count(personNumWrapper);
             resultMap.put("personNum", personNum);
             if (0 == personNum) {
-            	continue;
+                continue;
             }
             List<Map<String, Object>> personList = new ArrayList<>();
-                // 查询动态表单Phone
+            // 查询动态表单Phone
             Map<String, Object> phone = new HashMap<>();
             phone.put("alert_called_id", company.getSequenceNbr());
             phone.put("field_code", "companyPhone");
@@ -243,42 +246,41 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             phoneWrapper.allEq(phone);
             AlertFormValue phoneValue = alertFormValueServiceImpl.getOne(phoneWrapper);
             if (phoneValue == null) {
-            	resultMap.put("tel", "");
+                resultMap.put("tel", "");
             } else {
-            	resultMap.put("tel", phoneValue.getFieldValue());
+                resultMap.put("tel", phoneValue.getFieldValue());
             }
-            
+
             // 获取单位人员列表信息
-            personList = listPerson(company.getSequenceNbr()+"").stream().map( p -> {
-            	Map<String, Object> person = new HashMap<>();
-            	person.put("tel", getValue(p.get("telephone"), null));
-            	person.put("img", getValue(p.get("personImg"), null));
-            	person.put("id", getValue(p.get("sequenceNbr"), null));
-            	person.put("name", getValue(p.get("bizOrgName"), null));
-            	person.put("zhiwei", getValue(p.get("administrativePositionCode"), null));
-            	person.put("unit", getValue(p.get("fireManagementPostCode"), null));
-            	return person;
+            personList = listPerson(company.getSequenceNbr() + "").stream().map(p -> {
+                Map<String, Object> person = new HashMap<>();
+                person.put("tel", getValue(p.get("telephone"), null));
+                person.put("img", getValue(p.get("personImg"), null));
+                person.put("id", getValue(p.get("sequenceNbr"), null));
+                person.put("name", getValue(p.get("bizOrgName"), null));
+                person.put("zhiwei", getValue(p.get("administrativePositionCode"), null));
+                person.put("unit", getValue(p.get("fireManagementPostCode"), null));
+                return person;
             }).collect(Collectors.toList());
             resultMap.put("children", personList);
             companyPersonMsg.add(resultMap);
         }
         return companyPersonMsg;
     }
-    
+
     private Object getValue(Object obj, Object defaultValue) {
-    	return ObjectUtils.isEmpty(obj) ? defaultValue : obj;
+        return ObjectUtils.isEmpty(obj) ? defaultValue : obj;
     }
-    
+
 
     public List<Map<String, Object>> listPerson(String parentId) {
-    	Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<String, Object>();
         map.put("fields", alertFormServiceImpl.queryListByFormId(OrgPersonEnum.人员.getCode()));
         map.put("bizOrgType", OrgPersonEnum.人员.getKey());
         map.put("parentId", parentId);
         List<Map<String, Object>> list = this.baseMapper.selectPersonAllList(map);
         return list == null ? new ArrayList<Map<String, Object>>() : list;
     }
-    
 
 
     public IPage<Map<String, Object>> pagePerson(String pageNum, String pageSize, Map<String, Object> req) {
@@ -291,9 +293,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         Map<String, Object> map = new HashMap<>();
         map.put("bizOrgType", OrgPersonEnum.人员.getKey());
         if (!ObjectUtils.isEmpty(req.get("bizOrgName"))) {
-        	map.put("bizOrgName", req.get("bizOrgName"));
+            map.put("bizOrgName", req.get("bizOrgName"));
         }
-        OrgUsr parent = this.getById( Long.valueOf(req.get("parentId").toString()));
+        OrgUsr parent = this.getById(Long.valueOf(req.get("parentId").toString()));
         map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
         req.remove("bizOrgName");
         req.remove("pageSize");
@@ -304,7 +306,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         pageBean.setTotal(this.baseMapper.selectPersonListCount(map));
         map.put("pageNum", (pageBean.getCurrent() - 1) * pageBean.getSize());
         map.put("pageSize", pageBean.getSize());
-        
+
         List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
 
         pageBean.setRecords(list);
@@ -318,11 +320,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<FormValue> formValue = new ArrayList<>();
         for (AlertFormValueDto alertFormValue : list) {
             if (alertFormValue.getFieldValueCode() == null) {
-                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
+                        alertFormValue.getFieldType(),
                         alertFormValue.getFieldValue(), alertFormValue.getBlock());
                 formValue.add(value);
             } else {
-                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
+                        alertFormValue.getFieldType(),
                         alertFormValue.getFieldValueCode(), alertFormValue.getBlock());
                 formValue.add(value);
             }
@@ -335,7 +339,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<AlertFormValueDto> list = alertFormValueServiceImpl.listByCalledId(id);
         List<FormValue> formValue = new ArrayList<>();
         for (AlertFormValueDto alertFormValue : list) {
-            FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
+            FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(),
+                    alertFormValue.getFieldType(),
                     alertFormValue.getFieldValue(), alertFormValue.getBlock());
             formValue.add(value);
         }
@@ -352,54 +357,54 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         orgUsr.setRecUserName(ori.getRecUserName());
         orgUsr.setAmosOrgId(ori.getAmosOrgId());
         orgUsr.setAmosOrgCode(ori.getAmosOrgCode());
-        
+
         if (oriOrgUsr.getParentId() != null) {
-        	if (!ori.getParentId().equals(oriOrgUsr.getParentId())) {
-        		OrgUsr parent = getById(oriOrgUsr.getParentId());
+            if (!ori.getParentId().equals(oriOrgUsr.getParentId())) {
+                OrgUsr parent = getById(oriOrgUsr.getParentId());
                 if (parent != null && ObjectUtils.isEmpty(oriOrgUsr.getBizOrgCode())) {
-                	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+                    orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
                 }
                 updateChildOrgCode(ori.getBizOrgCode(), parent.getBizOrgCode());
                 orgUsr.setParentId(oriOrgUsr.getParentId());
-        	}
+            }
         } else {
-        	orgUsr.setBizOrgCode(getOrgCodeStr());
-        	updateChildOrgCode(ori.getBizOrgCode(), orgUsr.getBizOrgCode());
+            orgUsr.setBizOrgCode(getOrgCodeStr());
+            updateChildOrgCode(ori.getBizOrgCode(), orgUsr.getBizOrgCode());
         }
         updateById(orgUsr);
     }
-    
-    
+
+
     private void updateChildOrgCode(String oriOrgCode, String targetOrgCode) {
-    	List<OrgUsr> list = queryOrgUsrList(oriOrgCode);
-    	if (ObjectUtils.isEmpty(list)) {
-    		return;
-    	}
-    	list.forEach(action -> {
-    		action.setBizOrgCode(action.getBizOrgCode().replace(oriOrgCode, targetOrgCode));
-    		updateById(action);
-    	});
-    }
-    
+        List<OrgUsr> list = queryOrgUsrList(oriOrgCode);
+        if (ObjectUtils.isEmpty(list)) {
+            return;
+        }
+        list.forEach(action -> {
+            action.setBizOrgCode(action.getBizOrgCode().replace(oriOrgCode, targetOrgCode));
+            updateById(action);
+        });
+    }
+
     public List<OrgUsr> queryOrgUsrList(String bizOrgCode) {
-    	return this.baseMapper.queryOrgUsrListByBizOrgCode(bizOrgCode);
+        return this.baseMapper.queryOrgUsrListByBizOrgCode(bizOrgCode);
     }
 
     @Override
     public void saveOrgUsrAlertFormValue(OrgUsr orgUsr, List<AlertFormValue> alertFromValuelist) {
-    	orgUsr.setRecDate(new Date());
-    	AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
-    	orgUsr.setRecUserName(user.getRealName());
-    	orgUsr.setRecUserId(user.getUserId());
+        orgUsr.setRecDate(new Date());
+        AgencyUserModel user = Privilege.agencyUserClient.getme().getResult();
+        orgUsr.setRecUserName(user.getRealName());
+        orgUsr.setRecUserId(user.getUserId());
         // 单位新增情况
         save(orgUsr);
         // 填充主键
         alertFromValuelist.stream().forEach(alertFromValue -> {
-        	if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
-        		alertFromValue.setAlertTypeCode(OrgPersonEnum.公司.getCode());
-        	} else if (OrgPersonEnum.部门.getKey().equals(orgUsr.getBizOrgType())) {
-        		alertFromValue.setAlertTypeCode(OrgPersonEnum.部门.getCode());
-        	}
+            if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
+                alertFromValue.setAlertTypeCode(OrgPersonEnum.公司.getCode());
+            } else if (OrgPersonEnum.部门.getKey().equals(orgUsr.getBizOrgType())) {
+                alertFromValue.setAlertTypeCode(OrgPersonEnum.部门.getCode());
+            }
             alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
         });
         // 保存动态表单数据
@@ -414,7 +419,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         });
         List<AlertFormValueDto> formList = alertFormValueServiceImpl.queryByCalledId(orgUsr.getSequenceNbr());
         if (formList != null && formList.size() > 0) {
-        	for (AlertFormValue dis : alertFromValuelist) {
+            for (AlertFormValue dis : alertFromValuelist) {
                 for (AlertFormValueDto src : formList) {
                     if (dis.getAlertFormId() == src.getAlertFormId()) {
                         dis.setSequenceNbr(src.getSequenceNbr());
@@ -428,34 +433,35 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                     }
                 }
             }
-        	// 保存动态表单数据
+            // 保存动态表单数据
             alertFormValueServiceImpl.updateBatchById(alertFromValuelist);
-            
+
             List<AlertFormDto> form = alertFormServiceImpl.queryListByTypeCode(formList.get(0).getAlertTypeCode());
-            
+
             if (form.size() != alertFromValuelist.size()) {
-            	
-            	List<AlertFormValue> creatList = new ArrayList<>();
-            	
-            	for (AlertFormValue dis : alertFromValuelist) {
-            		boolean exist = false;
-            		for (AlertFormValueDto src : formList) {
+
+                List<AlertFormValue> creatList = new ArrayList<>();
+
+                for (AlertFormValue dis : alertFromValuelist) {
+                    boolean exist = false;
+                    for (AlertFormValueDto src : formList) {
                         if (dis.getAlertFormId() == src.getSequenceNbr()) {
-                        	exist = true;
+                            exist = true;
                             break;
                         }
                     }
-            		if (ObjectUtils.isEmpty(dis) && !exist) {
-            			creatList.add(dis);
-            		}
+                    if (ObjectUtils.isEmpty(dis) && !exist) {
+                        creatList.add(dis);
+                    }
                 }
-            	
-            	alertFormValueServiceImpl.saveBatch(creatList);
+
+                alertFormValueServiceImpl.saveBatch(creatList);
             }
-            
-            List<AlertFormValue> creatList = alertFromValuelist.stream().filter(v -> v.getSequenceNbr() == null || v.getSequenceNbr() == 0).collect(Collectors.toList());
+
+            List<AlertFormValue> creatList =
+                    alertFromValuelist.stream().filter(v -> v.getSequenceNbr() == null || v.getSequenceNbr() == 0).collect(Collectors.toList());
             if (creatList != null && creatList.size() > 0) {
-            	alertFormValueServiceImpl.saveBatch(creatList);
+                alertFormValueServiceImpl.saveBatch(creatList);
             }
         } else {
             // 保存动态表单数据
@@ -466,13 +472,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     @Override
     public Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception {
         QueryWrapper<AlertForm> queryWrapper = new QueryWrapper<AlertForm>();
-        queryWrapper.eq("alert_type_code",OrgPersonEnum.人员.getCode());
+        queryWrapper.eq("alert_type_code", OrgPersonEnum.人员.getCode());
         List<AlertForm> alertForms = alertFormServiceImpl.list(queryWrapper);
         // 动态表单数据
         List<AlertFormValueDto> list = alertFormValueServiceImpl.listByCalledId(id);
         Map<String, Object> result = new HashMap<>();
         result = Bean.BeantoMap(orgUsr);
-        result.put("parenName",getById(orgUsr.getParentId()).getBizOrgName());
+        result.put("parenName", getById(orgUsr.getParentId()).getBizOrgName());
         // 放入所有动态表单数据
         for (AlertForm alertForm : alertForms) {
             result.put(alertForm.getFieldCode(), null);
@@ -485,11 +491,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
     @Override
     public List<OrgUsr> selectCompanyDepartmentMsg() {
-    	List<OrgUsr> list = this.baseMapper.selectCompanyDepartmentMsg();
-    	if (list == null) {
-    		return new ArrayList<>();
-    	}
-    	list = list.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
+        List<OrgUsr> list = this.baseMapper.selectCompanyDepartmentMsg();
+        if (list == null) {
+            return new ArrayList<>();
+        }
+        list = list.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
         return list;
     }
 
@@ -499,12 +505,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         BeanUtils.copyProperties(OrgUsrVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
         if (OrgUsrVo.getParentId() != null) {
-        	OrgUsr parent = getById(OrgUsrVo.getParentId());
-            if (parent != null &&  ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
-            	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+            OrgUsr parent = getById(OrgUsrVo.getParentId());
+            if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
+                orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
             }
         } else {
-        	orgUsr.setBizOrgCode(getOrgCodeStr());
+            orgUsr.setBizOrgCode(getOrgCodeStr());
         }
         saveOrgUsrAlertFormValue(orgUsr, OrgUsrVo.getAlertFormValue());
     }
@@ -515,20 +521,20 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
         if (OrgPersonVo.getParentId() != null) {
-        	OrgUsr parent = getById(OrgPersonVo.getParentId());
-            if (parent != null &&  ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) {
-            	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+            OrgUsr parent = getById(OrgPersonVo.getParentId());
+            if (parent != null && ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) {
+                orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
             }
         } else {
-        	orgUsr.setBizOrgCode(getOrgCodeStr());
+            orgUsr.setBizOrgCode(getOrgCodeStr());
         }
-        
-        
+
+
         if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
-        	AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
+            AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
             OrgPersonVo.setAmosOrgCode(user.getRealName());
         }
-        
+
         saveOrgUsrAlertFormValue(orgUsr, OrgPersonVo.getAlertFormValue());
     }
 
@@ -539,12 +545,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgUsrVo, orgUsr);
         if (orgUsr.getParentId() != null) {
-        	OrgUsr parent = getById(orgUsr.getParentId());
-            if (parent != null &&  ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
-            	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+            OrgUsr parent = getById(orgUsr.getParentId());
+            if (parent != null && ObjectUtils.isEmpty(OrgUsrVo.getBizOrgCode())) {
+                orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
             }
         } else {
-        	orgUsr.setBizOrgCode(getOrgCodeStr());
+            orgUsr.setBizOrgCode(getOrgCodeStr());
         }
         saveOrgUsr(orgUsr, id);
         // 保存动态表单数据
@@ -558,13 +564,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
-        	AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
+            AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
             oriOrgUsr.setAmosOrgCode(user.getRealName());
             oriOrgUsr.setAmosOrgId(user.getUserId());
             orgUsr.setAmosOrgCode(user.getRealName());
             orgUsr.setAmosOrgId(user.getUserId());
         }
-        
+
         saveOrgUsr(oriOrgUsr, id);
         // 保存动态表单数据
         updateAlertFormValue(oriOrgUsr, orgUsr.getSequenceNbr(), OrgPersonVo.getAlertFormValue());
@@ -631,9 +637,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
         OrgUsr parent = getById(orgUsr.getParentId());
         if (!ObjectUtils.isEmpty(parent)) {
-        	orgPersonFormVo.setParentName(parent.getBizOrgName());
+            orgPersonFormVo.setParentName(parent.getBizOrgName());
         }
-        
+
         return orgPersonFormVo;
     }
 
@@ -655,7 +661,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
         Collection<OrgUsr> list = listByMap(columnMap);
-        return getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+        return getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId",
+                "getBizOrgType");
     }
 
 
@@ -675,12 +682,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
         if (OrgDepartmentVo.getParentId() != null) {
-        	OrgUsr parent = getById(OrgDepartmentVo.getParentId());
-            if (parent != null &&  ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
-            	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+            OrgUsr parent = getById(OrgDepartmentVo.getParentId());
+            if (parent != null && ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
+                orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
             }
         } else {
-        	orgUsr.setBizOrgCode(getOrgCodeStr());
+            orgUsr.setBizOrgCode(getOrgCodeStr());
         }
         saveOrgUsrAlertFormValue(orgUsr, OrgDepartmentVo.getAlertFormValue());
     }
@@ -692,12 +699,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
         if (orgUsr.getParentId() != null) {
-        	OrgUsr parent = getById(orgUsr.getParentId());
-            if (parent != null &&  ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
-            	orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
+            OrgUsr parent = getById(orgUsr.getParentId());
+            if (parent != null && ObjectUtils.isEmpty(OrgDepartmentVo.getBizOrgCode())) {
+                orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
             }
         } else {
-        	orgUsr.setBizOrgCode(getOrgCodeStr());
+            orgUsr.setBizOrgCode(getOrgCodeStr());
         }
         saveOrgUsr(orgUsr, id);
         // 保存动态表单数据
@@ -724,16 +731,138 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }
         return personResult;
     }
-    
-    public static String getOrgCodeStr(){
-		 int length = 6;
-	     String str="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-	     Random random=new Random();
-	     StringBuffer sb=new StringBuffer();
-	     for(int i=0;i<length;i++){
-	       int number=random.nextInt(62);
-	       sb.append(str.charAt(number));
-	     }
-	     return sb.toString();
-	 }
+
+    public static String getOrgCodeStr() {
+        int length = 6;
+        String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < length; i++) {
+            int number = random.nextInt(62);
+            sb.append(str.charAt(number));
+        }
+        return sb.toString();
+    }
+
+    public void importByExcel(List<ExcelOrgPersonDto> list) {
+        list.forEach(item -> {
+                    OrgPersonDto orgPersonDto = new OrgPersonDto();
+                    orgPersonDto = Bean.toPo(item, orgPersonDto);
+                    List<AlertFormValue> alertFormValueList = new ArrayList<>();
+                    if (item.getPersonNumber() != null) {
+                        AlertFormValue alertFormValue = new AlertFormValue(102L, "246", "员工编号", "personNumber",
+                                item.getPersonNumber(), null, false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getCertificatesType() != null) {
+                        String certificatesType = item.getCertificatesType();
+                        String[] split = certificatesType.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(23L, "246", "证件类型", "certificatesTypeCode"
+                                , split[0], split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getGender() != null) {
+                        String gender = item.getGender();
+                        String[] split = gender.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(22L, "246", "性别", "gender", split[0],
+                                split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getCertificatesNumber() != null) {
+                        AlertFormValue alertFormValue = new AlertFormValue(100L, "246", "证件号码", "certificatesNumber",
+                                item.getCertificatesNumber(), null, false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getTelephone() != null) {
+                        AlertFormValue alertFormValue = new AlertFormValue(24L, "246", "联系电话", "telephone",
+                                item.getTelephone(), null, false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getState() != null) {
+                        String state = item.getState();
+                        String[] split = state.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(25L, "246", "人员状态", "stateCode", split[0],
+                                split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getSafetyTraining() != null) {
+                        String safetyTraining = item.getSafetyTraining();
+                        String[] split = safetyTraining.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(29L, "246", "是否进行安全培训", "safetyTraining",
+                                split[0], split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getAdministrativePosition() != null) {
+                        String administrativePosition = item.getAdministrativePosition();
+                        String[] split = administrativePosition.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(28L, "246", "行政职务",
+                                "administrativePositionCode", split[0], split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getInternalPosition() != null) {
+                        String internalPosition = item.getInternalPosition();
+                        String[] split = internalPosition.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(26L, "246", "消防管理组织机构内部职务",
+                                "internalPositionCode", split[0], split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getFireManagementPost() != null) {
+                        String fireManagementPost = item.getFireManagementPost();
+                        String[] split = fireManagementPost.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(27L, "246", "消防管理岗位",
+                                "fireManagementPostCode", split[0], split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getPositionType() != null) {
+                        String positionType = item.getPositionType();
+                        String[] split = positionType.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(30L, "246", "岗位类型", "positionType",
+                                split[0], split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getCertificateType() != null) {
+                        String certificateType = item.getCertificateType();
+                        String[] split = certificateType.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(31L, "246", "持证类别", "certificateType",
+                                split[0], split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getHoldingTime() != null) {
+                        AlertFormValue alertFormValue = new AlertFormValue(32L, "246", "持证时间", "holdingTime",
+                                new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(item.getHoldingTime()), null, false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getAuditCycle() != null) {
+                        String auditCycle = item.getAuditCycle();
+                        String[] split = auditCycle.split("@");
+                        AlertFormValue alertFormValue = new AlertFormValue(33L, "246", "审核周期", "auditCycle",
+                                split[0], split[1], false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getPersonImg() != null) {
+                        AlertFormValue alertFormValue = new AlertFormValue(34L, "246", "人员照片", "personImg",
+                                item.getPersonImg(), null, false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    if (item.getCertificateImg() != null) {
+                        AlertFormValue alertFormValue = new AlertFormValue(101L, "246", "重点工种资质证书", "certificateImg",
+                                item.getCertificateImg(), null, false);
+                        alertFormValueList.add(alertFormValue);
+                    }
+                    try {
+                        orgPersonDto.setAlertFormValue(alertFormValueList);
+                        this.saveOrgPerson(orgPersonDto);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+        );
+    }
+
+    public List<ExcelOrgPersonDto> queryOrgPersonDtoList(boolean isDelete) {
+
+        List<ExcelOrgPersonDto> excelOrgPersonDtoList = orgUsrMapper.queryOrgPersonDtoList(isDelete);
+
+        return excelOrgPersonDtoList;
+    }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
+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.ExcelUtil;
+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 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.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -26,18 +22,9 @@ 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.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.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.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -53,7 +40,8 @@ public class AircraftController extends BaseController {
 
     @Autowired
     private AircraftServiceImpl aircraftServiceImpl;
-    
+    @Autowired
+    DataSourcesImpl dataSourcesImpl;
 
     /**
      * 新增航空器信息
@@ -144,7 +132,7 @@ public class AircraftController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导入航空器")
     @PostMapping("/import_batch")
-    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
+    public void importByExcel(MultipartFile multipartFile) throws Exception {
         List<AircraftDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, AircraftDto.class,
                 1);
         List<Aircraft> excelEntityList = new ArrayList<>();
@@ -168,6 +156,31 @@ public class AircraftController extends BaseController {
         aircraftServiceImpl.saveBatch(excelEntityList);
     }
 
-   
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导出航空器")
+    @GetMapping("/export")
+    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
+        try {
+            List<AircraftDto> data = aircraftServiceImpl.queryAircraftDtoForList(false);
+            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
+                    AircraftDto.class, null, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("系统异常！");
+        }
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "下载航空器模板")
+    @GetMapping("/template")
+    public void template(HttpServletResponse response, ExcelDto excelDto) {
+        try {
+            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
+                    AircraftDto.class, dataSourcesImpl, true);
+        } 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/FireTeamController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-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;
-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.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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -29,13 +8,28 @@ 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.ExcelDto;
 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.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
-
 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.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 javax.servlet.http.HttpServletResponse;
+import java.util.*;
 
 /**
  * 消防队伍
@@ -189,4 +183,40 @@ public class FireTeamController extends BaseController {
         page = iFireTeamService.page(pageBean, fireTeamQueryWrapper);
         return page;
     }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导入消防队伍")
+    @PostMapping("/import_batch")
+    public void importByExcel(MultipartFile multipartFile, HttpServletResponse response) throws Exception {
+        List<FireTeamDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireTeamDto.class,
+                1);
+        List<FireTeam> excelEntityList = new ArrayList<>();
+        excelDtoList.forEach(
+                item -> {
+                    FireTeam fireTeam = new FireTeam();
+                    fireTeam = Bean.toPo(item, fireTeam);
+                    if (fireTeam.getType() != null) {
+                        String[] type = fireTeam.getType().split("@");
+                        fireTeam.setType(type[0]);
+                        fireTeam.setTypeCode(type[1]);
+                    }
+                    excelEntityList.add(fireTeam);
+                }
+        );
+        iFireTeamService.saveBatch(excelEntityList);
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "导出消防队伍")
+    @GetMapping("/export")
+    public void exportToExcel(HttpServletResponse response, ExcelDto excelDto) {
+        try {
+            List<FireTeamDto> data = iFireTeamService.queryFireTeamForList(false);
+            ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
+                    FireTeamDto.class, null, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("系统异常！");
+        }
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jcs.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;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 public class DataSourcesImpl implements DataSources {
 
-	@Resource
-	DataDictionaryMapper dataDictionaryMapper;
+    @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;
-	}
+    @Override
+    public String[] selectList(String type, String method) {
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", type);
+        if ("ZJLY".equals(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-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 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 com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
@@ -21,59 +11,73 @@ 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;
+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 javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
-* 消防队伍 服务实现类
-*
-* @author tb
-* @date 2021-06-07
-*/
+ * 消防队伍 服务实现类
+ *
+ * @author tb
+ * @date 2021-06-07
+ */
 @Service
-public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam,FireTeamMapper> implements IFireTeamService {
-    
-	@Autowired
-	FireTeamMapper fireTeamMapper;
+public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, FireTeamMapper> implements IFireTeamService {
+
+    @Resource
+    FireTeamMapper fireTeamMapper;
+
+    @Autowired
+    EquipFeignClient equipFeignClient;
 
-	@Autowired
-	EquipFeignClient equipFeignClient;
+    /**
+     * 获取监控大队列表
+     *
+     * @return
+     */
+    public List<FireBrigadeResourceDto> listMonitorFireBrigade() {
+        return fireTeamMapper.listMonitorFireBrigade();
+    }
 
-	/**
-	 * 获取监控大队列表
-	 *
-	 * @return
-	 */
-	public List<FireBrigadeResourceDto> listMonitorFireBrigade() {
-		return fireTeamMapper.listMonitorFireBrigade();
-	}
+    /**
+     * 消防队伍分页查询
+     *
+     * @param page 分页对象
+     * @param team 查询参数
+     * @return
+     */
+    public IPage<FireTeamCardDto> listFireTeamByPage(Page page, FireTeamListDto team) {
+        // 获取消防车辆列表
+        ResponseModel<Object> result = equipFeignClient.getFireCarListAll();
+        Map<Object, Long> teamCarCountMap = Maps.newConcurrentMap();
+        if (!ValidationUtil.isEmpty(result)) {
+            List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
+            if (!ValidationUtil.isEmpty(fireCarListMapList)) {
+                teamCarCountMap =
+                        fireCarListMapList.stream().filter(car -> !ValidationUtil.isEmpty(car.get("teamId"))).collect(Collectors.groupingBy(car -> car.get(
+                                "teamId"), Collectors.counting()));
+            }
+        }
+        IPage<FireTeamCardDto> fireTeamListPage = this.baseMapper.getFireTeamForPage(page, team);
+        List<FireTeamCardDto> fireTeamList = fireTeamListPage.getRecords();
+        Map<Object, Long> finalTeamCarCountMap = teamCarCountMap;
+        fireTeamList.forEach(t -> {
+            if (!ValidationUtil.isEmpty(finalTeamCarCountMap.get(t.getSequenceNbr().toString()))) {
+                t.setCarNum(finalTeamCarCountMap.get(t.getSequenceNbr().toString()).intValue());
+            }
+        });
+        fireTeamListPage.setRecords(fireTeamList);
+        return fireTeamListPage;
+    }
 
-	/**
-	 * 消防队伍分页查询
-	 *
-	 * @param page 分页对象
-	 * @param team 查询参数
-	 * @return
-	 */
-	public IPage<FireTeamCardDto> listFireTeamByPage(Page page, FireTeamListDto team) {
-		// 获取消防车辆列表
-		ResponseModel<Object> result = equipFeignClient.getFireCarListAll();
-		Map<Object, Long> teamCarCountMap = Maps.newConcurrentMap();
-		if (!ValidationUtil.isEmpty(result)) {
-			List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
-			if (!ValidationUtil.isEmpty(fireCarListMapList)) {
-				teamCarCountMap =
-						fireCarListMapList.stream().filter(car -> !ValidationUtil.isEmpty(car.get("teamId"))).collect(Collectors.groupingBy(car -> car.get(
-								"teamId"), Collectors.counting()));
-			}
-		}
-		IPage<FireTeamCardDto> fireTeamListPage = this.baseMapper.getFireTeamForPage(page, team);
-		List<FireTeamCardDto> fireTeamList = fireTeamListPage.getRecords();
-		Map<Object, Long> finalTeamCarCountMap = teamCarCountMap;
-		fireTeamList.forEach(t -> {
-			if (!ValidationUtil.isEmpty(finalTeamCarCountMap.get(t.getSequenceNbr().toString()))) {
-				t.setCarNum(finalTeamCarCountMap.get(t.getSequenceNbr().toString()).intValue());
-			}
-		});
-		fireTeamListPage.setRecords(fireTeamList);
-		return fireTeamListPage;
-	}
+    public List<FireTeamDto> queryFireTeamForList(Boolean isDelete) {
+        return fireTeamMapper.listFireTeamDto(isDelete);
+    }
 }