Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java

@@ -23,7 +23,7 @@ public class BaseDto implements Serializable{
 
 	@ExcelIgnore
 	@ApiModelProperty(value = "主键ID")
-    protected Long sequenceNbr;
+	protected Long sequenceNbr;
 
 	@ExcelIgnore
 	@ApiModelProperty(value = "更新时间")

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/Swagger2Config.java

 package com.yeejoin.amos.boot.biz.config;
 
-import io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.RestController;
+
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+
+import io.swagger.annotations.ApiOperation;
 import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
@@ -52,10 +61,10 @@ public class Swagger2Config {
                 .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
                 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                 .paths(PathSelectors.any())
-                .build();
+                .build()
 //                .securitySchemes(Collections.singletonList(securityScheme()))
 //                .securityContexts(securityContexts());
-                //.globalOperationParameters(setHeaderToken());
+                .globalOperationParameters(setHeaderToken());
     }
 
     /***
@@ -72,13 +81,19 @@ public class Swagger2Config {
      * JWT token
      * @return
      */
-//    private List<Parameter> setHeaderToken() {
-//        ParameterBuilder tokenPar = new ParameterBuilder();
-//        List<Parameter> pars = new ArrayList<>();
-//        tokenPar.name(CommonConstant.X_ACCESS_TOKEN).description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
-//        pars.add(tokenPar.build());
-//        return pars;
-//    }
+    private List<Parameter> setHeaderToken() {
+    	 List<Parameter> pars = new ArrayList<>();
+        ParameterBuilder tokenPar = new ParameterBuilder();      
+        tokenPar.name(CommonConstant.X_ACCESS_TOKEN).description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+        ParameterBuilder appKey = new ParameterBuilder();      
+        appKey.name("appKey").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+        ParameterBuilder product = new ParameterBuilder();      
+        product.name("product").modelRef(new ModelRef("string")).parameterType("header").required(false).build();       
+        pars.add(tokenPar.build());
+        pars.add(appKey.build());
+        pars.add(product.build());
+        return pars;
+    }
 
     /**
      * api文档的详细信息函数,注意这里的注解引用的是哪个

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/AlertSummaryDto.java

+package com.yeejoin.amos.boot.module.command.api.dto;
+
+
+import com.yeejoin.amos.boot.module.command.api.entity.BasEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AlertSummaryDto", description="")
+public class AlertSummaryDto  extends BasEntity {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "警情id")
+    private Long alertCalledId;
+
+    @ApiModelProperty(value = "文件名称")
+    private String name;
+
+    @ApiModelProperty(value = "文件地址")
+    private String url;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/FrontlineLiaisonDto.java

+package com.yeejoin.amos.boot.module.command.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+import com.yeejoin.amos.boot.module.command.api.entity.BasEntity;
+
+/**
+ * 前线联络员
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+@Data
+@ApiModel(value="FrontlineLiaisonDto", description="前线联络员")
+public class FrontlineLiaisonDto  extends BasEntity {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+    @ApiModelProperty(value = "岗位数据字典code")
+    private String jobTitleCode;
+
+    @ApiModelProperty(value = "灾情信息id")
+    private Long alertCalledId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/SeismometeorologyDto.java

@@ -27,7 +27,7 @@ public class SeismometeorologyDto {
     @ApiModelProperty(value = "主键ID")
     protected Long sequenceNbr;
 
-    @ApiModelProperty(value = "预警类型")
+    @ApiModelProperty(value = "预警类型 1：警情通知 0：气象通知")
     @Field("type")
     private String type;
 
@@ -61,4 +61,7 @@ public class SeismometeorologyDto {
         this.releaseCompany = releaseCompany;
         this.content = content;
     }
+
+    public SeismometeorologyDto() {
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/entity/AlertSummary.java

+package com.yeejoin.amos.boot.module.command.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_alert_summary")
+public class AlertSummary extends BasEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 警情id
+     */
+	@TableField("alert_called_id")
+    private Long alertCalledId;
+
+    /**
+     * 文件名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 文件地址
+     */
+	@TableField("url")
+    private String url;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/entity/BasEntity.java

+package com.yeejoin.amos.boot.module.command.api.entity;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/7/22
+ */
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 公共实体类
+ *
+ * @author DELL
+ */
+@Data
+public class BasEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    protected Long sequenceNbr;
+
+    @TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
+    protected Date recDate;
+
+    @TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
+    protected String recUserId;
+
+    @TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
+    protected String recUserName;
+
+    /**
+     * 是否删除
+     */
+    @TableField(value = "is_delete")
+    private Boolean isDelete;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/entity/FrontlineLiaison.java

+package com.yeejoin.amos.boot.module.command.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 前线联络员
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_frontline_liaison")
+public class FrontlineLiaison extends BasEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 联系电话
+     */
+	@TableField("phone")
+    private String phone;
+
+    /**
+     * 岗位名称
+     */
+	@TableField("job_title")
+    private String jobTitle;
+
+    /**
+     * 岗位数据字典code
+     */
+	@TableField("job_title_code")
+    private String jobTitleCode;
+
+    /**
+     * 灾情信息id
+     */
+	@TableField("alert_called_id")
+    private Long alertCalledId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/mapper/AlertSummaryMapper.java

+package com.yeejoin.amos.boot.module.command.api.mapper;
+
+import com.yeejoin.amos.boot.module.command.api.entity.AlertSummary;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+public interface AlertSummaryMapper extends BaseMapper<AlertSummary> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/mapper/FrontlineLiaisonMapper.java

+package com.yeejoin.amos.boot.module.command.api.mapper;
+
+import com.yeejoin.amos.boot.module.command.api.entity.FrontlineLiaison;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 前线联络员 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+public interface FrontlineLiaisonMapper extends BaseMapper<FrontlineLiaison> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/service/IAlertSummaryService.java

+package com.yeejoin.amos.boot.module.command.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+public interface IAlertSummaryService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/service/IFrontlineLiaisonService.java

+package com.yeejoin.amos.boot.module.command.api.service;
+
+
+/**
+ * 前线联络员接口类
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+public interface IFrontlineLiaisonService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/resources/mapper/AlertSummaryMapper.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.command.api.mapper.AlertSummaryMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/resources/mapper/FrontlineLiaisonMapper.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.command.api.mapper.FrontlineLiaisonMapper">
+
+</mapper>

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 公共附件
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AttachmentDto", description="附件dto")
+public class AttachmentDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "文件地址")
+    private String url;
+
+    @ApiModelProperty(value = "文件名称")
+    private String name;
+
+    @ApiModelProperty(value = "文件类型")
+    private String type;
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/7/20
+ */
+@Data
+@ApiModel(value="CompanyDto", description="重点单位资源")
+public class CompanyDto {
+    @ApiModelProperty(value = "主键ID")
+    protected Long id;
+
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
+
+    @ApiModelProperty(value = "距离")
+    private Double distance;
+
+
+    @ApiModelProperty(value = "男员工人数")
+    private Integer companyMaleEmployees;
+
+    @ApiModelProperty(value = "女员工人数")
+    private Integer companyFemaleEmployees;
+
+
+    @ApiModelProperty(value = "单位类型")
+    private String managementType;
+
+    @ApiModelProperty(value = "单位名称")
+    private String name;
+}

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 维保合同
@@ -15,10 +18,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="ContractDto", description="维保合同")
-public class ContractDto  extends BaseDto {
+@ApiModel(value = "ContractDto", description = "维保合同")
+public class ContractDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "合同名称")
@@ -66,4 +69,12 @@ public class ContractDto  extends BaseDto {
     @ApiModelProperty(value = "服务内容")
     private String serviceContent;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "合同附件")
+    private String contractAttachment;
+
+    @ApiModelProperty(value = "附件")
+    private List<SourceFile> attachment;
 }

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

@@ -115,5 +115,6 @@ public class FirefightersDto extends BaseDto {
     
     @ApiModelProperty(value = "专家领域")
     private String areasExpertise;
-
+    @ApiModelProperty(value = "消防专家领域字典code")
+    private String areasExpertiseCode;
 }

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+/**
+* 消防队员
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FirefightersZhDto", description="消防队员")
+public class FirefightersZhDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "系统账号")
+    private String systemAccount;
+
+    @ApiModelProperty(value = "员工编码")
+    private String employeeNumber;
+
+    @ApiModelProperty(value = "所属机构")
+    private String company;
+
+    @ApiModelProperty(value = "机构code")
+    private String companyCode;
+
+    @ApiModelProperty(value = "队伍id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "常用证件类型代码")
+    private String certificatesType;
+
+    @ApiModelProperty(value = "常用证件类型代码code")
+    private String certificatesTypeCode;
+
+
+    @ApiModelProperty(value = "证件号码")
+    private String certificateNumber;
+
+    @ApiModelProperty(value = "出生日期")
+    private Date birthdayTime;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "籍贯/户口所在地")
+    private String nativePlace;
+
+    @ApiModelProperty(value = "现居住地")
+    private String residence;
+
+    @ApiModelProperty(value = "现居住地详情")
+    private String residenceDetails;
+
+    @ApiModelProperty(value = "机场住宿情况")
+    private String airportAccommodation;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+    
+    @ApiModelProperty(value = "岗位名称数据字典code")
+    private String jobTitleCode;
+    
+    @ApiModelProperty(value = "人员状态，在职/离职")
+    private String state;
+    @ApiModelProperty(value = "人员状态，在职/离职字典code")
+    private String stateCode;
+
+    @ApiModelProperty(value = "婚姻状况")
+    private String maritalStatus;
+
+    @ApiModelProperty(value = "办公电话")
+    private String officeTelephone;
+
+    @ApiModelProperty(value = "手机")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "互联网_电子信箱")
+    private String email;
+
+    @ApiModelProperty(value = "政治面貌代码")
+    private String politicalOutlook;
+
+    @ApiModelProperty(value = "人员照片")
+    private String personnelPhotos;
+
+    @ApiModelProperty(value = "身份证正面")
+    private String idPositive;
+
+    @ApiModelProperty(value = "身份证反面")
+    private String idReverse;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "机构名称")
+    private String companyName;
+    
+    @ApiModelProperty(value = "专家领域")
+    private String areasExpertise;
+    
+    @ApiModelProperty(value = "消防专家领域字典code")
+    private String areasExpertiseCode;
+}

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -7,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 联动单位
@@ -25,8 +27,8 @@ public class LinkageUnitDto extends BaseDto {
     @ApiModelProperty(value = "单位名称")
     private String unitName;
 
-    @ApiModelProperty(value = "单位id")
-    private String unitId;
+    @ApiModelProperty(value = "单位code")
+    private String unitCode;
 
     @ApiModelProperty(value = "父级单位id")
     private String parentId;
@@ -94,4 +96,7 @@ public class LinkageUnitDto extends BaseDto {
     @ApiModelProperty(value = "单位_简要情况")
     private String unitSituation;
 
+    @ApiModelProperty(value = "联动单位图片")
+    private List<SourceFile> image;
+
 }

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 联动单位
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Data
+@ApiModel(value = "LinkageUnitZhDto", description = "指挥联动单位")
+public class LinkageUnitZhDto {
+
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
+
+    @ApiModelProperty(value = "战备人数量")
+    private int userNum;
+
+    @ApiModelProperty(value = "战备车辆数量")
+    private int carNum;
+
+    @ApiModelProperty(value = "距离灾情点距离 单位 米")
+    private Double distance;
+
+
+}

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import java.util.List;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.util.Date;
 
 /**
  * 维保单位
@@ -14,41 +15,105 @@ import java.util.Date;
  * @date 2021-07-16
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="MaintenanceCompanyDto", description="维保单位")
-public class MaintenanceCompanyDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "企业名称")
-    private String name;
-
-    @ApiModelProperty(value = "单位编码")
-    private String code;
-
-    @ApiModelProperty(value = "类型（COMPANY单位，PERSON人员）")
-    private String type;
+@ApiModel(value = "MaintenanceCompanyDto", description = "维保单位")
+public class MaintenanceCompanyDto extends BaseDto{
 
-    @ApiModelProperty(value = "上级单位")
-    private Long parentId;
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "照片地址")
+	private List<String> photoAddress;
+	
+	
+	@ApiModelProperty(value = "上级单位Id")
+	 private Long parentId;
+	
+	@ApiModelProperty(value = "instanceId")
+	private Long instanceId;
+	
+	@ApiModelProperty(value = "生产企业名称")
+	private String name;
+	
+	@ApiModelProperty(value = "企业曾用名")
+	private String formerName;
+	
+	@ApiModelProperty(value = "法人代表")
+	private String legalPerson;
+	
+	@ApiModelProperty(value = "注册资本")
+	private String registeredCapital;
+	
+	
+	@ApiModelProperty(value = "销售电话")
+	private String salesTel;
+	
+	@ApiModelProperty(value = "服务电话")
+	private String serviceTel;
+	
+	@ApiModelProperty(value = "企业性质")
+	private String nature; 
+	
+	
+	@ApiModelProperty(value = "国别")
+	private String nation;
+	
+	
+	@ApiModelProperty(value = "所在省份")
+	private String province;
+	
+	
+	@ApiModelProperty(value = "主要产品类型")
+	private String mainProductType;
+	
+	
+	@ApiModelProperty(value = "固定资产总值")
+	private String totalFixedAssets;
+	
+	
+	@ApiModelProperty(value = "拟制技术标准")
+	private String draftingTechStandards;
+	
+	@ApiModelProperty(value = "总人数")
+	private String totalStaff;
+	
+	
+	@ApiModelProperty(value = "技术人员数量")
+	private String technicianNumber;
+	
+	@ApiModelProperty(value = "生产企业类型")
+	private String enterpriseType;
+	
+	@ApiModelProperty(value = "资质")
+	private String  qualification;
+	
+	@ApiModelProperty(value = "历史沿革")
+	private String history;
+	
+	@ApiModelProperty(value = "主要检测设备")
+	private String mainTestEquipment;
+	
 
-    @ApiModelProperty(value = "业务编码")
-    private String bizCode;
+	@ApiModelProperty(value = "重大研制记录")
+	private String majorDevelopRecord;
+	
+	
+	@ApiModelProperty(value = "地址")
+	private String address;
 
-    @ApiModelProperty(value = "组织机构代码用于权限过滤")
-    private String orgCode;
+	@ApiModelProperty(value = "类型（COMPANY单位，PERSON人员，DEPARTMENT部门）")
+	private String type;
 
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
+	@ApiModelProperty(value = "纬度")
+	private String latitude;
 
-    @ApiModelProperty(value = "经度")
-    private String longitude;
+	@ApiModelProperty(value = "经度")
+	private String longitude;
 
-    @ApiModelProperty(value = "动态表单实例id")
-    private Long instanceId;
+	@ApiModelProperty(value = "标注/标绘坐标数组")
+	private String coordinate;
 
-    @ApiModelProperty(value = "更新人")
-    private String recUserName;
+	
+	@ApiModelProperty(value = "备注")
+	private String remark;
+	
 
 }

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 维保单位
+ *
+ * @author chenhao
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MaintenanceDepartmentDto", description = "维保单位部门")
+public class MaintenanceDepartmentDto extends BaseDto {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "部门名称")
+	private String name;
+	@ApiModelProperty(value = "所在建筑")
+	private String projectCode;
+	@ApiModelProperty(value = "所属单位/部门")
+	private Long parentId;
+	@ApiModelProperty(value = "部门地址")
+	private String adrerss;
+	@ApiModelProperty(value = "部门男员工人数")
+	private String maleStaffNumber;
+	@ApiModelProperty(value = "部门女员工人数")
+	private String femaleStaffNumber;
+	@ApiModelProperty(value = "下属部门电话")
+	private String tel;
+	@ApiModelProperty(value = "类型（COMPANY单位，PERSON人员，DEPARTMENT部门）")
+	private String type;
+	
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+
+import java.util.List;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 维保单位
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value = "MaintenancePersonDto", description = "维保单位人员")
+public class MaintenancePersonDto extends BaseDto {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "员工姓名")	
+    private String name;
+	
+	@ApiModelProperty(value = "注册号")
+	private String amosAccount;
+	
+	@ApiModelProperty(value = "类型（COMPANY单位，PERSON人员，DEPARTMENT部门）")
+	private String type;
+	@ApiModelProperty(value = "类别")	
+	private String category;
+	@ApiModelProperty(value = "证书编号")
+	private String certificateNo;
+	@ApiModelProperty(value = "性别")	
+	private String gender;
+	@ApiModelProperty(value = "身份证号码")
+	private String	idNumber;
+	@ApiModelProperty(value = "民族")	
+	private String nation;
+	//消防重点工种资格证书
+	@ApiModelProperty(value = "职业资格证书")	
+	private String professionalCertificate;
+	//人员资质
+	@ApiModelProperty(value = "职业资格")	
+	private String qualification;
+	@ApiModelProperty(value = "注册号")	
+	private String registerId;
+	@ApiModelProperty(value = "状态")	
+	private String status;
+	@ApiModelProperty(value = "手机号码")	
+	private String tel;
+	@ApiModelProperty(value = "部门编号")	
+	private String departmentNumber;
+	
+	@ApiModelProperty(value = "系统账户")	
+	private String systemAccount;
+	
+	@ApiModelProperty(value = "注册有效期开始时间")	
+	private String registrationStartTime;
+	
+	@ApiModelProperty(value = "注册有效期结束时间")	
+	private String registrationEndTime;
+	
+	@ApiModelProperty(value = "员工编号")	
+	private String code;
+	
+	
+	@ApiModelProperty(value = "员工所在单位单位id")	
+    private Long parentId;
+	@ApiModelProperty(value = "上传资源的地址集合")	
+	private List<String> resourcesAdress;
+	
+	
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+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;
+
+@Data
+@ApiModel(value = "MaintenancePersonDto", description = "维保单位人员")
+public class MaintenancePersonExcleDto implements Serializable {
+	/**
+	* 
+	*/
+	@ExcelIgnore
+	private static final long serialVersionUID = 1L;
+
+	//@ExcelProperty(value = "序号", index = 0)
+	@ApiModelProperty(value = "序号")
+	@ExcelIgnore
+	private Integer number;
+
+	@ExcelProperty(value = "姓名", index = 0)
+	@ApiModelProperty(value = "姓名")
+	private String name;
+
+	@ExcelProperty(value = "员工编号", index =1)
+	@ApiModelProperty(value = "员工编号")
+	protected String  code;
+	
+	@ExplicitConstraint(indexNum = 2,  sourceClass = RoleNameExplicitConstraint.class, method = "getCompanyAndDeparementTree") //固定下拉内容
+	@ExcelProperty(value = "所属单位及部门", index =2)
+	@ApiModelProperty(value = "所属单位及部门")	
+	private String parentName;
+	
+	@ExcelIgnore
+	private Long parentId;
+	
+	@ExplicitConstraint(type = "XB", indexNum = 3, sourceClass = RoleNameExplicitConstraint.class)
+	@ExcelProperty(value = "性别", index =3)
+	@ApiModelProperty(value = "性别")	
+	private String gender;
+	
+	@ExcelProperty(value = "身份证号码", index =4)	
+	@ApiModelProperty(value = "身份证号码")
+	private String	idNumber;
+	
+	@ExcelProperty(value = "手机号码", index =5)	
+	@ApiModelProperty(value = "手机号码")	
+	private String tel;
+	
+	@ExcelProperty(value = "民族", index =6)	
+	@ApiModelProperty(value = "民族")	
+	private String nation;
+	
+	//项目负责人、消防设施操作员
+	@ExcelProperty(value = "类别", index =7)	
+	@ApiModelProperty(value = "类别")	
+	private String category;
+	
+	@ExcelProperty(value = "统账号", index = 8)
+	@ApiModelProperty(value = "系统账户")	
+	private String systemAccount;
+	
+	@ExplicitConstraint(type = "WBRYZT", indexNum =9, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "人员状态", index =9)
+	@ApiModelProperty(value = "人员状态")	
+	private String status;
+	
+	@ExplicitConstraint(type = "WBZYZS", indexNum = 10, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "职业资格证书", index =10)
+	@ApiModelProperty(value = "职业资格证书")	
+	private String professionalCertificate;
+
+	@ExplicitConstraint(type = "WBZYZG", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "职业资格", index =11)
+	@ApiModelProperty(value = "职业资格")	
+	private String qualification;
+	
+	@ExcelProperty(value = "证书编号", index =12)
+	@ApiModelProperty(value = "证书编号")
+	private String certificateNo;
+	
+	@ExcelProperty(value = "注册有效期开始时间", index = 13)
+	@ApiModelProperty(value = "注册有效期开始时间")	
+	private Date registrationStartTime;
+	
+	@ExcelProperty(value = "注册有效期结束时间", index = 14)
+	@ApiModelProperty(value = "注册有效期结束时间")	
+	private Date registrationEndTime;
+	
+	@ExcelProperty(value = "注册号", index = 15)
+	@ApiModelProperty(value = "注册号")
+	private String amosAccount;
+	
+	
+}

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

@@ -27,4 +27,10 @@ public class RequestData {
 
     @ApiModelProperty(value = "队伍类型code")
     private String typeCode;
+
+    @ApiModelProperty(value = "是否只显示24小时内警情")
+    private  Boolean whether24=false;
+
+    @ApiModelProperty(value = "灾情地址模糊匹配")
+    private String address;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceTypeDto.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;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author system_generator
+ * @date 2021-06-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WaterResourceTypeDto", description = "水资源")
+public class WaterResourceTypeDto extends BaseDto {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）")
+    private String resourceType;
+
+    @ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
+    private String resourceTypeName;
+
+    @ApiModelProperty(value = "所属消防系统id")
+    private Long belongFightingSystemId;
+
+    @ApiModelProperty(value = "所属消防系统")
+    private String belongFightingSystem;
+}

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

@@ -92,4 +92,9 @@ public class Contract extends BaseEntity {
      */
 	@TableField("service_content")
     private String serviceContent;
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
 }

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

@@ -86,4 +86,5 @@ public class DynamicFormColumn extends BaseEntity {
      */
     @TableField("org_code")
     private String orgCode;
+    
 }

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

@@ -29,10 +29,10 @@ public class LinkageUnit extends BaseEntity {
     private String unitName;
 
     /**
-     * 单位id
+     * 单位code
      */
-	@TableField("unit_id")
-    private String unitId;
+	@TableField("unit_code")
+    private String unitCode;
 
     /**
      * 父级单位id

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

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModelProperty;
+
 
 /**
 * 维保单位
@@ -16,8 +21,7 @@ import lombok.experimental.Accessors;
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_maintenance_company")
+@TableName(value = "cb_maintenance_company")
 public class MaintenanceCompany extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -33,9 +37,9 @@ public class MaintenanceCompany extends BaseEntity {
      */
 	@TableField("code")
     private String code;
-
+    
     /**
-     * 类型（COMPANY单位，PERSON人员）
+     * 类型（COMPANY单位，PERSON人员,DEPARTMENT部门）
      */
 	@TableField("type")
     private String type;
@@ -75,4 +79,12 @@ public class MaintenanceCompany extends BaseEntity {
      */
 	@TableField("instance_id")
     private Long instanceId;
+	
+	@ApiModelProperty(value = "动态表单值")
+	@TableField(exist = false)
+	private List<DynamicFormInstance> dynamicFormValue;
+
+    @ApiModelProperty(value = "附件")
+    @TableField(exist = false)
+    private Map<String, List<AttachmentDto>> attachments;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/ExceptionEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+public enum ExceptionEnum {
+ 
+    PARAMETER_TYPE_ERROR   ("0001","传入參數异常");
+
+    private String eCode;
+
+    private String eMsg;
+
+    ExceptionEnum(String eCode, String eMsg) {
+        this.eCode = eCode;
+        this.eMsg = eMsg;
+    }
+
+    public String getEcode() {
+        return eCode;
+    }
+
+    public String getEmsg() {
+        return eMsg;
+    }
+
+    public static ExceptionEnum statOf(String eCode) {
+        for (ExceptionEnum state : values())
+            if (state.getEcode().equals(eCode))
+                return state;
+        return null;
+    }
+	
+	
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -21,7 +22,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
 
-    List<Firefighters> getFirefighters(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize,
+    List<FirefightersZhDto> getFirefighters(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize,
                                        @Param("par") FirefightersDto par);
 
     Map<String, Long> getFirefightersCount(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param(

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/LinkageUnitMapper.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.CompanyDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
+import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,4 +32,15 @@ public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
             @Param("groupCode") String groupCode,
             @Param("sequenceNbr") Long sequenceNbr
     );
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/20
+     * </PRE>
+     */
+    List<LinkageUnitZhDto> listLinkageUnitZhDto(@Param("pageNum")int pageNum, @Param("pageSize")int pageSize, @Param("par") RequestData par);
+
+    Integer listLinkageUnitZhDtoCount(@Param("par")RequestData par);
 }

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * 维保单位 Mapper 接口
@@ -10,5 +15,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @date 2021-07-16
 */
 public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany> {
+    /**
+     * 查询机场单位信息 (不带分页)
+     * @param seq
+     * @return
+     */
+    public List<OrgUsrDto> selectOrgUsrList (@Param("seq") Long seq);
 
+    /**
+     * 查询机场单位信息 (带分页)
+     * @param page
+     * @param seq
+     * @return
+     */
+    public Page<OrgUsrDto> selectOrgUsrPageList(Page page, @Param("seq") Long seq);
 }

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.OrgPersonExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 
 import org.apache.ibatis.annotations.Param;
@@ -38,4 +38,19 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
      * @return
      */
     List<OrgUsr> listOrgUserById(Long orgUserId);
+
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/20
+     * </PRE>
+     * 指挥重点单位资源
+     */
+    List<CompanyDto> listContractDto(@Param("pageNum")int pageNum, @Param("pageSize")int pageSize, @Param("par") RequestData par);
+
+    Integer listContractDtoCount(@Param("par")RequestData par);
+
+
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
 import org.apache.ibatis.annotations.Param;
@@ -35,5 +36,5 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
     Integer getWaterResourceListCount(@Param("par")RequestData par);
 
 
-    List<WaterResourceDto> getWaterResourceTypeList();
+    List<WaterResourceTypeDto> getWaterResourceTypeList(Boolean isDelete);
 }

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

@@ -7,5 +7,9 @@ package com.yeejoin.amos.boot.module.common.api.service;
 * @date 2021-06-07
 */
 public interface IDataDictionaryService {
-	
+
+
+    Object getFireChemical(String type) throws Exception;
+
+    Object  gwmcDataDictionary(String type)throws Exception;
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
 
+import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 /**
 * 危化品接口类
 *
@@ -8,5 +12,7 @@ package com.yeejoin.amos.boot.module.common.api.service;
 * @date 2021-06-29
 */
 public interface IFireChemicalService {
+    public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page, @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode, boolean isDelete) ;
+
 
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
 
+import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 /**
 * 接口类
 *消防专家
@@ -9,4 +14,9 @@ package com.yeejoin.amos.boot.module.common.api.service;
 */
 public interface IFireExpertsService {
 
+
+    public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
+                                                        @Condition(Operator.eq) Boolean isDelete,
+                                                        @Condition(Operator.like) String name,
+                                                        @Condition(Operator.eq) String expertCode);
 }

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

@@ -6,7 +6,7 @@ import java.util.Map;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
-import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 
 
 /**
@@ -18,7 +18,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 public interface IFirefightersService {
 
 
-    List<Firefighters> getFirefighters(int pageNum, int pageSize, FirefightersDto par);
+    List<FirefightersZhDto> getFirefighters(int pageNum, int pageSize, FirefightersDto par);
 
     Map<String, Long> getFirefightersCount(int pageNum, int pageSize, FirefightersDto par);
 
@@ -27,5 +27,11 @@ public interface IFirefightersService {
     List<Menu> getFirefightersJobTitleCount() throws Exception;
 
     void saveFirefighters(FirefightersInfoDto firefighters);
+    
+    
+    
+    
+    
+    
 
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
+import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+
+import java.util.List;
 
 /**
 * 联动单位接口类
@@ -9,4 +17,16 @@ package com.yeejoin.amos.boot.module.common.api.service;
 */
 public interface ILinkageUnitService {
 
+
+    List<LinkageUnitZhDto> listLinkageUnitZhDto(Integer pageNum, Integer pageSize, RequestData par);
+
+    Integer listLinkageUnitZhDtoCount(RequestData par);
+
+    LinkageUnitDto queryOne(Long sequenceNbr);
+
+    public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
+                                                        @Condition(Operator.eq) Boolean isDelete,
+                                                        @Condition(Operator.like) String unitName,
+                                                        @Condition(Operator.eq) String linkageUnitType);
+
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 
 /**
-* 维保单位接口类
-*
-* @author system_generator
-* @date 2021-07-16
-*/
+ * 维保单位接口类
+ *
+ * @author chenhao
+ * @date 2021-07-16
+ */
 public interface IMaintenanceCompanyService {
+	/**
+	 * 添加保存维保公司基本信息
+	 * 
+	 * @param maintenanceCompany
+	 * @return
+	 */
+	public boolean saveCompanyDetail(MaintenanceCompany maintenanceCompany);
+
+	/**
+	 * 添加保存维保单位人员基本信息
+	 * 
+	 * @param maintenanceCompany
+	 * @return
+	 */
+	public boolean savePersonDetail(MaintenanceCompany maintenanceCompany);
+
+	/**
+	 * 自定义假删除
+	 * 
+	 * @param sequenceNbr
+	 * @return
+	 */
+	public boolean deleteById(Long sequenceNbr);
+
+	/**
+	 * 获取公司名称的下拉列表
+	 * 
+	 * @return
+	 */
+	List<Map<String, Object>> getMaintenanceCompanyDropDownList();
+
+	/**
+	 * 添加保存维保单位部门基本信息
+	 * 
+	 * @param maintenanceCompany
+	 * @return
+	 */
+	public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany);
+
+	/**
+	 * 检查当前的员工编号是否已经存在
+	 * 
+	 * @param code 员工编号
+	 * @return
+	 */
+	public boolean checkPersonCodeExists(String code);
+
+	/**
+	 * 查询所有的维保人员/单位/部门列表信息，无分页
+	 * 
+	 * @param maintenanceType 类型（COMPANY单位，PERSON人员，DEPARTMENT部门）
+	 * @return
+	 */
+	List<Map<String, Object>> getAllMaintenanceList(String maintenanceType);
+
+	/**
+	 * 查询分页展示的维保人员/单位/部门列表信息
+	 * 
+	 * @param Map<String,     Object>
+	 * @param current         页码起始值
+	 * @param size            行数
+	 * @param informationCard 是否显示维保单位人员信息卡数据项
+	 * @param dataItem        是否显示人员概要信息数据项
+	 * @param maintenanceType 类型（COMPANY单位，PERSON人员，DEPARTMENT部门）
+	 * @return
+	 */
+	IPage<Map<String, Object>> getPageMaintenanceList(Map<String, Object> paramsMap);
+
+	/**
+	 * 根据主键查询对应的信息
+	 * 
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+
+	Map<String, Object>	findBySequenceNbr(Long sequenceNbr);
+	
+	/**
+	 * 修改维保单位
+	 * 
+	 * @param model
+	 * @return
+	 */
+	boolean updateMaintenanceCompanyDetail(MaintenanceCompany model);
+
+	/**
+	 * 修改维保部门
+	 * 
+	 * @param model
+	 * @return
+	 */
+	public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model);
+
+	/**
+	 * 修改维保人员
+	 * 
+	 * @param model
+	 * @return
+	 */
+	public boolean updateMaintenancePersonDetail(MaintenanceCompany model);
+
+	/**
+	 * 查询所有的单位-部门树
+	 * 
+	 * @return
+	 */
+	public List<MaintenanceCompany> getCompanyAndDepartmentTree();
+
+	/**
+	 * 查询制定公司的部门-人树
+	 * 
+	 * @param sequenceNbr
+	 * @return
+	 */
+	public List<MaintenanceCompany> getDepartmentAndPersonTree(long sequenceNbr);
+
+	/**
+	 * 查询当前单位下所有的部门基本信息--下拉列表
+	 * 
+	 * @param sequenceNbr
+	 * @return
+	 */
+	public List<MaintenanceCompany> getDepartmentList(long sequenceNbr);
+
+	/**
+	 * 维保单位人员EXCLE导入时entity的转换方法
+	 * 
+	 * @param MaintenancePersonExcleDto
+	 * @param List<DynamicFormColumn>
+	 * @return MaintenanceCompany
+	 */
+	List<DynamicFormInstance> maintenancePersonExcleDtoToDynamicFormInstanceList(List<DynamicFormColumn> columns,
+			MaintenancePersonExcleDto maintenancePersonExcleDto, long instanceId, List<DynamicFormInstance> list);
+	/**
+	 * 维保单位人员EXCLE导入时分別往动态表单和维保单位主表中插入数据
+	 * @param companyList
+	 * @param list
+	 * @return
+	 */
+	public boolean saveMaintenanceCompanyBatch(List<MaintenanceCompany> companyList, List<DynamicFormInstance> list);
+	/**
+	 * 将所有的维保人员导入到excle中
+	 * @return
+	 */
+	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel(); 
 
 }

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

@@ -5,15 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
-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.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 
@@ -143,4 +135,28 @@ public interface IOrgUsrService {
 	OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
 
 	List<Map<String, Object>>  selectForShowByListId(List<Long> ids) throws Exception;
+
+
+	/**
+	 * * @param null
+	 * @return
+	 * <PRE>
+	 * author tw
+	 * date 2021/7/20
+	 * </PRE>
+	 * 列表
+	 */
+	List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
+	/**
+	 * * @param null
+	 * @return
+	 * <PRE>
+	 * author tw
+	 * date 2021/7/20
+	 * </PRE>
+	 * 统计
+	 */
+	Integer listContractDtoCount(RequestData par);
+
+
 }

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

@@ -35,6 +35,7 @@
         cb_dynamic_form_instance i
         where i.GROUP_CODE = #{groupCode}
         and i.APP_KEY = #{appKey}
+        and i.is_delete = 0
         GROUP by
         i.INSTANCE_ID)d
         <if test="params != null and  params.size() > 0">
@@ -68,18 +69,26 @@
         i.INSTANCE_ID instanceId,
         i.GROUP_CODE groupCode,
         <foreach collection="fieldCodes" item="value" index="key" separator=",">
-            MAX(CASE WHEN i.FIELD_CODE = #{key} THEN i.FIELD_VALUE END) as ${key}
+            MAX(CASE WHEN i.FIELD_CODE = #{key} THEN i.FIELD_VALUE END) as ${key},
+            IF(FIND_IN_SET(i.field_type,'radio,select,treeSelect'), MAX(CASE WHEN i.FIELD_CODE = #{key} THEN
+            i.FIELD_VALUE_LABEL END), null) as ${key}Label
         </foreach>
         from
         cb_dynamic_form_instance i
         where
         i.GROUP_CODE = #{groupCode}
+        and i.is_delete = 0
         <if test="appKey != null and appKey !=''">
             and i.APP_KEY = #{appKey}
         </if>
+        <foreach collection="params" index="key" item="value" separator="">
+            <if test="key != null and key = 'instanceIds' ">
+                and find_in_set(i.instance_id, #{value}) > 0
+            </if>
+        </foreach>
         GROUP by
         i.INSTANCE_ID) d
-        <if test="params != null and  params.size() > 0">
+        <if test="params != null and params.size() > 0">
             where
             1=1
             <foreach collection="params" index="key" item="value" separator="">

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

@@ -99,8 +99,8 @@
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null
-        <if test='par.typeCode!=null'>
-            and  a.type_code= #{par.typeCode}
+        <if test='par.typeCode!=null and par.typeCode!=""'>
+            and  a.type_code in (#{par.typeCode})
         </if>
         <if test='par.distance!=null'>
             and  Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;= #{par.distance}
@@ -113,8 +113,9 @@
         COUNT(a.sequence_nbr) num
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null
-        <if test='par.typeCode!=null'>
-            and  a.type_code= #{par.typeCode}
+
+        <if test='par.typeCode!=null and par.typeCode!=""'>
+            and  a.type_code in (#{par.typeCode})
         </if>
         <if test='par.distance!=null'>
             and  Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;= #{par.distance}

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

@@ -11,28 +11,34 @@
     </select>
 
     <select id="getFirefighters"
-            resultType="com.yeejoin.amos.boot.module.common.api.entity.Firefighters">
-        select a.* from cb_firefighters a LEFT JOIN cb_firefighters_post b on
-        a.sequence_nbr=b.firefighters_id where a.is_delete=0 ORDER BY a.rec_date 
+            resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto">
+        select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code areasExpertiseCode from cb_firefighters a LEFT JOIN cb_firefighters_post b on
+        a.sequence_nbr=b.firefighters_id where a.is_delete=0
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
         <if test='par.name!=null'>and a.name= #{par.name}</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
-        limit #{pageNum},#{pageSize}
+         <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
+         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
+        ORDER BY a.rec_date  limit #{pageNum},#{pageSize}
     </select>
 
     <select id="getFirefightersCount" resultType="Map">
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
-        a.is_delete=0 ORDER BY a.rec_date 
+        a.is_delete=0
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
         <if test='par.name!=null'>and a.name= #{par.name}</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
+        <if test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code =#{par.areasExpertiseCode}</if>
+        <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
+
+        ORDER BY a.rec_date
     </select>
 
 

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

@@ -25,4 +25,36 @@
         and lu.sequence_nbr = #{sequenceNbr}
         and is_delete = #{isDelete}
     </select>
+
+
+
+
+    <select id="listLinkageUnitZhDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto">
+
+        select
+        a.sequence_nbr sequenceNbr,
+        a.unit_name  unitName,
+        a.address,
+        a.latitude,
+        a.longitude,
+        Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
+        FROM cb_linkage_unit a
+        where  a.longitude is not null and a.latitude is not null
+        <if test='par.distance!=null'>
+            and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
+            #{par.distance}
+        </if>
+        ORDER BY distance limit #{pageNum},#{pageSize}
+    </select>
+
+    <select id="listLinkageUnitZhDtoCount" resultType="Integer">
+        select
+        COUNT(a.sequence_nbr) num
+        FROM cb_linkage_unit a
+        where  a.longitude is not null and a.latitude is not null
+        <if test='par.distance!=null'>
+            and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
+            #{par.distance}
+        </if>
+    </select>
 </mapper>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper">
-
+    <select id="selectOrgUsrList" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto">
+    SELECT DISTINCT
+	sequence_nbr,
+	biz_org_name,
+	biz_org_code,
+	amos_org_id,
+	amos_org_code,
+	biz_org_type,
+	build_name,
+	build_id,
+	parent_id
+FROM
+	cb_org_usr
+WHERE
+	sequence_nbr IN ( SELECT DISTINCT signed_company_id FROM cb_contract WHERE company_id = #{seq} )
+	AND biz_org_type = "COMPANY"
+	AND is_delete = 0
+    </select>
+    <select id="selectOrgUsrPageList" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto">
+    SELECT DISTINCT
+	sequence_nbr,
+	biz_org_name,
+	biz_org_code,
+	amos_org_id,
+	amos_org_code,
+	biz_org_type,
+	build_name,
+	build_id,
+	parent_id
+FROM
+	cb_org_usr
+WHERE
+	sequence_nbr IN ( SELECT DISTINCT signed_company_id FROM cb_contract WHERE company_id = #{seq} )
+	AND biz_org_type = "COMPANY"
+	AND is_delete = 0
+    </select>
 </mapper>

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

@@ -209,4 +209,38 @@
               AND biz_org_code LIKE CONCAT((SELECT biz_org_code FROM cb_org_usr WHERE sequence_nbr = #{orgUserId}),'%');
           </if>
     </select>
+
+    <select id="listContractDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.CompanyDto">
+
+        SELECT
+        a.id,
+        a.name,
+        a.longitude,
+        a.latitude,
+        a.companyMaleEmployees,
+        a.companyFemaleEmployees,
+        a.managementType,
+        Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
+        FROM important_companys a
+        where  a.longitude is not null and a.latitude is not null
+        <if test='par.distance!=null'>
+            and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
+            #{par.distance}
+        </if>
+        ORDER BY distance limit #{pageNum},#{pageSize}
+    </select>
+
+    <select id="listContractDtoCount" resultType="Integer">
+        SELECT
+        COUNT(a.id) num
+        FROM important_companys a
+        where a.longitude is not null and a.latitude is not null
+        <if test='par.distance!=null'>
+            and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
+            #{par.distance}
+        </if>
+    </select>
+
+
+
 </mapper>

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

@@ -78,7 +78,7 @@
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_water_resource a
         where a.is_delete=0 and a.longitude is not null and a.latitude is not null
-        <if test='par.resourceType!=null'>
+        <if test='par.resourceType!=null and par.resourceType!=""'>
             and a.resource_type= #{par.resourceType}
         </if>
         <if test='par.distance!=null'>
@@ -93,7 +93,7 @@
         COUNT(a.sequence_nbr) num
         FROM cb_water_resource a
         where a.is_delete=0 and a.longitude is not null and a.latitude is not null
-        <if test='par.resourceType!=null'>
+        <if test='par.resourceType!=null and par.resourceType!=""'>
             and a.resource_type= #{par.resourceType}
         </if>
         <if test='par.distance!=null'>
@@ -101,9 +101,19 @@
             #{par.distance}
         </if>
     </select>
-    <select id="getWaterResourceTypeList" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
-        select distinct belong_fighting_system_id, belong_fighting_system, resource_type, resource_type_name
+    <select id="getWaterResourceTypeList" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto">
+        select distinct (case
+                             when ISNULL(belong_fighting_system_id) = 0 and LENGTH(trim(belong_fighting_system_id)) > 0
+                                 then belong_fighting_system_id
+                             else 0 end)   belong_fighting_system_id,
+                        (case
+                             when ISNULL(belong_fighting_system) = 0 and LENGTH(trim(belong_fighting_system)) > 0
+                                 then belong_fighting_system
+                             else '其他' end) belong_fighting_system,
+                        resource_type,
+                        resource_type_name
         from cb_water_resource
+        where is_delete = #{isDelete}
     </select>
 
 

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

@@ -47,6 +47,8 @@ public class AlertCalledZhDto {
     @ApiModelProperty(value = "地址")
     private String address;
 
+    @ApiModelProperty(value = "救援方格")
+    private String rescueGrid;
 
     @ApiModelProperty(value = "经度")
     private String longitude;

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* 警情报送记录
+*
+* @author tb
+* @date 2021-06-17
+*/
+@Data
+@ApiModel(value="AlertSubmittedZHDto", description=" 指挥警情报送记录")
+public class AlertSubmittedZHDto  {
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "业务类型(警情续报、非警情确认、警情结案)")
+    private String businessType;
+
+    @ApiModelProperty(value = "报送时间")
+    private Date submissionTime;
+
+    @ApiModelProperty(value = "报送内容")
+    private String submissionContent;
+
+    @ApiModelProperty(value = " 单位名称")
+    private String companyName;
+
+
+    @ApiModelProperty(value = "人员名称")
+    private String userName;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* 警情报送记录
+*
+* @author tb
+* @date 2021-06-17
+*/
+@Data
+@ApiModel(value="InstructionsZHDto", description=" 指令报送记录")
+public class InstructionsZHDto {
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "业务类型")
+    private String type;
+
+    @ApiModelProperty(value = "报送时间")
+    private Date submissionTime;
+
+    @ApiModelProperty(value = "报送内容")
+    private String content;
+
+    @ApiModelProperty(value = "发送单位")
+    private String company="119值班中心";
+
+
+
+    public InstructionsZHDto(Long sequenceNbr, String type, Date submissionTime, String content) {
+        this.sequenceNbr = sequenceNbr;
+        this.type = type;
+        this.submissionTime = submissionTime;
+        this.content = content;
+    }
+
+    public InstructionsZHDto() {
+    }
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import lombok.Data;
+
+@Data
+public class KeyValueLabel {
+	private String key;
+	private String label;    
+	private Object value;
+	private String unit;
+	public KeyValueLabel( String label,String key, Object value) {
+		super();
+		this.label = label;
+		this.key = key;
+		this.value = value;
+	}
+
+	public KeyValueLabel(String label,String key, Object value, String unit) {
+		this.label = label;
+		this.key = key;
+		this.value = value;
+		this.unit = unit;
+	}
+
+	public KeyValueLabel() {
+		super();
+	}
+	
+	
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/7/23
+ */
+@Data
+@ApiModel(value = "PowerCarCountDto", description = "按车辆统计力量调派")
+public class PowerCarCountDto {
+
+    @ApiModelProperty(value = "车名称")
+    protected String carName;
+    @ApiModelProperty(value = "车数量")
+    protected int carNum;
+    @ApiModelProperty(value = "车牌号")
+    protected String plateNumber;
+}
+
+
+

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/7/23
+ */
+@Data
+@ApiModel(value = "PowerCompanyCountDto", description = "按单位统计力量调派")
+public class PowerCompanyCountDto {
+    @ApiModelProperty(value = "单位id")
+    protected Long companyId;
+    @ApiModelProperty(value = "单位名称")
+    protected String companyName;
+    @ApiModelProperty(value = "车数量")
+    protected int carNum;
+    @ApiModelProperty(value = "人数量")
+    protected int userNum;
+    @ApiModelProperty(value = " 车辆信息")
+    List<PowerCarCountDto>  PowerCarCountDto;
+}
+
+
+

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AircraftDto", description = "航空器信息")
+public class PowerData {
+
+	
+	    @ApiModelProperty(value = "所属单位")
+	    private String companyName;
+	    @ApiModelProperty(value = "车辆名称")
+	    private String carName;
+	    @ApiModelProperty(value = "车牌号")
+	    private String carNum;	    
+	    @ApiModelProperty(value = "随车人员")
+	    private String user;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* 调派单位
+*
+* @author tb
+* @date 2021-06-17
+*/
+@Data
+@ApiModel(value="PowerTransferCompanyZHDto", description=" 指挥调派单位")
+public class PowerTransferCompanyZHDto  {
+
+
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = " 单位名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "调派类型")
+    private String dispatchType;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "是否只派发机构")
+    private Boolean isDistributionAgencies;
+
+    @ApiModelProperty(value = "更新时间")
+    protected Date recDate;
+
+    @ApiModelProperty(value = "报送内容")
+    private String submissionContent;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import lombok.Data;
+
+@Data
+public class StateDot {
+	private String name;
+	private boolean flag=false;
+
+	public StateDot(String name, boolean flag) {
+		this.name = name;
+		this.flag = flag;
+	}
+
+	public StateDot() {
+		super();
+	}
+
+	public StateDot(String name) {
+		this.name = name;
+	}
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/AlertStageEnums.java

@@ -28,7 +28,20 @@ public  enum  AlertStageEnums {
 	RG("226",  "人工上报"),
 	DJ("228",  "对讲呼入"),
 	JK("388",  "监控中心报警"),
-	DH("389",  "电话报警");
+	DH("389",  "电话报警"),
+
+
+
+	JYZD("111", "消防救援总队"),
+	SZD("112", "省消防救援总队"),
+	XFZD("113", "消防救援支队"),
+	CSZD("114", "城市消防救援支队"),
+	DQZD("115", "地区消防救援支队"),
+	ZZZD("116", "企（事）业单位专职消防救援支队"),
+	YWDD("117", "企（事）业单位义务消防救援大队"),
+	YLJY("830", "企（事）业单位医疗救援队（站）"),
+	JKDD("118", "企（事）业单位监控大队");
+
 
 	
 	

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/ExcelEnums.java

@@ -13,4 +13,5 @@ public class ExcelEnums {
     public static final String XFRY = "XFRY";//("XFRY","消防人员")
     public static final String CLZQ = "CLZQ";//("CLZQ","车辆执勤")
     public static final String RYZB = "RYZB";//("RYZB","人员值班")
+    public static final String WBRY = "WBRY";//("WBRY",维保人员)
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import org.apache.ibatis.annotations.Param;
@@ -25,5 +26,5 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
      */
     Map<String, Integer> queryAlertStatusCount(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
 
-    List<AlertCalledZhDto> alertCalledListByAlertStatus(@Param("address") String address);
+    List<AlertCalledZhDto> alertCalledListByAlertStatus(@Param("par")RequestData par);
 }

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

@@ -2,12 +2,14 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedZHDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * 警情报送记录 Mapper 接口
@@ -40,4 +42,19 @@ public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> {
     AlertSubmittedSMSDto getSchedulingContent(@Param("id") Long id);
 
 
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/21
+     * </PRE>
+     * 报送记录
+     */
+
+    List<AlertSubmittedZHDto> listAlertSubmittedZHDto(@Param("id") Long id);
+
+
+    Map<String, Integer> getUseNum(@Param("id") Long id);
+
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedZHDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyZHDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * 调派单位 Mapper 接口
@@ -10,5 +15,15 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 * @date 2021-06-17
 */
 public interface PowerTransferCompanyMapper extends BaseMapper<PowerTransferCompany> {
+/**
+ * * @param null
+ * @return
+ * <PRE>
+ * author tw
+ * date 2021/7/21
+ * </PRE>
+ * 调派记录
+ */
+    List<PowerTransferCompanyZHDto> listPowerTransferCompanyZHDto(@Param("id") Long id);
 
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import org.apache.ibatis.annotations.Param;
 
@@ -59,4 +57,23 @@ public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
 
     Map<String, Object> getPowerTransferInfoCount(@Param("beginDate") String beginDate,
                                                         @Param("endDate") String endDate);
+
+
+    Map<String, Integer> getCarNum(@Param("id") Long id);
+    Map<String, Integer> getCompanyNum(@Param("id") Long id);
+
+    List<PowerData> getPowerDataList(@Param("id") Long id);
+
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/23
+     * </PRE>
+     * 力量调派按单位统计
+     */
+    List<PowerCompanyCountDto> getPowerCompanyCountDtocount(@Param("id") Long id);
+
+    List<PowerCarCountDto> getPowerCarCountDtocount(@Param("alertCalledId") Long alertCalledId,@Param("companyId") Long companyId);
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * 警情接警记录 服务类
@@ -25,7 +29,7 @@ public interface IAlertCalledService {
 	  *
 	  * **/
 
-     List<AlertCalledZhDto> alertCalledListByAlertStatus(String address);
+     List<AlertCalledZhDto> alertCalledListByAlertStatus(RequestData par);
 
      /**
 	  *
@@ -33,4 +37,15 @@ public interface IAlertCalledService {
 	  *
 	  * **/
 	   Object selectAlertCalledById( Long id);
+
+
+	   Map<String,Object>   selectAlertCalledKeyValueLabelById( Long id);
+	   
+	   List<KeyValueLabel>   selectAlertCalledcount( Long id);
+
+	   List<KeyValueLabel>   powercount( Long id);
+
+	   List<PowerData> getPowerDataList(Long id);
+	   AlertCalled getAlertCalledById(Long id);
+
 }

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

@@ -2,9 +2,14 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.InstructionsZHDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
 * 警情报送记录 服务类
@@ -40,4 +45,9 @@ public interface IAlertSubmittedService extends IService<AlertSubmitted> {
     Boolean save(AlertSubmittedDto alertSubmittedDto, String userName) throws Exception;
 
     AlertSubmittedSMSDto getSchedulingContent(Long id);
+
+
+
+    List<InstructionsZHDto> getInstructionsZHDtoList(Long id);
+
 }

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

@@ -2,12 +2,14 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 力量调派 服务类
@@ -27,4 +29,5 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
      * 获取力量调派资源树
      */
     List<FireBrigadeResourceDto> getPowerTree();
+    List<PowerCompanyCountDto> getPowerCompanyCountDtocount( Long id);
 }

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

@@ -24,6 +24,7 @@
         a.sequence_nbr sequenceNbr,
         a.alert_stage alertStage,
         a.call_time callTime,
+        a.rescue_grid rescueGrid,
         a.alert_type alertType,
         a.alarm_type_code alarmTypeCode,
         a.unit_involved unitInvolved,
@@ -42,12 +43,23 @@
         AND a.is_delete=0
         AND a.coordinate_x IS NOT NULL
         AND a.coordinate_y IS NOT NULL
-        <if test='address!=null'>
-            and  a.address  like CONCAT('%',#{address},'%')
+        <if test='par.address!=null'>
+            and  a.address  like CONCAT('%',#{par.address},'%')
+        </if>
+        <if test='par.whether24!=false'>
+            and  a.call_time &gt;= (NOW() - interval 24 hour)
         </if>
         ORDER BY
         a.call_time DESC
     </select>
 
 
+
+
+
+
+
+
+
+
 </mapper>

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

@@ -83,4 +83,56 @@
         WHERE
             o.sequence_nbr = ${id}
     </select>
+
+
+
+
+    <select id="listAlertSubmittedZHDto" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedZHDto">
+        SELECT
+        g.business_type businessType,
+        g.sequence_nbr sequenceNbr,
+        g.submission_time submissionTime,
+        g.submission_content submissionContent,
+        g.company_name companyName,
+        group_concat( DISTINCT g.user_name ) AS userName
+        FROM
+        (
+        SELECT
+        a.sequence_nbr,
+        a.business_type,
+        a.submission_time,
+        a.submission_content,
+        b.company_name,
+        b.user_name
+        FROM
+        jc_alert_submitted a
+        LEFT JOIN jc_alert_submitted_object b ON a.sequence_nbr = b.alert_submitted_id
+        WHERE
+        a.alert_called_id = ${id}
+        ) g
+        GROUP BY
+        g.business_type,
+        g.sequence_nbr,
+        g.submission_time,
+        g.submission_content,
+        g.company_name;
+    </select>
+
+
+
+    <select id="getUseNum" resultType="Map">
+       SELECT
+	COUNT( DISTINCT b.rec_user_id ) useNum
+    FROM
+	jc_alert_submitted a
+	LEFT JOIN jc_alert_submitted_object b ON a.sequence_nbr = b.alert_submitted_id
+	WHERE
+	a.alert_called_id =  ${id}
+    </select>
+
+
+
+
+
+
 </mapper>

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

@@ -2,4 +2,40 @@
 <!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.PowerTransferCompanyMapper">
 
+    <select id="listPowerTransferCompanyZHDto" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyZHDto">
+    SELECT
+	g.sequence_nbr sequenceNbr,
+	g.rec_date recDate,
+	g.dispatch_type dispatchType,
+	g.address,
+	g.is_distribution_agencies isDistributionAgencies,
+	g.company_name companyName,
+	group_concat( DISTINCT concat( g.resources_name, "(车牌:", g.resources_num, ")" ) ) AS submissionContent
+FROM
+	(
+	SELECT
+		a.sequence_nbr,
+		a.dispatch_type,
+		a.rec_date,
+		a.address,
+		b.company_name,
+		b.is_distribution_agencies,
+		c.resources_name,
+		c.resources_num
+	FROM
+		jc_power_transfer a
+		LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+		LEFT JOIN jc_power_transfer_company_resources c ON b.sequence_nbr = c.power_transfer_company_id
+	WHERE
+		a.alert_called_id = ${id}
+	) g
+GROUP BY
+	g.company_name,
+	g.rec_date,
+	g.dispatch_type,
+	g.address,
+	g.is_distribution_agencies,
+	g.sequence_nbr;
+    </select>
+
 </mapper>

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

@@ -44,7 +44,8 @@
     </select>
 
     <select id="getPowerTransferInfoCount" resultType="java.util.Map">
-        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count, 0
+        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count,
+        0
         no_return_car_count
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
@@ -107,4 +108,105 @@
         order by pt.rec_date asc
     </select>
 
+
+    <select id="getCarNum" resultType="Map">
+     SELECT
+	COUNT( DISTINCT b.company_id ) companyNum,
+	COUNT( DISTINCT c.resources_num ) carNum
+    FROM
+	jc_power_transfer a
+	LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+	LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+	a.alert_called_id = ${id}
+    </select>
+
+
+    <select id="getCompanyNum" resultType="Map">
+      select COUNT(*) companyNum from
+    (SELECT DISTINCT
+        b.company_id
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id  = ${id} UNION ALL
+    SELECT DISTINCT
+        b.company_id
+    FROM
+        jc_alert_submitted a
+        LEFT JOIN jc_alert_submitted_object b ON a.sequence_nbr = b.alert_submitted_id
+    WHERE
+        a.alert_called_id = ${id}) m
+        </select>
+
+        <select id="getPowerDataList" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerData">
+      SELECT DISTINCT
+        b.company_name companyName,
+        c.resources_name carName,
+        c.resources_num carNum
+
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id = ${id}
+    </select>
+
+
+
+
+
+
+
+    <select id="getPowerCompanyCountDtocount" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto">
+           SELECT
+        b.company_id companyId,
+        b.company_name companyName,
+        COUNT( c.resources_num ) carNum
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id = ${id}
+    GROUP BY
+        b.company_id,
+        b.company_name
+    </select>
+
+    <select id="getPowerCarCountDtocount" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto">
+         SELECT * from  (	  SELECT
+        COUNT( c.resources_num ) carNum,
+        c.resources_name carName,
+        GROUP_CONCAT( c.resources_num ) plateNumber
+    FROM
+        jc_power_transfer a
+        LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
+        LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
+    WHERE
+        a.alert_called_id = ${alertCalledId}
+        AND b.company_id = ${companyId}
+    GROUP BY
+        c.resources_name ) m where m.carNum>0
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/AlertSummaryController.java

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

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -7,27 +7,29 @@ import com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao;
 import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
-import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
-import com.yeejoin.amos.boot.module.common.api.service.IWaterResourceService;
+import com.yeejoin.amos.boot.module.common.api.service.*;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.InstructionsZHDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.StateDot;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
-import com.yeejoin.amos.component.rule.config.RuleConfig;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * *指挥资源Api
@@ -52,26 +54,83 @@ public class CommandController extends BaseController {
     IWaterResourceService iWaterResourceService;
     @Autowired
     SeismometeorologyDtoDao seismometeorologyDtoDao;
+    @Autowired
+    IOrgUsrService  iOrgUsrService;
+    @Autowired
+    ILinkageUnitService  iLinkageUnitService;
+    @Autowired
+    IAlertSubmittedService alertSubmittedService;
+    @Autowired
+    IDataDictionaryService  dataDictionaryService;
+    @Autowired
+    IFireChemicalService fireChemicalService;
+
+    @Autowired
+    IFireExpertsService fireExpertsService;
+    
+    @Autowired
+    IFirefightersService firefightersService;
+
 
+    @Autowired
+    IPowerTransferService powerTransferService;
     /**
      * 警情列表
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "JQ/list")
     @ApiOperation(httpMethod = "GET", value = "警情列表查询", notes = "警情列表查询")
-    public ResponseModel<Object> listPage(String address) {
-        List<AlertCalledZhDto> list= iAlertCalledService.alertCalledListByAlertStatus(address);
+    public ResponseModel<Object> listPage(RequestData par) {
+        List<AlertCalledZhDto> list= iAlertCalledService.alertCalledListByAlertStatus(par);
         return ResponseHelper.buildResponse(list);
     }
 
+
+    /**
+     * 保卫目标分页查询
+     *
+     * @return
+     */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "ZDDW/list")
+    @ApiOperation(httpMethod = "GET", value = "保卫目标列表分页查询", notes = "保卫目标列表分页查询")
+    public ResponseModel<IPage<CompanyDto>> listPageZDDW(Integer pageNum, Integer pageSize, RequestData par) {
+        Page<CompanyDto> pageBean = new Page<>(pageNum, pageSize);
+        List<CompanyDto>  list= iOrgUsrService.listContractDto(pageNum,pageSize,par);
+        Integer num=  iOrgUsrService.listContractDtoCount(par);
+        pageBean.setRecords(list);
+        pageBean.setTotal(num);
+        return ResponseHelper.buildResponse(pageBean);
+    }
+
+   /**
+    * * @param null
+    * @return
+    * <PRE>
+    * author tw
+    * date 2021/7/21
+    * </PRE>
+    * 保卫目标详情
+    */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "ZDDW/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "保卫目标详情", notes = "保卫目标详情")
+    public ResponseModel<OrgUsrFormDto> selectZDDWById(@PathVariable Long id) throws Exception {
+
+        return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(id));
+    }
+
+
+
+
     /**
      * 微型消防站列表分页查询
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "WX/list")
     @ApiOperation(httpMethod = "GET", value = "微型消防站列表分页查询", notes = "微型消防站列表分页查询")
     public ResponseModel<IPage<FireStationzhDto>> listPageWx(Integer pageNum, Integer pageSize, RequestData par) {
@@ -87,7 +146,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "SY500/list")
     @ApiOperation(httpMethod = "GET", value = "500水源列表分页查询", notes = "500水源列表分页查询")
     public ResponseModel<IPage<WaterResourceZhDto>> listPageSY500(Integer pageNum, Integer pageSize, RequestData par) {
@@ -109,7 +168,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "SY1000/list")
     @ApiOperation(httpMethod = "GET", value = "1000水源列表分页查询", notes = "1000水源列表分页查询")
     public ResponseModel<IPage<WaterResourceZhDto>> listPageSY1000(Integer pageNum, Integer pageSize, RequestData par) {
@@ -129,7 +188,7 @@ public class CommandController extends BaseController {
 //     *
 //     * @return
 //     */
-//    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+//    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
 //    @GetMapping(value = "SYTY/list")
 //    @ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
 //    public ResponseModel<IPage<WaterResourceZhDto>> listPageSYTY(Integer pageNum, Integer pageSize, RequestData par) {
@@ -147,10 +206,11 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "DW/list")
     @ApiOperation(httpMethod = "GET", value = "消防队伍列表分页查询", notes = "消防队伍列表分页查询")
     public ResponseModel<IPage<FireTeamZhDto>> listPage(Integer pageNum, Integer pageSize, RequestData par) {
+        par.setTypeCode(AlertStageEnums.YWDD.getCode());
         Page<FireTeamZhDto> pageBean = new Page<>(pageNum, pageSize);
         List<FireTeamZhDto>  list= iFireTeamService.getFireTeamList(pageNum,pageSize,par);
         Integer num=  iFireTeamService.getFireTeamListCount(par);
@@ -159,20 +219,71 @@ public class CommandController extends BaseController {
         return ResponseHelper.buildResponse(pageBean);
     }
 
+    /**
+     * 联动力量列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "linkageForce/list")
+    @ApiOperation(httpMethod = "GET", value = "联动力量列表分页查询", notes = "联动力量列表分页查询")
+    public ResponseModel<IPage<LinkageUnitZhDto>> linkageForcelistPage(Integer pageNum, Integer pageSize, RequestData par) {
+        Page<LinkageUnitZhDto> pageBean = new Page<>(pageNum, pageSize);
+        List<LinkageUnitZhDto>  list= iLinkageUnitService.listLinkageUnitZhDto(pageNum,pageSize,par);
+        Integer num=  iLinkageUnitService.listLinkageUnitZhDtoCount(par);
+        pageBean.setRecords(list);
+        pageBean.setTotal(num);
+        return ResponseHelper.buildResponse(pageBean);
+    }
 
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/21
+     * </PRE>
+     * 联动单位详情
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "linkageForce/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个联动单位", notes = "根据sequenceNbr查询单个联动单位")
+    public ResponseModel<LinkageUnitDto> selectlinkageForceOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(iLinkageUnitService.queryOne(sequenceNbr));
+    }
 
+
+    /**
+     * 消防队伍列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "ZQ/list")
+    @ApiOperation(httpMethod = "GET", value = "执勤实力列表分页查询", notes = "执勤实力列表分页查询")
+    public ResponseModel<IPage<FireTeamZhDto>> ZQlistPage(Integer pageNum, Integer pageSize, RequestData par) {
+        if(par.getTypeCode()==null){
+            par.setTypeCode( AlertStageEnums.ZZZD.getCode()+","+AlertStageEnums.YLJY.getCode());
+        }
+        Page<FireTeamZhDto> pageBean = new Page<>(pageNum, pageSize);
+        List<FireTeamZhDto>  list= iFireTeamService.getFireTeamList(pageNum,pageSize,par);
+        Integer num=  iFireTeamService.getFireTeamListCount(par);
+        pageBean.setRecords(list);
+        pageBean.setTotal(num);
+        return ResponseHelper.buildResponse(pageBean);
+    }
     /**
      *
      * 根据id查询警情详情
      *
      * **/
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "JQ/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据id查询灾情详情", notes = "根据id查询灾情详情")
     public ResponseModel<Object> selectById(@PathVariable Long id) {
 
-        return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledById(id));
+        return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledKeyValueLabelById(id));
 
     }
 
@@ -184,7 +295,7 @@ public class CommandController extends BaseController {
      * @param id 主键
      *
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "WX/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据id查询微型消防站", notes = "根据id查询微型消防站")
     public ResponseModel<FireStationDto> seleteOne(@PathVariable Long id) {
@@ -200,7 +311,7 @@ public class CommandController extends BaseController {
      * @param id 主键
      *
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "SY/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据id查询水源", notes = "根据id查询水源")
     public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long id) {
@@ -214,7 +325,7 @@ public class CommandController extends BaseController {
      * @param id
      * @return
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "DW/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询队伍信息", notes = "根据id查询队伍信息")
     public ResponseModel<FireTeam> selectById(HttpServletRequest request, @PathVariable Long id) {
@@ -228,12 +339,218 @@ public class CommandController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/seismometeorology", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "跑马灯", notes = "跑马灯")
-    public ResponseModel<Object> seismometeorology() {
-         
+    public ResponseModel<Object> seismometeorology()throws Exception {
+        RequestData requestData = new RequestData();
+        requestData.setWhether24(true);
+        List<AlertCalledZhDto> list= iAlertCalledService.alertCalledListByAlertStatus(requestData);
+        List<SeismometeorologyDto> li= seismometeorologyDtoDao.findCarStateByWatchSn();
+        //数据组装
+        for (AlertCalledZhDto alertCalledZhDto : list) {
+
+            StringBuffer st=new StringBuffer();
+
+            String time= DateUtil.formatDate(alertCalledZhDto.getCallTime(),"yyyy-MM-dd HH:mm:ss");
+
+            st.append("【").append(alertCalledZhDto.getAlertType()).append("】").append(" ").append(time).append(" ").append(alertCalledZhDto.getAddress());
 
-        return ResponseHelper.buildResponse(seismometeorologyDtoDao.findCarStateByWatchSn());
+            SeismometeorologyDto sto= new SeismometeorologyDto(alertCalledZhDto.getSequenceNbr(), "1", "警情通知", null,alertCalledZhDto.getCallTime().getTime(), null, st.toString()) ;
+            li.add(sto);
+            }
+       return ResponseHelper.buildResponse(li);
     }
+
+
+
+    /**
+     * 根据id指令
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "ZL/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据警情id查询指令信息", notes = "根据警情id查询指令信息")
+    public ResponseModel<List<InstructionsZHDto>> selectZL(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(alertSubmittedService.getInstructionsZHDtoList(id));
+    }
+
+
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询危险品字典", notes = "根据字典类型查询危险品字典")
+    public ResponseModel<Object> gwmcDataDictionaryFireChemical(@PathVariable String type) throws Exception {
+       Object list = dataDictionaryService.getFireChemical(type);
+         return ResponseHelper.buildResponse(list);
+     }
+
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "危化品分页查询", notes = "危化品分页查询")
+    public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
+                                                             @RequestParam(value = "pageSize") int pageSize, String casNo,
+                                                             String formula, String name, String typeCode) {
+        Page<FireChemicalDto> page = new Page<FireChemicalDto>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        boolean isDelete = false;
+        return ResponseHelper.buildResponse(fireChemicalService.queryForFireChemicalPage(page, casNo, formula,
+                name, typeCode, isDelete));
+    }
+
+
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/gwmcDataDictionary/{type}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
+    public ResponseModel<Object> gwmcDataDictionary(@PathVariable String type) throws Exception {
+
+        Object list = dataDictionaryService.gwmcDataDictionary(type);
+        return ResponseHelper.buildResponse(list);
+
+    }
+
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "fireExperts/page")
+    @ApiOperation(httpMethod = "GET", value = "外部专家分页查询", notes = "外部专家分页查询")
+    public ResponseModel<IPage<FireExpertsDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
+                                                             @RequestParam(value = "pageSize") int pageSize,
+                                                             FireExpertsDto fireExpertsDto) {
+        Page<FireExpertsDto> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+         Page<FireExpertsDto> fireExpertsDtoPage = fireExpertsService.queryForFireExpertsPage(page, false,
+                fireExpertsDto.getName(), fireExpertsDto.getExpertCode());
+        return ResponseHelper.buildResponse(fireExpertsDtoPage);
+    }
+
+
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "LinkageUnitDto/page")
+    @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
+    public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoqueryForPage(@RequestParam(value = "pageNum") int pageNum,
+                                                            @RequestParam(value = "pageSize") int pageSize,
+                                                            String unitName, String linkageUnitType, String inAgreement) {
+        Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false,
+                unitName, linkageUnitType);
+
+        return ResponseHelper.buildResponse(linkageUnitDtoPage);
+    }
+
+    
+    
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getFirefighters", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "内部专家列表分页查询", notes = "内部专家列表分页查询")
+    public ResponseModel<Page<FirefightersZhDto>> getFirefighters(Integer pageNum, Integer pageSize,
+                                                             FirefightersDto firefighters) {   	
+    	if(firefighters.getAreasExpertiseCode()==null) {
+    		firefighters.setAreasExpertiseCode("0");
+    	}  	
+        //条件分页
+        if (null == pageNum || null == pageSize) {
+            pageNum = 1;
+            pageSize = Integer.MAX_VALUE;
+        }
+        List<FirefightersZhDto> list = firefightersService.getFirefighters((pageNum - 1) * pageSize, pageSize,
+                firefighters);
+        Map<String, Long> num = firefightersService.getFirefightersCount((pageNum - 1) * pageSize, pageSize,
+                firefighters);
+        Page<FirefightersZhDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
+        pageBean.setRecords(list);
+        return ResponseHelper.buildResponse(pageBean);
+    }
+    
+    
+    /**
+    *
+    * 火灾现场统计
+    *
+    * **/
+
+   @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
+   @GetMapping(value = "statistics/{id}")
+   @ApiOperation(httpMethod = "GET", value = "火灾现场统计", notes = "火灾现场统计")
+   public ResponseModel<Object> getStatistics(@PathVariable Long id) {
+
+       return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledcount(id));
+
+   }
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/22
+     * </PRE>
+     * 到场力量统计
+     */
+    @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "getpower/{id}")
+    @ApiOperation(httpMethod = "GET", value = "到场力量统计", notes = "到场力量统计")
+    public ResponseModel<Object> getpower(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(iAlertCalledService.powercount(id));
+    }
+   
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/22
+     * </PRE>
+     * 到场力量统计列表
+     */
+    @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "getPowerDataList/{id}")
+    @ApiOperation(httpMethod = "GET", value = "到场力量统计列表", notes = "到场力量统计列表")
+    public ResponseModel<Object> getPowerDataList(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(iAlertCalledService.getPowerDataList(id));
+    }
+
+    /**
+     *
+     * 力量统计当前灾情阶段
+     *
+     * */
+    @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "getstate/{id}")
+    @ApiOperation(httpMethod = "GET", value = "获取灾情当前阶段", notes = "获取灾情当前阶段")
+    public ResponseModel<Object> getstate(@PathVariable Long id) {
+        AlertCalled AlertCalled=iAlertCalledService.getAlertCalledById(id);
+
+        List<StateDot> list=new ArrayList<>();
+        list.add(new StateDot("警情接报"));
+        list.add(new StateDot("力量调派"));
+        list.add(new StateDot("值班确警"));
+        list.add(new StateDot("处置跟踪"));
+        list.add(new StateDot("处置结束"));
+        list.stream().forEach(stateDot->{
+            if(AlertCalled.getAlertStage().equals(stateDot.getName())){
+                stateDot.setFlag(true);
+            }
+        });
+        return ResponseHelper.buildResponse(list);
+    }
+
+    /**
+     * * @param null
+     * @return
+     * <PRE>
+     * author tw
+     * date 2021/7/22
+     * </PRE>
+     * 到场力量 列表统计
+     */
+    @TycloudOperation( needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "getPowerCompanyCountDtocount/{id}")
+    @ApiOperation(httpMethod = "GET", value = "到场力量 列表统计", notes = "到场力量 列表统计")
+    public ResponseModel<Object> getPowerCompanyCountDtocount(@PathVariable Long id) {
+        return ResponseHelper.buildResponse(powerTransferService.getPowerCompanyCountDtocount(id));
+    }
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/FrontlineLiaisonController.java

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

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/service/impl/AlertSummaryServiceImpl.java

+package com.yeejoin.amos.boot.module.command.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.command.api.entity.AlertSummary;
+import com.yeejoin.amos.boot.module.command.api.mapper.AlertSummaryMapper;
+import com.yeejoin.amos.boot.module.command.api.service.IAlertSummaryService;
+import com.yeejoin.amos.boot.module.command.api.dto.AlertSummaryDto;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+@Service
+public class AlertSummaryServiceImpl extends BaseService<AlertSummaryDto,AlertSummary,AlertSummaryMapper> implements IAlertSummaryService {
+    /**
+     * 分页查询
+     */
+    public Page<AlertSummaryDto> queryForAlertSummaryPage(Page<AlertSummaryDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<AlertSummaryDto> queryForAlertSummaryList(@Condition(Operator.eq) Long alertCalledId)   {
+        return this.queryForList("" , false,alertCalledId);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/service/impl/FrontlineLiaisonServiceImpl.java

+package com.yeejoin.amos.boot.module.command.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.command.api.entity.FrontlineLiaison;
+import com.yeejoin.amos.boot.module.command.api.mapper.FrontlineLiaisonMapper;
+import com.yeejoin.amos.boot.module.command.api.service.IFrontlineLiaisonService;
+import com.yeejoin.amos.boot.module.command.api.dto.FrontlineLiaisonDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 前线联络员服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-22
+ */
+@Service
+public class FrontlineLiaisonServiceImpl extends BaseService<FrontlineLiaisonDto,FrontlineLiaison,FrontlineLiaisonMapper> implements IFrontlineLiaisonService {
+    /**
+     * 分页查询
+     */
+
+
+    public Page<FrontlineLiaisonDto> queryForFrontlineLiaisonPage(Page<FrontlineLiaisonDto> page,@Condition(Operator.eq) Long alertCalledId)   {
+        return this.queryForPage(page, null, false,alertCalledId);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<FrontlineLiaisonDto> queryForFrontlineLiaisonList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Date;
 import java.util.List;
+
 import com.yeejoin.amos.boot.module.common.biz.service.impl.ContractServiceImpl;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
@@ -37,80 +43,98 @@ public class ContractController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增维保合同", notes = "新增维保合同")
-	public ResponseModel<ContractDto> save(@RequestBody ContractDto model) {
-	    model = contractServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增维保合同", notes = "新增维保合同")
+    public ResponseModel<ContractDto> save(@RequestBody ContractDto model) {
+        model = contractServiceImpl.saveModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
 
-	/**
-     * 根据sequenceNbr更新
+    /**
+     * 更新合同信息及附件
      *
-     * @param sequenceNbr 主键
+     * @param model
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保合同", notes = "根据sequenceNbr更新维保合同")
-	public ResponseModel<ContractDto> updateBySequenceNbrContract(@RequestBody ContractDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(contractServiceImpl.updateWithModel(model));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "更新合同信息及附件", notes = "更新合同信息及附件")
+    public ResponseModel<ContractDto> updateBySequenceNbrContract(@RequestBody ContractDto model,
+                                                                  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(contractServiceImpl.updateById(model));
+    }
 
-	/**
-     * 根据sequenceNbr删除
+    /**
+     * 删除合同信息 (无约束)
      *
-     * @param sequenceNbr 主键
+     * @param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维保合同", notes = "根据sequenceNbr删除维保合同")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(contractServiceImpl.removeById(sequenceNbr));
+    @DeleteMapping(value = "/batch")
+    @ApiOperation(httpMethod = "DELETE", value = "删除合同信息 (无约束)", notes = "删除合同信息 (无约束)")
+    public ResponseModel<List<Long>> deleteBySequenceNbr(@RequestParam(value = "ids") String ids) throws Exception {
+        return ResponseHelper.buildResponse(contractServiceImpl.multDeleteAircraft(RequestContext.getAgencyCode(),
+                ids));
+    }
+
+    /**
+     * 批量删除合同信息
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete_batch")
+    @ApiOperation(httpMethod = "DELETE", value = "批量删除合同信息", notes = "批量删除合同信息")
+    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
+        return ResponseHelper.buildResponse(contractServiceImpl.batchDelete(sequenceNbrList));
     }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+     * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个维保合同",  notes = "根据sequenceNbr查询单个维保合同")
-	public ResponseModel<ContractDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(contractServiceImpl.queryBySeq(sequenceNbr));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "查询单个维保合同", notes = "查询单个维保合同")
+    public ResponseModel<ContractDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(contractServiceImpl.queryOne(sequenceNbr));
+    }
 
-	/**
+    /**
      * 列表分页查询
      *
      * @param current 当前页
      * @param current 每页大小
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "维保合同分页查询",  notes = "维保合同分页查询")
-	public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<ContractDto> page = new Page<ContractDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(contractServiceImpl.queryForContractPage(page));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "维保合同分页查询", notes = "维保合同分页查询")
+    public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size, Long companyId, Long signedCompanyId, String name, Long typeCode,
+                                                         Date signedDate) {
+        Page<ContractDto> page = new Page<ContractDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        AgencyUserModel amosUser = getUserInfo();
+        return ResponseHelper.buildResponse(contractServiceImpl.queryForContractPage(page, false, companyId,
+                signedCompanyId, name, typeCode, signedDate, amosUser.getUserId()));
+    }
 
-	/**
-	 * 列表全部数据查询
+    /**
+     * 列表全部数据查询
      *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "维保合同列表全部数据查询",   notes = "维保合同列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<ContractDto>> selectForList() {
-	    return ResponseHelper.buildResponse(contractServiceImpl.queryForContractList());
-	}
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "维保合同列表全部数据查询", notes = "维保合同列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<ContractDto>> selectForList() {
+        return ResponseHelper.buildResponse(contractServiceImpl.queryForContractList(false));
+    }
 }

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

@@ -17,8 +17,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
@@ -82,6 +80,19 @@ public class LinkageUnitController extends BaseController {
     }
 
     /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbrList 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/batch_delete")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除联动单位", notes = "根据sequenceNbr删除联动单位")
+    public ResponseModel<Boolean> batchDeleteBySequenceNbrList(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList) {
+        return ResponseHelper.buildResponse(linkageUnitServiceImpl.batchDelete(sequenceNbrList));
+    }
+
+    /**
      * 根据sequenceNbr查询
      *
      * @param sequenceNbr 主键

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
 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.MaintenanceCompanyDto;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,9 +22,17 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.utils.MyException;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 维保单位
@@ -36,88 +45,289 @@ import java.util.List;
 @RequestMapping(value = "/common/maintenance-company")
 public class MaintenanceCompanyController extends BaseController {
 
-    @Autowired
-    MaintenanceCompanyServiceImpl maintenanceCompanyServiceImpl;
-
-    /**
-     * 新增维保单位
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保单位")
-    public ResponseModel<MaintenanceCompanyDto> save(@RequestBody MaintenanceCompanyDto model) {
-        model = maintenanceCompanyServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位", notes = "根据sequenceNbr更新维保单位")
-    public ResponseModel<MaintenanceCompanyDto> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompanyDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维保单位", notes = "根据sequenceNbr删除维保单位")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保单位", notes = "根据sequenceNbr查询单个维保单位")
-    public ResponseModel<MaintenanceCompanyDto> seleteOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "维保单位分页查询", notes = "维保单位分页查询")
-    public ResponseModel<Page<MaintenanceCompanyDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
-        Page<MaintenanceCompanyDto> page = new Page<MaintenanceCompanyDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryForMaintenanceCompanyPage(page));
-    }
-
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "维保单位列表全部数据查询", notes = "维保单位列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<MaintenanceCompanyDto>> selectForList() {
-        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryForMaintenanceCompanyList());
-    }
+	@Autowired
+	MaintenanceCompanyServiceImpl maintenanceCompanyServiceImpl;
+
+	@Autowired
+	IMaintenanceCompanyService maintenanceCompanyService;
+
+	private static final String COMPANY = "COMPANY";
+	private static final String PERSON = "PERSON";
+	private static final String DEPARTMENT = "DEPARTMENT";
+
+	@Autowired
+	IOrgUsrService iOrgUsrService;
+
+	/**
+	 * 新增维保单位
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/company/save")
+	@ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保单位")
+	public ResponseModel<Boolean> saveMaintenanceCompany(@RequestBody MaintenanceCompany model) {
+		model.setType(COMPANY);
+		return ResponseHelper.buildResponse(maintenanceCompanyService.saveCompanyDetail(model));
+	}
+
+	/**
+	 * 新增维保单位人员基本信息
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/person/save")
+	@ApiOperation(httpMethod = "POST", value = "新增维保人员", notes = "新增维保人员")
+	public ResponseModel<Boolean> saveMaintenancePerson(@RequestBody MaintenanceCompany model) {
+		model.setType(PERSON);
+		return ResponseHelper.buildResponse(maintenanceCompanyService.savePersonDetail(model));
+	}
+
+	/**
+	 * 检查员工编号是否已经存在，用于手动输入的员工编号校验
+	 *
+	 * @return
+	 * @throws MyException
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/person/check/{personCode}")
+	@ApiOperation(httpMethod = "POST", value = "校验员工编号", notes = "校验员工编号")
+	public ResponseModel<Boolean> checkPersonCodeExists(@PathVariable String personCode) {
+
+		boolean flag = maintenanceCompanyService.checkPersonCodeExists(personCode);
+
+		if (flag) {
+			return ResponseHelper.buildResponse(true);
+		}
+		return ResponseHelper.buildResponse(false);
+	}
+
+	/**
+	 * 查询所有的维保人员/单位/部门信息的列表，不分页
+	 * 
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/allList")
+	@ApiOperation(httpMethod = "GET", value = "所有维保人员/单位/部门列表，不分页", notes = "所有维保人员列表")
+	public ResponseModel<List<Map<String, Object>>> getAllMaintenanceList(@RequestParam String maintenanceType) {
+		return ResponseHelper.buildResponse(maintenanceCompanyService.getAllMaintenanceList(maintenanceType));
+	}
+
+	/**
+	 * 查询当前登陆用户所在维保单位下的维保人员列表，不分页
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/simple/list")
+	@ApiOperation(httpMethod = "GET", value = "查询当前登陆用户所在维保单位下的维保人员列表部门列表，不分页", notes = "查询当前登陆用户所在维保单位下的维保人员列表，不分页")
+	public ResponseModel<List<Map<String, Object>>> getPersonListByCompanyId(@RequestParam(required = false) Long companyId) {
+		AgencyUserModel amosUser = getUserInfo();
+		List<Map<String, Object>> result = maintenanceCompanyServiceImpl.getPersonListByCompanyId(companyId,
+				amosUser.getUserId());
+		return ResponseHelper.buildResponse(result);
+	}
+
+	/**
+	 * 查询所有的维保人员/单位/部门信息的列表，不分页
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/page/List")
+	@ApiOperation(httpMethod = "POST", value = "所有维保人员/单位/部门分页列表", notes = "所有维保人员列表")
+	public ResponseModel<IPage<Map<String, Object>>> getPageMaintenanceList(@RequestBody Map<String, Object> paramsMap) {
+		return ResponseHelper.buildResponse(maintenanceCompanyService.getPageMaintenanceList(paramsMap));
+	}
+
+	/**
+	 * 新增维保单位部门基本信息
+	 *
+	 * @return
+	 * @throws MyException
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/department/save")
+	@ApiOperation(httpMethod = "POST", value = "新增维保部门", notes = "新增维保部门")
+	public ResponseModel<Boolean> saveMaintenanceDepartment(@RequestBody MaintenanceCompany model) {
+		model.setType(DEPARTMENT);
+		return ResponseHelper.buildResponse(maintenanceCompanyService.saveDepartmentDetail(model));
+	}
+
+	/**
+	 * 获取公司名称的下拉列表
+	 * 
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getCompanyDropDownList")
+	@ApiOperation(httpMethod = "GET", value = "查询公司名称下拉列表", notes = "查询公司名称下拉列表")
+	public ResponseModel<List<Map<String, Object>>> getMaintenanceCompanyDropDownList() {
+		List<Map<String, Object>> result = maintenanceCompanyService.getMaintenanceCompanyDropDownList();
+		return ResponseHelper.buildResponse(result);
+	}
+
+	/**
+	 * 根据sequenceNbr更新
+	 *
+	 * @param model 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "put/company")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位", notes = "根据sequenceNbr更新维保单位")
+	public ResponseModel<Boolean> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompany model
+			) {
+		return ResponseHelper
+				.buildResponse(maintenanceCompanyService.updateMaintenanceCompanyDetail(model));
+	}
+
+	/**
+	 * 根据sequenceNbr更新
+	 *
+	 * @param model 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "put/person")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位人员", notes = "根据sequenceNbr更新维保单位")
+	public ResponseModel<Boolean> updateBySequenceNbrMaintenancePerson(@RequestBody MaintenanceCompany model) {
+		return ResponseHelper
+				.buildResponse(maintenanceCompanyService.updateMaintenancePersonDetail(model));
+	}
+
+	/**
+	 * 根据sequenceNbr更新
+	 *
+	 * @param model 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "put/department")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位部门", notes = "根据sequenceNbr更新维保单位")
+	public ResponseModel<Boolean> updateBySequenceNbrMaintenanceDepartment(@RequestBody MaintenanceCompany model
+			) {
+		return ResponseHelper
+				.buildResponse(maintenanceCompanyService.updateMaintenanceDepartmentDetail(model));
+	}
+
+	/**
+	 * 根据sequenceNbr删除
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "delete/{sequenceNbr}")
+	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(maintenanceCompanyService.deleteById(sequenceNbr));
+	}
+
+	/**
+	 * 根据sequenceNbr查询
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "find")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保单位-人员-部门", notes = "根据sequenceNbr查询单个维保单位-人员-部门")
+	public ResponseModel<Map<String, Object>> selectOne(@RequestParam long sequenceNbr) {
+		return ResponseHelper.buildResponse(maintenanceCompanyService.findBySequenceNbr(sequenceNbr));
+	}
+
+	/**
+	 * 查询单位-部门树结构数据
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "companyAndDepartment/getTree")
+	@ApiOperation(httpMethod = "GET", value = "查询单位-部门树结构数据", notes = "查询单位-部门树结构数据")
+	public ResponseModel<List<OrgMenuDto>> getCompanyAndDepartmentTree() throws Exception {
+		List<OrgMenuDto> menus = iOrgUsrService.getTree(null,
+				maintenanceCompanyService.getCompanyAndDepartmentTree(), MaintenanceCompany.class.getName(),
+				"getSequenceNbr", 2, "getName", "getParentId", "getType");
+		return ResponseHelper.buildResponse(menus);
+	}
+
+	/**
+	 * 查询单位-部门树结构数据
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "departmentAndPerson/getTree")
+	@ApiOperation(httpMethod = "GET", value = "查询部门-人树结构数据", notes = "查询部门-人树结构数据")
+	public ResponseModel<List<OrgMenuDto>> getDepartmentTree(@RequestParam long sequenceNbr) throws Exception {
+		List<OrgMenuDto> menus = iOrgUsrService.getTree(sequenceNbr,
+				maintenanceCompanyService.getDepartmentAndPersonTree(sequenceNbr), MaintenanceCompany.class.getName(),
+				"getSequenceNbr", 2, "getName", "getParentId", "getType");
+		return ResponseHelper.buildResponse(menus);
+	}
+
+	/**
+	 * 查询单位-部门树结构数据
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getDepartmentList")
+	@ApiOperation(httpMethod = "GET", value = "查询部门下拉列表数据", notes = "查询部门下拉列表数据")
+	public ResponseModel<List<OrgMenuDto>> getDepartmentList(@RequestParam long sequenceNbr) throws Exception {
+		List<OrgMenuDto> menus = iOrgUsrService.getTree(sequenceNbr,
+				maintenanceCompanyService.getDepartmentList(sequenceNbr), MaintenanceCompany.class.getName(),
+				"getSequenceNbr", 2, "getName", "getParentId", "getType");
+		return ResponseHelper.buildResponse(menus);
+	}
+
+	/**
+	 * 根据维保单位查询所有机场单位(不带分页)
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "queryCompany/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET", value = "根据维保单位查询所有机场单位(不带分页)", notes = "根据维保单位查询所有机场单位(不带分页)")
+	public ResponseModel<List<Map<String, Object>>> seleteCompanys(@PathVariable Long sequenceNbr) {
+		return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryOrgUsrMsg(sequenceNbr));
+	}
+
+	/**
+	 * 根据维保单位查询所有机场单位(带分页)
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "queryCompanyPages")
+	@ApiOperation(httpMethod = "GET", value = "根据维保单位查询所有机场单位(带分页)", notes = "根据维保单位查询所有机场单位(带分页)")
+	public ResponseModel<Page<Map<String, Object>>> selectCompanyPages(@RequestParam(required = false, defaultValue =
+			"10", value = "pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize,
+																	   @RequestParam(required = false) Long sequenceNbr) {
+		AgencyUserModel amosUser = getUserInfo();
+		return ResponseHelper
+				.buildResponse(maintenanceCompanyServiceImpl.queryOrgUsrMsgPage(pageNum, pageSize, sequenceNbr,
+						amosUser.getUserId()));
+	}
+
+	/**
+	 *
+	 * 查询维保单位、业主单位信息
+	 * 
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "查询维保单位、业主单位信息", notes = "查询维保单位、业主单位信息")
+	@GetMapping(value = "/companyList")
+	public ResponseModel<List<Map<String, Object>>> selectCompanyList() {
+		return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryCompanyMsg());
+	}
+
 }

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

@@ -19,11 +19,14 @@ 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.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 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.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -305,12 +308,15 @@ public class WaterResourceController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
     public ResponseModel<Page<WaterResourceDto>> queryForPage(@RequestParam(value = "current") int current,
                                                               @RequestParam(value = "size") int size, String name,
+                                                              ArrayList<Long> belongBuildingId,
+                                                              Long belongFightingSystemId, Long sequenceNbr,
                                                               String resourceType) {
         Page<WaterResourceDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourcePage(page, name,
-                resourceType, true));
+                resourceType, belongBuildingId, belongFightingSystemId,
+                sequenceNbr, true));
     }
 
     /**
@@ -342,8 +348,20 @@ public class WaterResourceController extends BaseController {
     public ResponseModel<List<WaterResourceDto>> selectList(String name, Long sequenceNbr,
                                                             Long belongFightingSystemId, Long belongBuildingId,
                                                             String belongBuilding, String resourceType) {
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryWaterResourceList(false, name, sequenceNbr,
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryWaterResourceList(true, name, sequenceNbr,
                 belongFightingSystemId, belongBuildingId,
                 belongBuilding, resourceType));
     }
+
+    /**
+     * 查询水资源类型列表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询水资源类型列表", notes = "查询水资源类型列表")
+    @GetMapping(value = "/resource_type_list")
+    public ResponseModel<List<WaterResourceTypeDto>> selectResourceTypeList() {
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.getWaterResourceTypeList(true));
+    }
 }

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
 import com.yeejoin.amos.boot.module.common.api.entity.Contract;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IContractService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 维保合同服务实现类
@@ -18,17 +36,236 @@ import java.util.List;
  */
 @Service
 public class ContractServiceImpl extends BaseService<ContractDto, Contract, ContractMapper> implements IContractService {
+
+    @Autowired
+    SourceFileServiceImpl sourceFileServiceImpl;
+
+    @Autowired
+    MaintenanceCompanyServiceImpl maintenanceCompanyService;
+
     /**
      * 分页查询
      */
-    public Page<ContractDto> queryForContractPage(Page<ContractDto> page) {
-        return this.queryForPage(page, null, false);
+    public Page<ContractDto> queryForContractPage(Page<ContractDto> page, Boolean isDelete, Long companyId,
+                                                  Long signedCompanyId, String name, Long typeCode, Date signedDate,
+                                                  String amosUserId) {
+        if (ValidationUtil.isEmpty(companyId)) {
+            MaintenanceCompany company = maintenanceCompanyService.getMaintenanceCompany(amosUserId);
+            companyId = company.getSequenceNbr();
+        }
+        return queryForContractPageByParam(page, isDelete, companyId, signedCompanyId, name, typeCode,
+                signedDate);
+    }
+
+    public Page<ContractDto> queryForContractPageByParam(Page<ContractDto> page, Boolean isDelete,
+                                                  @Condition(Operator.eq) Long companyId,
+                                                  @Condition(Operator.eq) Long signedCompanyId,
+                                                  @Condition(Operator.like) String name,
+                                                  @Condition(Operator.eq) Long typeCode,
+                                                  @Condition(Operator.likeLeft) Date signedDate) {
+        return this.queryForPage(page, null, false, isDelete, companyId, signedCompanyId, name, typeCode, signedDate);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<ContractDto> queryForContractList() {
-        return this.queryForList("", false);
+    public List<ContractDto> queryForContractList(Boolean isDelete) {
+        return this.queryForList("rec_date", false, isDelete);
     }
-}
\ No newline at end of file
+
+    /**
+     * 保存附件信息
+     *
+     * @param agencyCode
+     * @param attachments
+     * @param contractDto
+     * @param fileCategory
+     * @return
+     * @throws Exception
+     */
+    private List<FileInfoModel> buildFileInfo(String agencyCode, List<String> attachments,
+                                              ContractDto contractDto, String fileCategory) throws Exception {
+        List<FileInfoModel> fileInfoModelList = new ArrayList<>();
+        for (String attachment : attachments) {
+            FileInfoModel fileInfoModel = new FileInfoModel();
+            fileInfoModel.setEntityId(String.valueOf(contractDto.getSequenceNbr()));
+            fileInfoModel.setEntityType(Contract.class.getSimpleName());
+            fileInfoModel.setFileCategory(fileCategory);
+            fileInfoModel.setFilename(attachment);
+            fileInfoModel.setAgencyCode(agencyCode);
+            fileInfoModelList.add(fileInfoModel);
+        }
+
+        return fileInfoModelList;
+    }
+
+    /**
+     * 保存附件
+     *
+     * @param agencyCode
+     * @param contractDto
+     * @return
+     * @throws Exception
+     */
+    private boolean saveAircraftFile(String agencyCode, ContractDto contractDto) throws Exception {
+        List<FileInfoModel> fileInfoModelList = new ArrayList<FileInfoModel>();
+        // 获取附件信息
+        if (!ValidationUtil.isEmpty(contractDto.getContractAttachment())) {
+            List<String> attachments = StringUtil.String2List(contractDto.getContractAttachment());
+            for (String attachment : attachments) {
+                String format = attachment.substring(attachment.lastIndexOf(".") + 1, attachment.length());
+                fileInfoModelList.addAll(buildFileInfo(agencyCode, attachments, contractDto, format));
+            }
+        }
+        // 保存附件
+        if (!ValidationUtil.isEmpty(fileInfoModelList)) {
+            Systemctl.fileInfoClient.batchCreateByEntity(fileInfoModelList);
+        }
+        return true;
+    }
+
+    /**
+     * 保存合同信息
+     *
+     * @param agencyCode
+     * @param contractDto
+     * @return
+     * @throws Exception
+     */
+    public ContractDto saveContractDto(String agencyCode, ContractDto contractDto) throws Exception {
+        contractDto.setIsDelete(false);
+        // 保存合同基本信息
+        contractDto = this.createWithModel(contractDto);
+        // 保存附件信息
+        saveAircraftFile(agencyCode, contractDto);
+        return contractDto;
+    }
+
+    /**
+     * 更新合同信息及附件
+     *
+     * @param agencyCode
+     * @param model
+     * @return
+     * @throws Exception
+     */
+    public ContractDto updateAircraft(String agencyCode, ContractDto model) throws Exception {
+        ContractDto oldModel = this.queryBySeq(model.getSequenceNbr());
+        if (ValidationUtil.isEmpty(oldModel)) {
+            throw new DataNotFound("找不到指定的合同信息.");
+        }
+        //删除附件信息
+        Systemctl.fileInfoClient.deleteByAlias(agencyCode, ContractDto.class.getSimpleName(),
+                String.valueOf(model.getSequenceNbr()), null);
+        //保存合同信息
+        saveAircraftFile(agencyCode, model);
+        return this.updateWithModel(Bean.copyExistPropertis(model, oldModel));
+    }
+
+    /**
+     * 附件转成逗号分割String
+     *
+     * @param fileInfoModels
+     * @return
+     */
+    private String processToStr(List<FileInfoModel> fileInfoModels) {
+        return fileInfoModels.stream().map(FileInfoModel::getFilename).collect(Collectors.joining(","));
+    }
+
+    /**
+     * 根据主键查询合同信息
+     *
+     * @param agencyCode
+     * @param seq
+     * @return
+     */
+    public ContractDto queryByAircraftSeq(String agencyCode, Long seq) {
+        ContractDto contractDto = this.queryBySeq(seq);
+        // 填充合同附件信息
+        FeignClientResult<List<FileInfoModel>> fileInfoModelResult = Systemctl.fileInfoClient.queryByEntity(
+                agencyCode, ContractDto.class.getSimpleName(), String.valueOf(seq));
+        List<FileInfoModel> fileInfoModels = fileInfoModelResult.getResult();
+        // 填充合同信息
+        if (!ValidationUtil.isEmpty(fileInfoModels)) {
+            contractDto.setContractAttachment(processToStr(fileInfoModels));
+        }
+        return contractDto;
+    }
+
+    /**
+     * 删除合同信息 (无约束)
+     *
+     * @param agencyCode
+     * @param ids
+     * @return
+     * @throws Exception
+     */
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
+    public List<Long> multDeleteAircraft(String agencyCode, String ids) throws Exception {
+        List<Long> seqs = StringUtil.String2LongList(ids);
+        for (Long id : seqs) {
+            //删除附件信息
+            Systemctl.fileInfoClient.deleteByAlias(agencyCode, ContractDto.class.getSimpleName(),
+                    String.valueOf(id), null);
+            //删除合同信息
+            this.deleteBySeq(id);
+        }
+        return seqs;
+    }
+
+    /**
+     * 保存合同信息
+     *
+     * @param contractDto
+     * @return
+     */
+    @Transactional
+    public ContractDto saveModel(ContractDto contractDto) {
+        // 保存合同基本信息
+        contractDto = this.createWithModel(contractDto);
+        // 保存附件信息
+        sourceFileServiceImpl.saveSourceFile(contractDto.getSequenceNbr(), contractDto.getAttachment());
+        return contractDto;
+    }
+
+    @Transactional
+    public ContractDto updateById(ContractDto contractDto) {
+        // 更新合同基本信息
+        updateWithModel(contractDto);
+        // 更新附件信息
+        sourceFileServiceImpl.saveSourceFile(contractDto.getSequenceNbr(), contractDto.getAttachment());
+        return contractDto;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param sequenceNbrList
+     * @return
+     */
+    public Boolean batchDelete(List<Long> sequenceNbrList) {
+        // 删除基本信息
+        List<Contract> contractList = list(new LambdaQueryWrapper<Contract>().in(Contract::getSequenceNbr,
+                sequenceNbrList));
+        contractList.forEach(item -> item.setIsDelete(true));
+        boolean update = updateBatchById(contractList);
+        // 删除附件
+        sourceFileServiceImpl.getBaseMapper().delete(new LambdaQueryWrapper<SourceFile>().in(SourceFile::getSourceId,
+                sequenceNbrList));
+        return update;
+    }
+
+    /**
+     * 查询单个合同
+     *
+     * @param sequenceNbr
+     * @return
+     */
+    public ContractDto queryOne(Long sequenceNbr) {
+        ContractDto contractDto = queryBySeq(sequenceNbr);
+        List<SourceFile> sourceFiles = sourceFileServiceImpl.findBySourceId(sequenceNbr);
+        contractDto.setAttachment(sourceFiles);
+        return contractDto;
+    }
+}
+

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -8,6 +13,10 @@ import com.yeejoin.amos.boot.module.common.api.dto.DataDictionaryDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDataDictionaryService;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+
+import java.util.Collection;
+import java.util.List;
 
 /**
 * 数据字典 服务实现类
@@ -17,5 +26,49 @@ import com.yeejoin.amos.boot.module.common.api.service.IDataDictionaryService;
 */
 @Service
 public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto,DataDictionary,DataDictionaryMapper> implements IDataDictionaryService {
+    @Autowired
+    RedisUtils redisUtils;
+
+    @Value("${redis.cache.failure.time}")
+    private long time;
+
+
+    @Override
+    public Object getFireChemical(String type) throws Exception {
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", type);
+        queryWrapper.orderByAsc("sort_num");
+
+        if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+            Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+            return obj;
+        } else {
+            Collection<DataDictionary> list = this.list(queryWrapper);
+            List<MenuFrom> menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0,
+                    "getName", "getParent", null);
+            MenuFrom Me = new MenuFrom("-1", "-1", "-1", "危化品库", "危化品库", "危化品库", "-1", null);
+            Me.setIsLeaf(false);
+            Me.setChildren(menus);
+            redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(Me), time);
+            return Me;
+        }
+    }
+
+    @Override
+    public Object gwmcDataDictionary(String type) throws Exception{
+        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", type);
+        queryWrapper.orderByAsc("sort_num");
 
+        if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+            Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+            return obj;
+        } else {
+            Collection<DataDictionary> list = this.list(queryWrapper);
+            List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
+                    , "getParent", null);
+            redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
+            return menus;
+        }
+    }
 }

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

@@ -101,7 +101,12 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
             List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
             Map<String, Object> instanceMap = Bean.listToMap(list, "fieldCode", "fieldValue", DynamicFormInstance.class);
             for (DynamicFormColumn optionModel : columns) {
+                DynamicFormInstance dyFormInstance =
+                        list.stream().filter(i -> i.getFieldCode().equals(optionModel.getFieldCode())).findFirst().get();
                 instanceMap.put(optionModel.getFieldCode(), instanceMap.get(optionModel.getFieldCode()));
+                if ("radio,select,treeSelect".contains(optionModel.getFieldType())) {
+                    instanceMap.put(optionModel.getFieldCode() + "Label", dyFormInstance.getFieldValueLabel());
+                }
             }
             optionListMap.putAll(instanceMap);
             optionListMap.put("instanceId", instanceId);
@@ -124,7 +129,12 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         Page page = new Page(current, size);
         return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
     }
-
+    public IPage<Map<String, Object>> pageList(int current, int size ,String groupCode,Map<String, String> params ){
+        List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
+        Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
+        Page page = new Page(current, size);
+        return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
+    }
     public List<Map<String, Object>> listAll(String groupCode){
         Map<String, String> params = this.getRequestParamMap();
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
@@ -149,7 +159,5 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         }
         return params;
     }
-
-
-
 }
+

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

@@ -28,6 +28,7 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
         /**
          * 分页查询
          */
+        @Override
         public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page,   @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name, String typeCode,boolean isDelete)   {
            return this.queryForPage(page, "", false,casNo, formula, name,  typeCode, isDelete);
         }

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

@@ -25,6 +25,7 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExpe
     /**
      * 分页查询
      */
+    @Override
     public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String name,

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

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -40,7 +41,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     FirefightersContactsServiceImpl firefightersContactsService;
 
     @Override
-    public List<Firefighters> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {
+    public List<FirefightersZhDto> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {
         return firefightersMapper.getFirefighters(pageNum, pageSize, par);
     }
 

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

@@ -2,15 +2,21 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
+import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.LinkageUnitMapper;
 import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
@@ -19,6 +25,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -39,6 +46,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
     LinkageUnitMapper linkageUnitMapper;
     @Autowired
     DynamicFormColumnServiceImpl dynamicFormColumnService;
+    @Autowired
+    SourceFileServiceImpl sourceFileServiceImpl;
 
     public String getGroupCode() {
         return "linkageUnit";
@@ -47,6 +56,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
     /**
      * 分页查询
      */
+    @Override
     public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String unitName,
@@ -67,6 +77,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
      * @param linkageUnitDto 对象
      * @return List<LinkageUnitDto>
      */
+    @Transactional
     public LinkageUnitDto saveModel(LinkageUnitDto linkageUnitDto) {
         //1.保存行数据
         String groupCode = this.getGroupCode();
@@ -74,37 +85,48 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
         Long instanceId = dynamicFormInstanceService.commonSave(groupCode, map);
         linkageUnitDto.setInstanceId(instanceId);
         //2.保存基本信息
-        linkageUnitDto.setUnitId(getUnitCodeStr());
+        linkageUnitDto.setUnitCode(getUnitCodeStr());
         LinkageUnitDto model = createWithModel(linkageUnitDto);
+        //3.保存照片信息
+        sourceFileServiceImpl.saveSourceFile(model.getSequenceNbr(), model.getImage());
         //3.返回保存后的数据
         return model;
     }
 
-
+    @Override
     public LinkageUnitDto queryOne(Long sequenceNbr) {
-        boolean isDelete = false;
         String groupCode = getGroupCode();
         List<DynamicFormColumn> columns =
                 dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
-        LinkageUnitDto linkageUnitDto = linkageUnitMapper.selectOne(isDelete, fieldCodes, groupCode, sequenceNbr);
+        LinkageUnitDto linkageUnitDto = linkageUnitMapper.selectOne(false, fieldCodes, groupCode, sequenceNbr);
+        List<SourceFile> sourceFiles = sourceFileServiceImpl.findBySourceId(linkageUnitDto.getSequenceNbr());
+        linkageUnitDto.setImage(sourceFiles);
         return linkageUnitDto;
     }
 
+    @Transactional
     public Boolean deleteById(Long sequenceNbr) {
+        // 删除基本信息
         LinkageUnit linkageUnit = getById(sequenceNbr);
         linkageUnit.setIsDelete(true);
         updateById(linkageUnit);
+        // 删除行
         Long instanceId = linkageUnit.getInstanceId();
         List<DynamicFormInstance> dynamicFormInstanceList =
                 dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
         dynamicFormInstanceList.forEach(item -> item.setIsDelete(true));
         boolean update = dynamicFormInstanceService.updateBatchById(dynamicFormInstanceList);
+        // 删除照片
+        sourceFileServiceImpl.saveSourceFile(sequenceNbr, new ArrayList<>());
         return update;
     }
 
+    @Transactional
     public LinkageUnitDto updateById(LinkageUnitDto linkageUnitDto) {
+        // 修改基本信息
         updateWithModel(linkageUnitDto);
+        // 修改行信息
         Long instanceId = linkageUnitDto.getInstanceId();
         List<DynamicFormInstance> dynamicFormInstanceList =
                 dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
@@ -112,6 +134,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
         dynamicFormInstanceList.forEach(item -> item.setFieldValue(objectMap.get(item.getFieldCode()) != null ?
                 objectMap.get(item.getFieldCode()).toString() : item.getFieldValue()));
         dynamicFormInstanceService.updateBatchById(dynamicFormInstanceList);
+        // 修改照片信息
+        sourceFileServiceImpl.saveSourceFile(linkageUnitDto.getSequenceNbr(), linkageUnitDto.getImage());
         return linkageUnitDto;
     }
 
@@ -126,4 +150,47 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
         }
         return sb.toString();
     }
+
+    @Override
+    public List<LinkageUnitZhDto> listLinkageUnitZhDto(Integer pageNum, Integer pageSize, RequestData par) {
+        if (null == pageNum || null == pageSize) {
+            pageNum = 1;
+            pageSize = Integer.MAX_VALUE;
+        } else {
+            pageNum = (pageNum - 1) * pageSize;
+        }
+        return linkageUnitMapper.listLinkageUnitZhDto(pageNum, pageSize, par);
+    }
+
+    @Override
+    public Integer listLinkageUnitZhDtoCount(RequestData par) {
+        return linkageUnitMapper.listLinkageUnitZhDtoCount(par);
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param sequenceNbrList
+     * @return
+     */
+    public Boolean batchDelete(List<Long> sequenceNbrList) {
+        // 删除基本信息
+        List<LinkageUnit> linkageUnitList = list(new LambdaQueryWrapper<LinkageUnit>().in(LinkageUnit::getSequenceNbr,
+                sequenceNbrList));
+        List<Long> instanceIdList = Lists.newArrayList();
+        linkageUnitList.forEach(item -> {
+            instanceIdList.add(item.getInstanceId());
+            item.setIsDelete(true);
+        });
+        updateBatchById(linkageUnitList);
+        // 删除行信息
+        List<DynamicFormInstance> dynamicFormInstanceList =
+                dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().in(DynamicFormInstance::getInstanceId, instanceIdList));
+        dynamicFormInstanceList.forEach(item -> item.setIsDelete(true));
+        boolean update = dynamicFormInstanceService.updateBatchById(dynamicFormInstanceList);
+        // 删除照片
+        sourceFileServiceImpl.getBaseMapper().delete(new LambdaQueryWrapper<SourceFile>().in(SourceFile::getSourceId,
+                sequenceNbrList));
+        return update;
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
+import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
+import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
-import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 
 /**
  * 维保单位服务实现类
@@ -16,18 +50,766 @@ import java.util.List;
  * @date 2021-07-16
  */
 @Service
-public class MaintenanceCompanyServiceImpl extends BaseService<MaintenanceCompanyDto,MaintenanceCompany,MaintenanceCompanyMapper> implements IMaintenanceCompanyService {
-    /**
-     * 分页查询
-     */
-    public Page<MaintenanceCompanyDto> queryForMaintenanceCompanyPage(Page<MaintenanceCompanyDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<MaintenanceCompanyDto> queryForMaintenanceCompanyList()   {
-        return this.queryForList("" , false);
-    }
+public class MaintenanceCompanyServiceImpl
+		extends BaseService<MaintenanceCompanyDto, MaintenanceCompany, MaintenanceCompanyMapper>
+		implements IMaintenanceCompanyService {
+
+	private static final String MAINTENANCE_COMPANY = "maintenanceCompany";
+	private static final String MAINTENANCE_PERSON = "maintenancePerson";
+	private static final String MAINTENANCE_DEPARTMENT = "maintenanceDepartment";
+
+	private static final String PERSON = "PERSON";
+	private static final String COMPANY = "COMPANY";
+	private static final String DEPARTMENT = "DEPARTMENT";
+
+	@Autowired
+	DynamicFormInstanceServiceImpl dynamicFormInstanceService;
+
+	@Autowired
+	DynamicFormColumnServiceImpl dynamicFormColumnServiceImpl;
+
+	@Autowired
+	Sequence sequence;
+
+	@Autowired
+	MaintenanceCompanyMapper maintenanceCompanyMapper;
+
+	@Autowired
+	IOrgUsrService iOrgUsrService;
+
+	@Autowired
+	DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
+	@Autowired
+	SourceFileServiceImpl sourceFileService;
+
+	/**
+	 * 分页查询
+	 */
+	public Page<MaintenanceCompanyDto> queryForMaintenanceCompanyPage(Page<MaintenanceCompanyDto> page) {
+		return this.queryForPage(page, null, false);
+	}
+
+	/**
+	 * 列表查询 示例
+	 */
+	public List<MaintenanceCompanyDto> queryForMaintenanceCompanyList() {
+		return this.queryForList("", false);
+	}
+
+	/**
+	 * 添加维保单位基本信息
+	 * 
+	 * @param maintenanceCompany
+	 * @return
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean saveCompanyDetail(MaintenanceCompany maintenanceCompany) {
+		Long instanceId = saveDynamicFormList(maintenanceCompany);
+		maintenanceCompany.setCode(OrgUsrServiceImpl.getOrgCodeStr());
+		maintenanceCompany.setOrgCode(null);
+		maintenanceCompany.setBizCode(sequence.nextId() + "");
+		maintenanceCompany.setInstanceId(instanceId);
+		maintenanceCompany.setSequenceNbr(sequence.nextId());
+		maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
+		maintenanceCompany.setIsDelete(false);
+		try {
+			this.save(maintenanceCompany);
+
+			saveAttachments(maintenanceCompany);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean savePersonDetail(MaintenanceCompany maintenanceCompany) {
+		Long instanceId = saveDynamicFormList(maintenanceCompany);
+		Long parentId = maintenanceCompany.getParentId();
+		MaintenanceCompany parent = maintenanceCompanyMapper.selectById(parentId);
+		if (StringUtils.isBlank(maintenanceCompany.getCode())) {
+			// 添加人员时，当前的code 为单位code+6位随机数
+			maintenanceCompany.setCode(parent.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
+		}
+		maintenanceCompany.setOrgCode(null);
+		if (ValidationUtil.isEmpty(maintenanceCompany.getBizCode())) {
+			maintenanceCompany.setBizCode(sequence.nextId() + "");
+		}
+		maintenanceCompany.setInstanceId(instanceId);
+		maintenanceCompany.setParentId(parentId);
+		maintenanceCompany.setIsDelete(false);
+		try {
+			this.save(maintenanceCompany);
+
+			saveAttachments(maintenanceCompany);
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * 保存附件
+	 */
+	public void saveAttachments(MaintenanceCompany maintenanceCompany) {
+		if (!ValidationUtil.isEmpty(maintenanceCompany.getAttachments())) {
+			List<SourceFile> sourceFiles = Lists.newArrayList();
+			Map<String, List<AttachmentDto>> attachmentMap = maintenanceCompany.getAttachments();
+			attachmentMap.entrySet().forEach(entry -> {
+				List<AttachmentDto> atts = entry.getValue();
+				sourceFiles.addAll(attachment2SourceFile(entry.getKey(), atts));
+			});
+			sourceFileService.saveSourceFile(maintenanceCompany.getSequenceNbr(), sourceFiles);
+		}
+	}
+
+	private List<SourceFile> attachment2SourceFile(String type, List<AttachmentDto> attachmentDtoList) {
+		List<SourceFile> sourceFiles = Lists.newArrayList();
+		if (!ValidationUtil.isEmpty(attachmentDtoList)) {
+			attachmentDtoList.forEach(a -> {
+				SourceFile s = new SourceFile();
+				s.setFilePath(a.getUrl());
+				s.setFileName(a.getName());
+				s.setFileCategory(type);
+				sourceFiles.add(s);
+			});
+		}
+		return sourceFiles;
+	}
+
+	/**
+	 * 添加维保单位人员信息
+	 * 
+	 * @param maintenanceCompany
+	 * @return
+	 */
+//	public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, Map<String, Long> params) {
+//		long sequenceNbr =0;
+//		if(params.containsKey("companyId")) {
+//			sequenceNbr=params.get("companyId");
+//		}
+//		if(params.containsKey("departmentId")) {
+//			sequenceNbr=params.get("departmentId");
+//		}
+//		return savePersonDetail(maintenancePerson,sequenceNbr);
+//	}
+	public Long saveDynamicFormList(MaintenanceCompany maintenanceCompany) {
+		Long instanceId = sequence.nextId();
+		List<DynamicFormInstance> dynamicFormInstanceList = maintenanceCompany.getDynamicFormValue();
+		for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
+			dynamicFormInstance.setInstanceId(instanceId);
+			dynamicFormInstanceService.save(dynamicFormInstance);
+		}
+		return instanceId;
+	}
+
+	@Override
+	public boolean saveDepartmentDetail(MaintenanceCompany maintenanceCompany) {
+		Long instanceId = saveDynamicFormList(maintenanceCompany);
+		Long parentId = maintenanceCompany.getParentId();
+		MaintenanceCompany parent = maintenanceCompanyMapper.selectById(parentId);
+		// 添加人员时，当前的orgcode 为单位code+6位随机数
+		maintenanceCompany.setCode(parent.getCode() + OrgUsrServiceImpl.getOrgCodeStr());
+		maintenanceCompany.setOrgCode(null);
+		maintenanceCompany.setBizCode(sequence.nextId() + "");
+		maintenanceCompany.setInstanceId(instanceId);
+		maintenanceCompany.setType(maintenanceCompany.getType().toUpperCase());
+		maintenanceCompany.setParentId(parentId);
+		maintenanceCompany.setIsDelete(false);
+		try {
+			this.save(maintenanceCompany);
+
+			saveAttachments(maintenanceCompany);
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public boolean deleteById(Long sequenceNbr) {
+
+		MaintenanceCompany maintenanceCompany = maintenanceCompanyMapper.selectById(sequenceNbr);
+		if (ObjectUtils.isEmpty(maintenanceCompany)) {
+			return false;
+		}
+		maintenanceCompany.setIsDelete(true);
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(MaintenanceCompany::getSequenceNbr, sequenceNbr);
+
+		int number = maintenanceCompanyMapper.update(maintenanceCompany, wrapper);
+		if (number > 0) {
+			// 更新动态表单字段为删除状态
+			List<DynamicFormInstance> dyInstance = dynamicFormInstanceService
+					.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId,
+							maintenanceCompany.getInstanceId()));
+			dyInstance.forEach(i -> i.setIsDelete(true));
+			dynamicFormInstanceService.updateBatchById(dyInstance);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	@Override
+	public List<Map<String, Object>> getMaintenanceCompanyDropDownList() {
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName);
+		wrapper.eq(MaintenanceCompany::getType, COMPANY);
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
+		return maintenanceCompanyMapper.selectMaps(wrapper);
+	}
+
+	@Override
+	public boolean checkPersonCodeExists(String code) {
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(MaintenanceCompany::getCode, code);
+		MaintenanceCompany detail = maintenanceCompanyMapper.selectOne(wrapper);
+		if (ObjectUtils.isEmpty(detail)) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public List<Map<String, Object>> getAllMaintenanceList(String maintenanceType) {
+		String type = null;
+		switch (maintenanceType.toUpperCase()) {
+		case PERSON:
+			type = MAINTENANCE_PERSON;
+			break;
+		case DEPARTMENT:
+			type = MAINTENANCE_DEPARTMENT;
+			break;
+		default:
+			type = MAINTENANCE_COMPANY;
+		}
+		if (StringUtils.isBlank(type)) {
+			return null;
+		}
+		List<Map<String, Object>> dynamicFormList = dynamicFormInstanceService.listAll(type);
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(MaintenanceCompany::getType, maintenanceType.toUpperCase());
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
+		List<MaintenanceCompany> maintenanceCompany = this.list(wrapper);
+
+		Map<Long, MaintenanceCompany> maintenanceCompanyMap = maintenanceCompany.stream()
+				.collect(Collectors.toMap(MaintenanceCompany::getInstanceId, Function.identity()));
+		dynamicFormList.forEach(r -> {
+			MaintenanceCompany detail = maintenanceCompanyMap.get(Long.parseLong(r.get("instanceId").toString()));
+			if (!ObjectUtils.isEmpty(detail)) {
+				if(detail.getParentId()!=null) {
+					MaintenanceCompany map = maintenanceCompanyMapper.selectById(detail.getParentId());
+					r.put("parentName", map.getName());
+				}
+				r.putAll(Bean.BeantoMap(detail));
+			}
+		});
+		return dynamicFormList;
+		
+	}
+
+	@Override
+	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel() {
+		List<Map<String, Object>> list = this.getAllMaintenanceList(PERSON);
+		return JSONArray.parseArray(JSONArray.toJSONString(list), MaintenancePersonExcleDto.class);
+
+	}
+
+	/**
+	 * 维保单位人员信息分頁信息显示时的字段过滤
+	 * 
+	 * @param current
+	 * @param size
+	 * @param list
+	 * @param arrayType
+	 * @return
+	 */
+	public IPage<Map<String, Object>> getLegalList(int current, int size, IPage<Map<String, Object>> list,
+			String[] arrayType) {
+		List<Map<String, Object>> returnlist = new ArrayList<Map<String, Object>>();
+		Map<String, Object> legalMap = null;
+		for (Map<String, Object> map : list.getRecords()) {
+			legalMap = new HashMap<String, Object>();
+			for (Entry<String, Object> m : map.entrySet()) {
+				if (Arrays.asList(arrayType).contains(m.getKey())) {
+					legalMap.putAll(map);
+				}
+			}
+			returnlist.add(legalMap);
+		}
+		Page<Map<String, Object>> pegaIPage = new Page<Map<String, Object>>();
+		pegaIPage.setCurrent(current);
+		pegaIPage.setSize(size);
+		pegaIPage.setRecords(returnlist);
+		return pegaIPage;
+	}
+
+	@Override
+	public IPage<Map<String, Object>> getPageMaintenanceList(Map<String, Object> paramsMap) {
+		if (!paramsMap.containsKey("current") && !paramsMap.containsKey("size")) {
+			return null;
+		}
+		if (!paramsMap.containsKey("maintenanceType")) {
+			return null;
+		}
+		int current = Integer.parseInt(paramsMap.get("current").toString());
+		int size = Integer.parseInt(paramsMap.get("size").toString());
+		String maintenanceType = paramsMap.get("maintenanceType").toString().toUpperCase();
+		Map<String, String> filedParamsMap = null;
+
+		List<MaintenanceCompany> mainTableList;
+		String type;
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
+		switch (maintenanceType) {
+		case PERSON:
+			type = MAINTENANCE_PERSON;
+			filedParamsMap = new HashMap<>();
+			if (paramsMap.containsKey("status")) {
+				filedParamsMap.put("status", paramsMap.get("status").toString());
+			}
+			mainTableList = this.checkMaintenanceCompanyList(wrapper, paramsMap);
+			List<Long> instanceIds = Lists.transform(mainTableList, MaintenanceCompany::getInstanceId);
+			filedParamsMap.put("instanceIds", Joiner.on(",").join(instanceIds));
+			break;
+		case COMPANY:
+			type = MAINTENANCE_COMPANY;
+			wrapper.eq(MaintenanceCompany::getType, maintenanceType.toUpperCase());
+			mainTableList = this.list(wrapper);
+			break;
+		case DEPARTMENT:
+			type = MAINTENANCE_DEPARTMENT;
+			wrapper.eq(MaintenanceCompany::getType, maintenanceType.toUpperCase());
+			mainTableList = this.list(wrapper);
+			break;
+		default:
+			throw new IllegalStateException("Unexpected maintenanceType: " + maintenanceType);
+		}
+		if (StringUtils.isBlank(type)) {
+			return null;
+		}
+		IPage<Map<String, Object>> page = dynamicFormInstanceService.pageList(current, size, type, filedParamsMap);
+
+		Map<Long, MaintenanceCompany> maintenanceCompanyMap = mainTableList.stream()
+				.collect(Collectors.toMap(MaintenanceCompany::getInstanceId, Function.identity()));
+
+		page.getRecords().forEach(r -> {
+			MaintenanceCompany detail = maintenanceCompanyMap.get(Long.parseLong(r.get("instanceId").toString()));
+			if (!ObjectUtils.isEmpty(detail)) {
+				r.putAll(Bean.BeantoMap(detail));
+			}
+		});
+		return page;
+	}
+
+	public List<MaintenanceCompany> checkMaintenanceCompanyList(LambdaQueryWrapper<MaintenanceCompany> wrapper,
+			Map<String, Object> paramsMap) {
+		if (paramsMap.containsKey("name")) {
+			wrapper.like(MaintenanceCompany::getName, paramsMap.get("name").toString());
+		}
+		if (paramsMap.containsKey("parentId") && !"-1".equals(paramsMap.get("parentId"))) {
+			Long parentId = Long.parseLong(paramsMap.get("parentId").toString());
+			MaintenanceCompany company = getOne(
+					new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getSequenceNbr, parentId));
+			wrapper.likeRight(MaintenanceCompany::getCode, company.getCode());
+		}
+		wrapper.eq(MaintenanceCompany::getType, PERSON);
+
+		return maintenanceCompanyMapper.selectList(wrapper);
+	}
+
+	@Override
+	public Map<String, Object> findBySequenceNbr(Long sequenceNbr) {
+		MaintenanceCompany maintenanceCompany = maintenanceCompanyMapper.selectById(sequenceNbr);
+		String type;
+		switch (maintenanceCompany.getType()) {
+		case PERSON:
+			type = MAINTENANCE_PERSON;
+			break;
+		case DEPARTMENT:
+			type = MAINTENANCE_DEPARTMENT;
+			break;
+		default:
+			type = MAINTENANCE_COMPANY;
+		}
+		Map<String, Object> mainMap = Bean.BeantoMap(maintenanceCompany);
+		Map<String, Object> dynamicMap = dynamicFormInstanceService.getOneMap(maintenanceCompany.getInstanceId(), type);
+		mainMap.put("attachments", getAttachments(maintenanceCompany.getSequenceNbr()));
+		mainMap.put("dynamicFormValue", dynamicMap);
+		return mainMap;
+	}
+
+	private Map<String, List<AttachmentDto>> getAttachments(Long sequenceNbr) {
+		Map<String, List<AttachmentDto>> attachmentMap = Maps.newHashMap();
+		List<SourceFile> sourceFileList = sourceFileService.findBySourceId(sequenceNbr);
+		if (!ValidationUtil.isEmpty(sourceFileList)) {
+			List<AttachmentDto> attachmentList = sourceFile2AttachmentList(sourceFileList);
+			attachmentMap = attachmentList.stream().collect(Collectors.groupingBy(AttachmentDto::getType));
+		}
+		return attachmentMap;
+	}
+
+	private List<AttachmentDto> sourceFile2AttachmentList(List<SourceFile> sourceFileList) {
+		List<AttachmentDto> attachmentDtoList = Lists.newArrayList();
+		if (!ValidationUtil.isEmpty(sourceFileList)) {
+			sourceFileList.forEach(s -> {
+				AttachmentDto a = new AttachmentDto();
+				a.setName(s.getFileName());
+				a.setUrl(s.getFilePath());
+				a.setType(s.getFileCategory());
+				attachmentDtoList.add(a);
+			});
+		}
+		return attachmentDtoList;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean updateMaintenanceCompanyDetail(MaintenanceCompany model) {
+		// 先刪除，后添加
+		return updateMaintenanceDetail(model, COMPANY);
+	}
+
+	public boolean updateMaintenanceDetail(MaintenanceCompany model, String type) {
+		MaintenanceCompanyDto maintenanceCompany = this.queryBySeq(model.getSequenceNbr());
+		try {
+			if (maintenanceCompany != null) {
+				dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>()
+						.eq(DynamicFormInstance::getInstanceId, maintenanceCompany.getInstanceId()));
+			}
+			this.updateDetail(model, type);
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+	public boolean updateDetail(MaintenanceCompany model, String type) {
+		// 将数据先存入扩展表操作service提供的公共保存方法，以便拿到对应的instanceId
+		Long instanceId = saveDynamicFormList(model);
+		// 拿到instanceId之后进行往主表中插入数据
+		model.setInstanceId(instanceId);
+		model.setType(type);
+		try {
+			this.updateById(model);
+
+			// 更新附件
+			saveAttachments(model);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean updateMaintenancePersonDetail(MaintenanceCompany model) {
+		return updateMaintenanceDetail(model, PERSON);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean updateMaintenanceDepartmentDetail(MaintenanceCompany model) {
+		return updateMaintenanceDetail(model, DEPARTMENT);
+	}
+
+	@Override
+	public List<MaintenanceCompany> getCompanyAndDepartmentTree() {
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.select(MaintenanceCompany::getSequenceNbr, MaintenanceCompany::getName, MaintenanceCompany::getCode,
+				MaintenanceCompany::getType, MaintenanceCompany::getBizCode, MaintenanceCompany::getParentId);
+		wrapper.eq(MaintenanceCompany::getIsDelete, 0);
+		wrapper.in(MaintenanceCompany::getType, Arrays.asList(COMPANY, DEPARTMENT));
+		List<MaintenanceCompany> list = maintenanceCompanyMapper.selectList(wrapper);
+		if (list == null) {
+			return new ArrayList<>();
+		}
+		list = list.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
+		return list;
+	}
+
+	@Override
+	public List<MaintenanceCompany> getDepartmentAndPersonTree(long sequenceNbr) {
+		// List<MaintenanceCompany> departmentAllList =new
+		// ArrayList<MaintenanceCompany>();
+		List<MaintenanceCompany> departmentList = getDepartmentList(sequenceNbr);
+		// departmentAllList.addAll(departmentList);
+//		departmentAllList = getDepartmentAllList(departmentAllList,departmentList);
+//		for (MaintenanceCompany map : departmentList) {
+//			Long departmentSequenceNbr=map.getSequenceNbr();
+//			departmentAllList.addAll(getPersonList(departmentSequenceNbr));
+//		}
+//		if (departmentAllList == null) {
+//			return new ArrayList<>();
+//		}
+//		departmentAllList = departmentAllList.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
+//		return departmentAllList;
+		if (departmentList == null) {
+			return new ArrayList<>();
+		}
+		return departmentList.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
+	}
+//	public List<MaintenanceCompany> getDepartmentAllList(List<MaintenanceCompany> departmentAllList,List<MaintenanceCompany> departmentList){
+//		for (MaintenanceCompany map : departmentList) {
+//			long chrildSequenceNbr=map.getSequenceNbr();
+//			List<MaintenanceCompany> chrlidList=	getDepartmentList(chrildSequenceNbr);
+//			if(chrlidList.size()>0) {
+//				departmentAllList.addAll(chrlidList);
+//				getDepartmentAllList(departmentAllList,chrlidList);
+//			}
+//		}
+//		return departmentAllList;
+//	}
+
+	@Override
+	public List<MaintenanceCompany> getDepartmentList(long sequenceNbr) {
+		MaintenanceCompany companyDetail = maintenanceCompanyMapper.selectById(sequenceNbr);
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.select(MaintenanceCompany::getSequenceNbr, MaintenanceCompany::getName, MaintenanceCompany::getCode,
+				MaintenanceCompany::getType, MaintenanceCompany::getBizCode, MaintenanceCompany::getParentId);
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
+		wrapper.in(MaintenanceCompany::getType, Arrays.asList(PERSON, DEPARTMENT));
+		wrapper.likeRight(MaintenanceCompany::getCode, companyDetail.getCode());
+		List<MaintenanceCompany> maintenanceCompanyList = maintenanceCompanyMapper.selectList(wrapper);
+		return maintenanceCompanyList;
+	}
+
+	public List<MaintenanceCompany> getPersonList(long sequenceNbr) {
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
+		wrapper.select(MaintenanceCompany::getSequenceNbr, MaintenanceCompany::getName, MaintenanceCompany::getCode,
+				MaintenanceCompany::getType, MaintenanceCompany::getBizCode, MaintenanceCompany::getParentId);
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
+		wrapper.eq(MaintenanceCompany::getType, PERSON);
+		wrapper.eq(MaintenanceCompany::getParentId, sequenceNbr);
+		return maintenanceCompanyMapper.selectList(wrapper);
+	}
+
+	/**
+	 * 根据维保单位查询所有机场单位(返回List<Map>类型) 不带分页
+	 * 
+	 * @param seq
+	 * @return
+	 */
+	public List<Map<String, Object>> queryOrgUsrMsg(Long seq) {
+		if (ValidationUtil.isEmpty(this.queryBySeq(seq))) {
+			throw new BadRequest("参数校验失败.");
+		} else {
+			List<Map<String, Object>> companys = new ArrayList<>();
+			// 机场单位列表基本信息
+			List<OrgUsrDto> orgUsrDtos = this.baseMapper.selectOrgUsrList(seq);
+			// 机场组装单位动态表单数据
+			orgUsrDtos.forEach(orgUsrDto -> {
+				Map<String, Object> map = Bean.BeantoMap(orgUsrDto);
+				mapCopy(dynamicFormInstanceService.getOneMap(orgUsrDto.getSequenceNbr(), OrgPersonEnum.公司.getKey()),
+						map);
+
+				companys.add(map);
+			});
+			return companys;
+		}
+	}
+
+	/**
+	 * 根据维保单位查询所有机场单位(返回List<Map>类型) 带分页
+	 * 
+	 * @param pageNum
+	 * @param pageSize
+	 * @param seq
+	 * @param amosUserId
+	 * @return
+	 */
+	public Page<Map<String, Object>> queryOrgUsrMsgPage(int pageNum, int pageSize, Long seq, String amosUserId) {
+		MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
+		if (ValidationUtil.isEmpty(seq)) {
+			maintenanceCompany = getMaintenanceCompany(amosUserId);
+		}
+		// 机场单位列表基本信息
+		if (pageNum == -1 || pageSize == -1) {
+			pageSize = Integer.MAX_VALUE;
+		}
+		Page page = new Page(pageNum, pageSize);
+		Page<Map<String, Object>> companys = new Page<>(pageNum, pageSize);
+		Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, maintenanceCompany.getSequenceNbr());
+		List<Map<String, Object>> finalResultMap = Lists.newArrayList();
+		// 机场组装单位动态表单数据
+		pageResult.getRecords().forEach(orgUsrDto -> {
+			Map<String, Object> map = Bean.BeantoMap(orgUsrDto);
+			mapCopy(dynamicFormInstanceService.getOneMap(orgUsrDto.getSequenceNbr(), OrgPersonEnum.公司.getKey()), map);
+			finalResultMap.add(map);
+		});
+		companys.setRecords(finalResultMap);
+		companys.setTotal(pageResult.getTotal());
+		companys.setPages(pageResult.getPages());
+		return companys;
+	}
+
+	/**
+	 * 根据平台用户id查询登陆人所属维保单位
+	 *
+	 * @param amosUserId
+	 * @return
+	 */
+	public MaintenanceCompany getMaintenanceCompany(String amosUserId) {
+		MaintenanceCompany maintenanceCompany;
+		DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
+				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
+						.eq(DynamicFormInstance::getFieldValue, amosUserId));
+		if (ValidationUtil.isEmpty(dyFormInstance)) {
+			throw new BadRequest("维保账号不存在或未关联系统账号.");
+		}
+		MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
+				.eq(MaintenanceCompany::getInstanceId, dyFormInstance.getInstanceId()));
+		maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
+				.eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
+		if (ValidationUtil.isEmpty(maintenanceCompany)) {
+			throw new BadRequest("维保账号不存在或未关联系统账号.");
+		}
+		return maintenanceCompany;
+	}
+
+	public List<Map<String, Object>> queryCompanyMsg() {
+		List<Map<String, Object>> companysMsg = new ArrayList<>();
+		// 查询所有维保单位信息
+		List<MaintenanceCompany> lists = this.list();
+		lists.forEach(list -> {
+			Map<String, Object> maintenanceCompany = new HashMap<>();
+			maintenanceCompany.put("id", list.getSequenceNbr());
+			maintenanceCompany.put("code", list.getCode());
+			maintenanceCompany.put("name", list.getName());
+			maintenanceCompany.put("type", 1);
+			maintenanceCompany.put("parentId", null);
+			// 查询该维保单位下的业主信息
+			List<OrgUsrDto> orgUsrDtos = this.baseMapper.selectOrgUsrList(list.getSequenceNbr());
+			orgUsrDtos.forEach(orgUsrDto -> {
+				Map<String, Object> airCompany = new HashMap<>();
+				airCompany.put("id", orgUsrDto.getSequenceNbr());
+				airCompany.put("code", orgUsrDto.getBizOrgCode());
+				airCompany.put("name", orgUsrDto.getBizOrgName());
+				airCompany.put("type", 2);
+				airCompany.put("parentId", list.getSequenceNbr());
+				companysMsg.add(airCompany);
+			});
+			companysMsg.add(maintenanceCompany);
+		});
+		return companysMsg;
+	}
+
+	/**
+	 * 复制map对象
+	 * 
+	 * @explain 将paramsMap中的键值对全部拷贝到resultMap中；
+	 * @param paramsMap 被拷贝对象
+	 * @param resultMap 拷贝后的对象
+	 */
+	private static void mapCopy(Map paramsMap, Map resultMap) {
+		if (resultMap == null) {
+			return;
+		}
+		if (paramsMap == null) {
+			return;
+		}
+		Iterator it = paramsMap.entrySet().iterator();
+		while (it.hasNext()) {
+			Map.Entry entry = (Map.Entry) it.next();
+			Object key = entry.getKey();
+			resultMap.put(key, paramsMap.get(key) != null ? paramsMap.get(key) : "");
+		}
+	}
+
+	@Override
+	public List<DynamicFormInstance> maintenancePersonExcleDtoToDynamicFormInstanceList(List<DynamicFormColumn> columns,
+			MaintenancePersonExcleDto maintenancePersonExcleDto, long instanceId, List<DynamicFormInstance> list) {
+
+		Map<String, Object> maintenancePersonExcleDtoMap = Bean.BeantoMap(maintenancePersonExcleDto);
+		// 填充动态表单的属性
+
+		columns.stream().forEach(item -> {
+			if (maintenancePersonExcleDtoMap.containsKey(item.getFieldCode())) {
+				DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
+				String valueString = maintenancePersonExcleDtoMap.get(item.getFieldCode()).toString();
+				Bean.copyExistPropertis(item, dynamicFormInstance);
+
+				dynamicFormInstance.setAppKey(RequestContext.getAppKey());
+				dynamicFormInstance.setInstanceId(instanceId);
+				dynamicFormInstance.setSequenceNbr(sequence.nextId());
+				dynamicFormInstance.setFormColumnId(item.getSequenceNbr());
+				dynamicFormInstance.setFieldValue(maintenancePersonExcleDtoMap.get(item.getFieldCode()) != null
+						? maintenancePersonExcleDtoMap.get(item.getFieldCode()).toString()
+						: "");
+				if (valueString.contains("@")) {
+					String[] mapDetailArray = valueString.split("@");
+					dynamicFormInstance.setFieldValue(mapDetailArray[0]);
+					if (mapDetailArray.length > 1) {
+						dynamicFormInstance.setFieldValueLabel(mapDetailArray[1]);
+					}
+				}
+				if (dynamicFormInstance != null && dynamicFormInstance.getSequenceNbr().longValue() > 0) {
+					list.add(dynamicFormInstance);
+				}
+			}
+
+		});
+
+		return list;
+	}
+
+	public boolean saveDynamicFormInstanceBatch(List<DynamicFormInstance> list) {
+		dynamicFormInstanceService.saveBatch(list);
+		return false;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean saveMaintenanceCompanyBatch(List<MaintenanceCompany> companyList, List<DynamicFormInstance> list) {
+		saveDynamicFormInstanceBatch(list);
+		this.saveBatch(companyList);
+		return false;
+	}
+
+	/**
+	 * 查询当前登陆用户所在维保单位下的维保人员列表部门列表,不分页
+	 *
+	 * @param companyId
+	 * @param userId
+	 * @return
+	 */
+	public List<Map<String, Object>> getPersonListByCompanyId(Long companyId, String userId) {
+		MaintenanceCompany company;
+		if (ValidationUtil.isEmpty(companyId)) {
+			company = getMaintenanceCompany(userId);
+			if (ValidationUtil.isEmpty(company)) {
+				throw new BadRequest("用户不存在");
+			}
+		} else {
+			company = this.getById(companyId);
+		}
+		// 查询公司下人列表
+		List<MaintenanceCompany> personList = list(new LambdaQueryWrapper<MaintenanceCompany>()
+				.eq(MaintenanceCompany::getIsDelete, false).eq(MaintenanceCompany::getType, PERSON)
+				.likeRight(MaintenanceCompany::getCode, company.getCode()));
+		List<Long> instanceIdList = Lists.transform(personList, MaintenanceCompany::getInstanceId);
+		// 查询手机号
+		List<DynamicFormInstance> dynamicFormInstanceList = dynamicFormInstanceService
+				.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "tel")
+						.in(DynamicFormInstance::getInstanceId, instanceIdList));
+		Map<Long, List<DynamicFormInstance>> dyMap = dynamicFormInstanceList.stream()
+				.collect(Collectors.groupingBy(DynamicFormInstance::getInstanceId));
+		List<Map<String, Object>> resultList = Lists.newArrayList();
+		personList.forEach(person -> {
+			Map<String, Object> map = Maps.newHashMap();
+			map.put("sequenceNbr", person.getSequenceNbr());
+			map.put("name", person.getName());
+			map.put("tel", dyMap.get(person.getInstanceId()).get(0).getFieldValue());
+			resultList.add(map);
+		});
+		return resultList;
+	}
 }
\ No newline at end of file

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

@@ -14,6 +14,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,17 +27,6 @@ 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.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -133,13 +123,26 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			parentId = !ObjectUtils.isEmpty(PARENTIDMethodNameme.invoke(entity))
 					? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)))
 					: null;
-
-			if (parentId == null || topId == parentId) {
+//			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);
+//				resultList.add(menu);
+//			}
+			/*	*******************topId与parentId的等值判断，修改人陈浩 on 2021/07/21---start******************************/
+			if (parentId == null ) {//topId与parentId的等值判断，修改人陈浩 on 2021/07/21
 				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);
-			}
+			} else if(topId !=null && 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)), false);
+					resultList.add(menu);
+				}
+			/*	*******************topId与parentId的等值判断，修改人陈浩 on 2021/07/21---end******************************/
 		}
 		// 获取每个顶层元素的子数据集合
 		for (OrgMenuDto entity : resultList) {
@@ -713,6 +716,31 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return personResult;
 	}
 
+
+
+
+
+	@Override
+	public List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData) {
+		if (null == pageNum || null == pageSize) {
+			pageNum = 1;
+			pageSize = Integer.MAX_VALUE;
+		} else {
+			pageNum = (pageNum - 1) * pageSize;
+		}
+		return orgUsrMapper.listContractDto(pageNum, pageSize, requestData);
+	}
+
+	@Override
+	public Integer listContractDtoCount(RequestData par) {
+		return orgUsrMapper.listContractDtoCount( par);
+	}
+
+
+
+
+
+
 	public static String getOrgCodeStr() {
 		int length = 6;
 		String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

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

@@ -52,7 +52,8 @@ public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile
      * @Date 2020/12/18 14:12
      */
     public List<SourceFile> findBySourceId(Long sourceId) {
-        List<SourceFile> sourceFiles = this.list(new LambdaQueryWrapper<SourceFile>().eq(SourceFile::getSourceId, sourceId));
+        List<SourceFile> sourceFiles = this.list(new LambdaQueryWrapper<SourceFile>().eq(SourceFile::getSourceId,
+                sourceId));
         Optional.ofNullable(sourceFiles).orElseThrow(() -> new BadRequest("所属文件为空"));
         return sourceFiles;
     }
@@ -65,10 +66,10 @@ public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile
      */
     @Transactional(rollbackFor = Exception.class)
     public List<SourceFile> saveSourceFile(Long sourceId, List<SourceFile> sourceFiles) {
+        this.baseMapper.delete(new LambdaQueryWrapper<SourceFile>().eq(SourceFile::getSourceId, sourceId));
         if (CollectionUtils.isEmpty(sourceFiles)) {
             return new ArrayList<>();
         }
-        this.baseMapper.delete(new LambdaQueryWrapper<SourceFile>().eq(SourceFile::getSourceId, sourceId));
         sourceFiles.forEach(s -> {
             s.setSourceId(sourceId);
         });

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -52,8 +53,12 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
     public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page,
                                                             @Condition(Operator.like) String name,
                                                             @Condition(Operator.eq) String resourceType,
+                                                            @Condition(Operator.in) ArrayList<Long> belongBuildingId,
+                                                            @Condition(Operator.eq) Long belongFightingSystemId,
+                                                            @Condition(Operator.eq) Long sequenceNbr,
                                                             @Condition(Operator.eq) Boolean isDelete) {
-        return this.queryForPage(page, null, false, name, resourceType, isDelete);
+        return this.queryForPage(page, null, false, name, resourceType, belongBuildingId, belongFightingSystemId,
+                sequenceNbr, isDelete);
     }
 
     /**
@@ -225,7 +230,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
         return waterResourceDto;
     }
 
-    public List<WaterResourceDto> getWaterResourceTypeList() {
-        return waterResourceMapper.getWaterResourceTypeList();
+    public List<WaterResourceTypeDto> getWaterResourceTypeList(Boolean isDelete) {
+        return waterResourceMapper.getWaterResourceTypeList(isDelete);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/utils/MyException.java

+package com.yeejoin.amos.boot.module.common.biz.utils;
+
+
+import java.io.Serializable;
+
+import com.yeejoin.amos.boot.module.common.api.enums.ExceptionEnum;
+/**
+ * 自定义异常处理类
+ * @author chenhao
+ *
+ */
+public class MyException extends Exception implements Serializable{
+     
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	private ExceptionEnum exceptionEnum;
+	
+	private String detail;
+	
+	protected String devMessage;
+	
+	public MyException(ExceptionEnum exceptionEnum, String detail) {
+		this.exceptionEnum =exceptionEnum;
+		this.detail= detail;
+		this.devMessage=getDevMessage();
+	}
+	
+	public MyException(ExceptionEnum exceptionEnum) {
+		this.exceptionEnum =exceptionEnum;
+		this.devMessage=getDevMessage();
+	}
+	
+	public ExceptionEnum getExceptionEnum() {
+		return exceptionEnum;
+	}
+	
+	public void setExceptionEnum(ExceptionEnum exceptionEnum) {
+		this.exceptionEnum = exceptionEnum;
+	}
+	
+	public String getDetail() {
+		return detail;
+	}
+	
+	public void setDetail(String detail) {
+		this.detail = detail;
+	}
+	
+	public String getDevMessage() {
+		return "error";
+	}
+	
+	public void setDevMessage(String devMessage) {
+		this.devMessage = devMessage;
+	}
+	
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java

@@ -46,7 +46,7 @@ public class ControllerAop {
     @Autowired
     private RedisUtils redisUtils;
 
-    @Pointcut("execution(public * com.yeejoin.amos.boot.module.*jcs.biz.controller..*(..))")
+    @Pointcut("execution(public * com.yeejoin.amos.boot.module.*.biz.controller..*(..))")
     public void userCache() {
 
     }

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

@@ -170,7 +170,7 @@ public class AlertCalledController extends BaseController {
      * 相似警情分页查询
      * </pre>
      *
-     * @param alertCalled
+     * @param 
      * @param current
      * @param size
      * @return

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

@@ -3,22 +3,16 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.excel.support.ExcelTypeEnum;
-import com.google.common.collect.Lists;
-import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-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.biz.service.IDutyPersonService;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.*;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.EquipmentServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -26,19 +20,72 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+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.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
+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.dto.FireExpertsDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
+import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
+import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
+import com.yeejoin.amos.boot.module.common.biz.service.IDutyPersonService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyCarServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyCommonServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyPersonServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyPersonShiftServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyShiftServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireChemicalServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
 import com.yeejoin.amos.boot.module.jcs.api.enums.ExcelEnums;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AircraftServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.EquipmentServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -88,8 +135,20 @@ public class ExcelController extends BaseController {
     OrgUsrServiceImpl orgUsrService;
     @Autowired
     IDutyPersonService iDutyPersonService;
+    
+    @Autowired
+	IMaintenanceCompanyService maintenanceCompanyService;
+    
+    @Autowired
+    DynamicFormColumnServiceImpl dynamicFormColumnService;
+    
+    @Autowired
+	Sequence sequence;
 
     private static final String NOT_DUTY = "休班";
+    private static final String PERSON = "PERSON";
+    
+    private static final String MAINTENANCE_PERSON = "maintenancePerson";
 
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -149,6 +208,11 @@ public class ExcelController extends BaseController {
                     ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
                             firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
                     break;
+                case ExcelEnums.WBRY:
+                    List<MaintenancePersonExcleDto> maintenancePersonExcleDtoList = maintenanceCompanyService.exportToMaintenancePersonExcel();
+                    ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
+                    		maintenancePersonExcleDtoList, MaintenancePersonExcleDto.class, null, false);
+                    break;
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -189,14 +253,51 @@ public class ExcelController extends BaseController {
                     break;
                 case ExcelEnums.RYZB:
                     excelImportDutyPerson(multipartFile, ExcelEnums.RYZB);
+                case ExcelEnums.WBRY:
+                    excelImportMaintenancePerson(multipartFile, ExcelEnums.WBRY);
             }
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("系统异常！");
         }
     }
-
-    private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType) throws Exception {
+    /**
+     * @author chenhao 
+     * @param multipartFile
+     * @param wbry
+     * @throws Exception 
+     */
+    private void excelImportMaintenancePerson(MultipartFile multipartFile, String wbry) throws Exception {
+          List<MaintenancePersonExcleDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
+        		  MaintenancePersonExcleDto.class, 1);
+          List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, MAINTENANCE_PERSON));
+          List<MaintenanceCompany> maintenanceCompanyList = new ArrayList<MaintenanceCompany>();
+          List<DynamicFormInstance> dynamicFormInstanceList = new ArrayList<DynamicFormInstance>();
+          for (MaintenancePersonExcleDto maintenancePersonExcleDto : excelDtoList) {
+        	  Long instanceId = sequence.nextId();
+        	// 先填充主表的属性
+      		MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
+      		maintenanceCompany = Bean.toPo(maintenancePersonExcleDto, maintenanceCompany);
+      		maintenanceCompany.setType(PERSON);
+      		if (maintenanceCompany.getParentId() != null) {
+      			long getParentId = Long.valueOf(maintenancePersonExcleDto.getParentName().split("@")[1]);
+      			maintenanceCompany.setParentId(getParentId);
+      		}
+      		if (maintenanceCompanyService.checkPersonCodeExists(maintenancePersonExcleDto.getCode())) {
+      			maintenanceCompany.setCode(maintenancePersonExcleDto.getCode());
+      		} else {
+      			maintenanceCompany.setCode(null);
+      		}
+      		maintenanceCompany.setOrgCode(null);
+    		maintenanceCompany.setBizCode(sequence.nextId() + "");
+      		maintenanceCompany.setInstanceId(instanceId);
+      		maintenanceCompanyList.add(maintenanceCompany);
+      		maintenanceCompanyService.maintenancePersonExcleDtoToDynamicFormInstanceList(columns,maintenancePersonExcleDto, instanceId, dynamicFormInstanceList);
+		}
+          maintenanceCompanyService.saveMaintenanceCompanyBatch(maintenanceCompanyList,dynamicFormInstanceList);
+	}
+
+	private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType) throws Exception {
 
         String fileName = multipartFile.getOriginalFilename();
         if (fileName == null) {

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

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersInfoDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
@@ -262,18 +263,18 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getFirefighters", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
-    public ResponseModel<Page<Firefighters>> getFirefighters(Integer pageNum, Integer pageSize,
+    public ResponseModel<Page<FirefightersZhDto>> getFirefighters(Integer pageNum, Integer pageSize,
                                                              FirefightersDto firefighters) {
         //条件分页
         if (null == pageNum || null == pageSize) {
             pageNum = 1;
             pageSize = Integer.MAX_VALUE;
         }
-        List<Firefighters> list = iFirefightersService.getFirefighters((pageNum - 1) * pageSize, pageSize,
+        List<FirefightersZhDto> list = iFirefightersService.getFirefighters((pageNum - 1) * pageSize, pageSize,
                 firefighters);
         Map<String, Long> num = iFirefightersService.getFirefightersCount((pageNum - 1) * pageSize, pageSize,
                 firefighters);
-        Page<Firefighters> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
+        Page<FirefightersZhDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
         pageBean.setRecords(list);
         return ResponseHelper.buildResponse(pageBean);
     }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -10,16 +11,16 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.TemplateMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
@@ -36,10 +37,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -77,17 +75,19 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
 	@Autowired
 	TemplateMapper templateMapper;
-
-
+	@Autowired
+	PowerTransferMapper powerTransferMapper;
+	@Autowired
+	AlertSubmittedMapper alertSubmittedMapper;
 	/**
 	 *
 	 * 指挥系统 未结束的警情列表
 	 *
 	 * **/
 	@Override
-	public List<AlertCalledZhDto> alertCalledListByAlertStatus(String address) {
+	public List<AlertCalledZhDto> alertCalledListByAlertStatus( RequestData par) {
 
-		List<AlertCalledZhDto> list = alertCalledMapper.alertCalledListByAlertStatus(address);
+		List<AlertCalledZhDto> list = alertCalledMapper.alertCalledListByAlertStatus(par);
 		return list;
 
 	}
@@ -100,7 +100,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 	public Object selectAlertCalledById(Long id) {
 		if(redisUtils.hasKey(RedisKey.ALERTCALLED_ID+id)){
 			Object obj= redisUtils.get(RedisKey.ALERTCALLED_ID+id);
-			return ResponseHelper.buildResponse(obj);
+			return obj;
 		}else{
 			// 警情基本信息
 			AlertCalled alertCalled = this.getById(id);
@@ -118,7 +118,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 			AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalled, formValue);
 
 			redisUtils.set(RedisKey.ALERTCALLED_ID+id, JSON.toJSON(alertCalledFormVo),time);
-			return ResponseHelper.buildResponse(alertCalledFormVo);
+			return alertCalledFormVo;
 		}
 	}
 
@@ -339,4 +339,70 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 		}
 		return StringUtils.replaceEach(tempContent, keys, strList.toArray(new String[strList.size()]));
 	}
+	@Override
+	public    Map<String,Object>   selectAlertCalledKeyValueLabelById(Long id) {
+		
+			// 警情基本信息
+			AlertCalled alertCalled = this.getById(id);			
+			QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
+			Map<String,Object> map=new HashMap();
+		    map.put("title","【"+alertCalled.getAlertType()+"】"+alertCalled.getAddress());
+			queryWrapper.eq("alert_called_id", id);
+			// 警情动态表单数据
+		    List<KeyValueLabel> listdate =new ArrayList<>();
+			List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);			
+			listdate.add(new KeyValueLabel("接警时间","callTime",alertCalled.getCallTime()));
+			listdate.add(new KeyValueLabel("警情地点","address",alertCalled.getAddress()));
+			listdate.add(new KeyValueLabel("警情类型","alertType",alertCalled.getAlertType()));
+			listdate.add(new KeyValueLabel("警情阶段","alertStage",alertCalled.getAlertStage()));
+			listdate.add(new KeyValueLabel("警情等级","responseLevel","无"));
+			listdate.add(new KeyValueLabel("被困人数","trappedNum",alertCalled.getTrappedNum()));
+			listdate.add(new KeyValueLabel("伤亡人数","casualtiesNum",alertCalled.getCasualtiesNum()));
+			listdate.add(new KeyValueLabel("联系人","contactUser",alertCalled.getContactUser()));
+			listdate.add(new KeyValueLabel("联系电话","contactPhone",alertCalled.getContactPhone()));
+			listdate.add(new KeyValueLabel("联系人电话","contactPhone",alertCalled.getContactPhone()));
+		     list.stream().forEach(AlertFormValue->{
+              listdate.add(new KeyValueLabel(AlertFormValue.getFieldName(),AlertFormValue.getFieldCode(), AlertFormValue.getFieldValue()));
+			 });
+		    map.put("data",listdate);
+			return map;
+		
+	}
+	@Override
+	public List<KeyValueLabel> selectAlertCalledcount(Long id) {
+		// 警情基本信息
+		AlertCalled alertCalled = this.getById(id);		
+		
+		List<KeyValueLabel> listdate =new ArrayList<>();
+		listdate.add(new KeyValueLabel("被困人数","trappedNum",alertCalled.getTrappedNum()));
+		listdate.add(new KeyValueLabel("伤亡人数","casualtiesNum",alertCalled.getCasualtiesNum()));
+		return listdate;
+	}
+
+	@Override
+	public List<KeyValueLabel> powercount(Long id) {
+		Map<String,Integer>  map=powerTransferMapper.getCarNum(id);
+//		Map<String,Integer>  mapc=powerTransferMapper.getCompanyNum(id);
+//		Map<String,Integer>  mapu= alertSubmittedMapper.getUseNum(id);
+		//统计参与人员
+		List<KeyValueLabel> listdate =new ArrayList<>();
+		listdate.add(new KeyValueLabel("调动人力","useNum","0","人"));
+		//统计参与车辆
+		listdate.add(new KeyValueLabel("调动人力","carNum",map.get("carNum"),"辆"));
+		//统计参与队伍
+		listdate.add(new KeyValueLabel("调动单位","companyNum",map.get("companyNum"),"个"));
+        return listdate;
+
+	}
+
+	@Override
+	public List<PowerData> getPowerDataList(Long id) {
+		List<PowerData> list=powerTransferMapper.getPowerDataList(id);
+		return list;
+	}
+
+	@Override
+	public AlertCalled getAlertCalledById(Long id) {
+		return this.getById(id);
+	}
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyMapper;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,16 +30,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
@@ -100,6 +86,11 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
     @Autowired
     EquipFeignClient equipFeignClient;
 
+    @Autowired
+    AlertSubmittedMapper alertSubmittedMapper;
+    @Autowired
+    PowerTransferCompanyMapper powerTransferCompanyMapper;
+
     @Override
     public SchedulingReportingDto listSchedulingByParam(AlertSubmittedDto queryParam) {
         SchedulingReportingDto schedulingReportingDto = new SchedulingReportingDto();
@@ -420,6 +411,73 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         return this.baseMapper.getSchedulingContent(id);
     }
 
+    @Override
+    public List<InstructionsZHDto> getInstructionsZHDtoList(Long id) {
+
+        List<InstructionsZHDto> listInstructionsZHDto=new ArrayList<>();
+
+        //获取调派记录
+        List<PowerTransferCompanyZHDto>  listPowerTransferCompanyZHDto=powerTransferCompanyMapper.listPowerTransferCompanyZHDto(id);
+
+        listPowerTransferCompanyZHDto.stream().forEach(PowerTransferCompanyZHDto->{
+            String content="";
+            if(PowerTransferCompanyZHDto.getIsDistributionAgencies()){
+                content="调派"+PowerTransferCompanyZHDto.getCompanyName()+"前往"+PowerTransferCompanyZHDto.getAddress();
+            }else{
+                content="调派"+PowerTransferCompanyZHDto.getCompanyName()+PowerTransferCompanyZHDto.getSubmissionContent()+"前往"+PowerTransferCompanyZHDto.getAddress();
+            }
+             InstructionsZHDto instruct = new InstructionsZHDto(PowerTransferCompanyZHDto.getSequenceNbr(),PowerTransferCompanyZHDto.getDispatchType(), PowerTransferCompanyZHDto.getRecDate(), content);
+            listInstructionsZHDto.add(instruct);
+        });
+
+
+
+        //获取融合调度信息
+        List<AlertSubmittedZHDto>  listAlertSubmittedZHDto= alertSubmittedMapper.listAlertSubmittedZHDto(id);
+
+        listAlertSubmittedZHDto.stream().forEach(AlertSubmittedZHDto->{
+            JSONObject js= JSONObject.parseObject(AlertSubmittedZHDto.getSubmissionContent());
+            String content="";
+
+            switch(AlertSubmittedZHDto.getBusinessType()){
+                case "警情初报":
+
+
+                    content="通知"+ AlertSubmittedZHDto.getCompanyName()+":"+AlertSubmittedZHDto.getUserName()+","+js.getString("address")+"发生"+js.getString("alertType");
+
+                    break;
+                case "警情续报":
+
+                    content="通知"+ AlertSubmittedZHDto.getCompanyName()+":"+AlertSubmittedZHDto.getUserName()+","+"现场被困人数："+js.getString("trappedNum")+"人伤亡人数："+js.getString("casualtiesNum")+"人。";
+
+                    break;
+                case "非警情确认":
+
+                    content="通知"+ AlertSubmittedZHDto.getCompanyName()+":"+AlertSubmittedZHDto.getUserName()+","+"此警情现场确认为假警情。";
+
+                    break;
+                case "警情结案":
+                    content="通知"+ AlertSubmittedZHDto.getCompanyName()+":"+AlertSubmittedZHDto.getUserName()+","+"此警情已完场警情处置，警情已结案。";
+                    break;
+
+                default:
+
+                    break;
+            }
+
+            InstructionsZHDto instruct = new InstructionsZHDto(AlertSubmittedZHDto.getSequenceNbr(),AlertSubmittedZHDto.getBusinessType(), AlertSubmittedZHDto.getSubmissionTime(), content);
+            listInstructionsZHDto.add(instruct);
+
+        });
+
+        //排序时间倒序
+
+        List<InstructionsZHDto>  listA=listInstructionsZHDto.stream().sorted(Comparator.comparing(InstructionsZHDto::getSubmissionTime).reversed()).collect(Collectors.toList());
+
+
+        return listA;
+    }
+
     /**
      * 将Object对象里面的属性和值转化成Map对象
      *

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

@@ -8,13 +8,16 @@ import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireTeamListDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.ExcelSelectData;
 import com.yeejoin.amos.boot.module.common.api.excel.DataSources;
 import com.yeejoin.amos.boot.module.common.api.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
@@ -48,7 +51,9 @@ public class DataSourcesImpl implements DataSources {
     @Autowired
     EquipFeignClient equipFeignClient;
 
-
+    @Autowired
+	IMaintenanceCompanyService maintenanceCompanyService;
+    
     @Autowired
     private RestTemplate restTemplate;
 
@@ -104,6 +109,8 @@ public class DataSourcesImpl implements DataSources {
                 case "getCarList":
                     str = getCarList();
                     break;
+                case "getCompanyAndDeparementTree":
+                	str= getCompanyAndDeparementTree();
             }
         }
         return str;
@@ -152,7 +159,7 @@ public class DataSourcesImpl implements DataSources {
     }
 
     private String[] getFirefighters() {
-        List<Firefighters> firefighters = firefightersService.getFirefighters(1, Integer.MAX_VALUE,
+        List<FirefightersZhDto> firefighters = firefightersService.getFirefighters(1, Integer.MAX_VALUE,
                 new FirefightersDto());
         List<String> names = firefighters.stream().map(item -> {
             return item.getName() + "@" + item.getSequenceNbr();
@@ -209,5 +216,14 @@ public class DataSourcesImpl implements DataSources {
         String[] str = names.toArray(new String[names.size()]);
         return str;
     }
-
+  private String[] getCompanyAndDeparementTree() throws Exception {
+	  List<OrgMenuDto> menus = orgUsrService.getTree(null,
+				maintenanceCompanyService.getCompanyAndDepartmentTree(), MaintenanceCompany.class.getName(),
+				"getSequenceNbr", 2, "getName", "getParentId", "getType");
+	  List<String> stringList = new ArrayList<String>();
+      initCompanyList(menus, stringList);
+      String[] str = stringList.toArray(new String[stringList.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/EquipmentServiceImpl.java

@@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.FireSystemDto;
 import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
@@ -86,7 +87,7 @@ public class EquipmentServiceImpl {
         MenuFrom fireSystem = new MenuFrom("-1", "其他系统", "0", "0");
         fireSystemDtoList.add(fireSystem);
         // 获取消防水源类型列表，包含消防系统和消防水源类型，去重
-        List<WaterResourceDto> waterResourceTypeList = waterResourceServiceImpl.getWaterResourceTypeList();
+        List<WaterResourceTypeDto> waterResourceTypeList = waterResourceServiceImpl.getWaterResourceTypeList(true);
 
         // 组装消防水资源树
         fireSystemDtoList.forEach(item -> {

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -23,11 +24,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
@@ -70,6 +66,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     @Autowired
     FireTeamServiceImpl fireTeamService;
 
+    @Autowired
+    PowerTransferMapper powerTransferMapper;
     @Override
     public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
         List<PowerTransferCompanyResourcesDto> powerTransferList =
@@ -183,6 +181,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         return fireBrigadeResourceList;
     }
 
+
+
     private List<PowerTransferCompanyResources> DtoEntityBatchConvert(List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList, Long powerTransferCompanySequenceNbr) {
         ArrayList<PowerTransferCompanyResources> powerTransferCompanyResourcesList = new ArrayList<>();
         PowerTransferCompanyResources powerTransferCompanyResources;
@@ -319,4 +319,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 
         return transferInfo;
     }
+
+    @Override
+    public List<PowerCompanyCountDto> getPowerCompanyCountDtocount(Long id) {
+        List<PowerCompanyCountDto> list= powerTransferMapper.getPowerCompanyCountDtocount(id);
+        if(list!=null&&list.size()>0){
+            list.stream().forEach(powerCompanyCountDto->{
+                List<PowerCarCountDto> li= powerTransferMapper.getPowerCarCountDtocount(id,powerCompanyCountDto.getCompanyId());
+                powerCompanyCountDto.setPowerCarCountDto(li);
+            });
+        }
+        return list;
+    }
 }

amos-boot-tzs-system/.factorypath

+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-boot-starter/2.0.7/knife4j-spring-boot-starter-2.0.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-boot-autoconfigure/2.0.7/knife4j-spring-boot-autoconfigure-2.0.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring/2.0.7/knife4j-spring-2.0.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-annotations/2.0.7/knife4j-annotations-2.0.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-core/2.0.7/knife4j-core-2.0.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-models/1.5.22/swagger-models-1.5.22.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-swagger2/2.10.5/springfox-swagger2-2.10.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spi/2.10.5/springfox-spi-2.10.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-core/2.10.5/springfox-core-2.10.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/net/bytebuddy/byte-buddy/1.10.22/byte-buddy-1.10.22.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-schema/2.10.5/springfox-schema-2.10.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-swagger-common/2.10.5/springfox-swagger-common-2.10.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-web/2.10.5/springfox-spring-web-2.10.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/classgraph/classgraph/4.1.7/classgraph-4.1.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-bean-validators/2.10.5/springfox-bean-validators-2.10.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/springfox/springfox-spring-webmvc/2.10.5/springfox-spring-webmvc-2.10.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/xiaoymin/knife4j-spring-ui/2.0.7/knife4j-spring-ui-2.0.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/cn/afterturn/easypoi-base/3.0.3/easypoi-base-3.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/29.0-jre/guava-29.0-jre.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/cn/afterturn/easypoi-web/3.0.3/easypoi-web-3.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/cn/afterturn/easypoi-annotation/3.0.3/easypoi-annotation-3.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/itextpdf/itextpdf/5.5.13/itextpdf-5.5.13.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/itextpdf/itext-asian/5.2.0/itext-asian-5.2.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-elasticsearch/2.3.11.RELEASE/spring-boot-starter-data-elasticsearch-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-elasticsearch/4.0.9.RELEASE/spring-data-elasticsearch-4.0.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/plugin/transport-netty4-client/7.6.2/transport-netty4-client-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-buffer/4.1.65.Final/netty-buffer-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-codec/4.1.65.Final/netty-codec-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-codec-http/4.1.65.Final/netty-codec-http-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-common/4.1.65.Final/netty-common-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-handler/4.1.65.Final/netty-handler-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-resolver/4.1.65.Final/netty-resolver-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/netty/netty-transport/4.1.65.Final/netty-transport-4.1.65.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/client/elasticsearch-rest-high-level-client/7.6.2/elasticsearch-rest-high-level-client-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch/7.6.2/elasticsearch-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-core/7.6.2/elasticsearch-core-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-secure-sm/7.6.2/elasticsearch-secure-sm-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-x-content/7.6.2/elasticsearch-x-content-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.11.4/jackson-dataformat-smile-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.4/jackson-dataformat-yaml-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.11.4/jackson-dataformat-cbor-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-geo/7.6.2/elasticsearch-geo-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-core/8.4.0/lucene-core-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-analyzers-common/8.4.0/lucene-analyzers-common-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-backward-codecs/8.4.0/lucene-backward-codecs-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-grouping/8.4.0/lucene-grouping-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-highlighter/8.4.0/lucene-highlighter-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-join/8.4.0/lucene-join-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-memory/8.4.0/lucene-memory-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-misc/8.4.0/lucene-misc-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-queries/8.4.0/lucene-queries-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-queryparser/8.4.0/lucene-queryparser-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-sandbox/8.4.0/lucene-sandbox-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-spatial/8.4.0/lucene-spatial-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-spatial-extras/8.4.0/lucene-spatial-extras-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-spatial3d/8.4.0/lucene-spatial3d-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/lucene/lucene-suggest/8.4.0/lucene-suggest-8.4.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/elasticsearch-cli/7.6.2/elasticsearch-cli-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/net/sf/jopt-simple/jopt-simple/5.0.2/jopt-simple-5.0.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/carrotsearch/hppc/0.8.1/hppc-0.8.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/joda-time/joda-time/2.10.4/joda-time-2.10.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/tdunning/t-digest/3.2/t-digest-3.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/jna/4.5.1/jna-4.5.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/client/elasticsearch-rest-client/7.6.2/elasticsearch-rest-client-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpcore-nio/4.4.14/httpcore-nio-4.4.14.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/plugin/mapper-extras-client/7.6.2/mapper-extras-client-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/plugin/parent-join-client/7.6.2/parent-join-client-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/plugin/aggs-matrix-stats-client/7.6.2/aggs-matrix-stats-client-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/plugin/rank-eval-client/7.6.2/rank-eval-client-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/elasticsearch/plugin/lang-mustache-client/7.6.2/lang-mustache-client-7.6.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/spullara/mustache/java/compiler/0.9.6/compiler-0.9.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.11.4/jackson-core-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-rule/1.4.7/amos-component-rule-1.4.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-emq/1.1.20Ty-SNAPSHOT/tyboot-component-emq-1.1.20Ty-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.2.2/org.eclipse.paho.client.mqttv3-1.2.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-starter-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-component-cache/1.1.20Ty-SNAPSHOT/tyboot-component-cache-1.1.20Ty-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-redis/1.4.5.RELEASE/spring-boot-starter-redis-1.4.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-redis/2.3.9.RELEASE/spring-data-redis-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-keyvalue/2.3.9.RELEASE/spring-data-keyvalue-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-oxm/5.2.15.RELEASE/spring-oxm-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/redis/clients/jedis/3.3.0/jedis-3.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-pool2/2.8.1/commons-pool2-2.8.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-eureka-server/2.2.5.RELEASE/spring-cloud-starter-netflix-eureka-server-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter/2.2.5.RELEASE/spring-cloud-starter-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-context/2.2.5.RELEASE/spring-cloud-context-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/security/spring-security-crypto/5.3.9.RELEASE/spring-security-crypto-5.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-commons/2.2.5.RELEASE/spring-cloud-commons-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/bouncycastle/bcprov-jdk15on/1.64/bcprov-jdk15on-1.64.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-eureka-server/2.2.5.RELEASE/spring-cloud-netflix-eureka-server-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-actuator/2.3.11.RELEASE/spring-boot-starter-actuator-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-actuator-autoconfigure/2.3.11.RELEASE/spring-boot-actuator-autoconfigure-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-actuator/2.3.11.RELEASE/spring-boot-actuator-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/micrometer/micrometer-core/1.5.14/micrometer-core-1.5.14.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-freemarker/2.3.11.RELEASE/spring-boot-starter-freemarker-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context-support/5.2.15.RELEASE/spring-context-support-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-hystrix/2.2.5.RELEASE/spring-cloud-netflix-hystrix-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.3.11.RELEASE/spring-boot-starter-aop-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-eureka-client/2.2.5.RELEASE/spring-cloud-netflix-eureka-client-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/eureka/eureka-client/1.9.25/eureka-client-1.9.25.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/jettison/jettison/1.3.7/jettison-1.3.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/netflix-commons/netflix-eventbus/0.3.0/netflix-eventbus-0.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/netflix-commons/netflix-infix/0.3.0/netflix-infix-0.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/antlr-runtime/3.4/antlr-runtime-3.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-math/2.2/commons-math-2.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/httpcomponents/httpcore/4.4.14/httpcore-4.4.14.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/inject/guice/4.1.0/guice-4.1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.11.4/jackson-annotations-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-servlet/1.19.1/jersey-servlet-1.19.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-server/1.19.1/jersey-server-1.19.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/eureka/eureka-core/1.9.25/eureka-core-1.9.25.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/woodstox/woodstox-core/5.3.0/woodstox-core-5.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.4/jackson-dataformat-xml-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.4/jackson-module-jaxb-annotations-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/codehaus/woodstox/stax2-api/4.2.1/stax2-api-4.2.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/thoughtworks/xstream/xstream/1.4.11.1/xstream-1.4.11.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.5.RELEASE/spring-cloud-starter-netflix-archaius-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.5.RELEASE/spring-cloud-netflix-ribbon-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.5.RELEASE/spring-cloud-netflix-archaius-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.5.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/reactivex/rxjava/1.3.8/rxjava-1.3.8.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-loadbalancer/2.2.5.RELEASE/spring-cloud-starter-loadbalancer-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-loadbalancer/2.2.5.RELEASE/spring-cloud-loadbalancer-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-validation/2.3.11.RELEASE/spring-boot-starter-validation-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/validator/hibernate-validator/6.1.7.Final/hibernate-validator-6.1.7.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/projectreactor/reactor-core/3.3.17.RELEASE/reactor-core-3.3.17.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/projectreactor/addons/reactor-extra/3.3.6.RELEASE/reactor-extra-3.3.6.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-cache/2.3.11.RELEASE/spring-boot-starter-cache-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/stoyanr/evictor/1.0.0/evictor-1.0.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/netflix/ribbon/ribbon-eureka/2.3.0/ribbon-eureka-2.3.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/glassfish/jaxb/jaxb-runtime/2.3.4/jaxb-runtime-2.3.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/glassfish/jaxb/txw2/2.3.4/txw2-2.3.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/istack/istack-commons-runtime/3.0.12/istack-commons-runtime-3.0.12.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/fastjson/1.2.67/fastjson-1.2.67.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-autoconfigure/2.3.11.RELEASE/spring-boot-autoconfigure-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot/2.3.11.RELEASE/spring-boot-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-jdbc/2.3.11.RELEASE/spring-boot-starter-jdbc-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-jdbc/5.2.15.RELEASE/spring-jdbc-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-mongodb/2.3.11.RELEASE/spring-boot-starter-data-mongodb-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter/2.3.11.RELEASE/spring-boot-starter-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-core/5.2.15.RELEASE/spring-core-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-jcl/5.2.15.RELEASE/spring-jcl-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mongodb/mongodb-driver-sync/4.0.6/mongodb-driver-sync-4.0.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mongodb/bson/4.0.6/bson-4.0.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mongodb/mongodb-driver-core/4.0.6/mongodb-driver-core-4.0.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-mongodb/3.0.9.RELEASE/spring-data-mongodb-3.0.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-tx/5.2.15.RELEASE/spring-tx-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-aop/5.2.15.RELEASE/spring-aop-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-beans/5.2.15.RELEASE/spring-beans-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-expression/5.2.15.RELEASE/spring-expression-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-commons/2.3.9.RELEASE/spring-data-commons-2.3.9.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/2.0.5/easyexcel-2.0.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi/3.17/poi-3.17.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-codec/commons-codec/1.14/commons-codec-1.14.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/3.17/poi-ooxml-3.17.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/virtuald/curvesapi/1.04/curvesapi-1.04.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/cglib/cglib/3.1/cglib-3.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/ehcache/ehcache/3.8.1/ehcache-3.8.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-generator/3.2.0/mybatis-plus-generator-3.2.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-core/3.2.0/mybatis-plus-core-3.2.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/baomidou/mybatis-plus-annotation/3.2.0/mybatis-plus-annotation-3.2.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/jsqlparser/jsqlparser/2.1/jsqlparser-2.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mybatis/mybatis/3.5.2/mybatis-3.5.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mybatis/mybatis-spring/2.0.2/mybatis-spring-2.0.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/velocity/velocity-engine-core/2.1/velocity-engine-core-2.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/freemarker/freemarker/2.3.31/freemarker-2.3.31.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-websocket/2.3.11.RELEASE/spring-boot-starter-websocket-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-web/2.3.11.RELEASE/spring-boot-starter-web-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-json/2.3.11.RELEASE/spring-boot-starter-json-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.4/jackson-datatype-jdk8-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.4/jackson-datatype-jsr310-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.4/jackson-module-parameter-names-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-tomcat/2.3.11.RELEASE/spring-boot-starter-tomcat-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/tomcat/embed/tomcat-embed-core/9.0.46/tomcat-embed-core-9.0.46.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.46/tomcat-embed-websocket-9.0.46.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-web/5.2.15.RELEASE/spring-web-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-webmvc/5.2.15.RELEASE/spring-webmvc-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-messaging/5.2.15.RELEASE/spring-messaging-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-websocket/5.2.15.RELEASE/spring-websocket-5.2.15.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-restful/1.1.20Ty-SNAPSHOT/tyboot-core-restful-1.1.20Ty-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-undertow/2.3.11.RELEASE/spring-boot-starter-undertow-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/undertow/undertow-core/2.1.7.Final/undertow-core-2.1.7.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/threads/jboss-threads/3.1.0.Final/jboss-threads-3.1.0.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/undertow/undertow-servlet/2.1.7.Final/undertow-servlet-2.1.7.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/spec/javax/annotation/jboss-annotations-api_1.3_spec/2.0.1.Final/jboss-annotations-api_1.3_spec-2.0.1.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/undertow/undertow-websockets-jsr/2.1.7.Final/undertow-websockets-jsr-2.1.7.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec/2.0.0.Final/jboss-websocket-api_1.1_spec-2.0.0.Final.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/servlet/jakarta.servlet-api/4.0.4/jakarta.servlet-api-4.0.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-logging/2.3.11.RELEASE/spring-boot-starter-logging-2.3.11.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-auth/1.1.20Ty-SNAPSHOT/tyboot-core-auth-1.1.20Ty-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-rdbms/1.1.20Ty-SNAPSHOT/tyboot-core-rdbms-1.1.20Ty-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.20/lombok-1.18.20.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-privilege/1.6.0/amos-feign-privilege-1.6.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/typroject/tyboot-core-foundation/1.1.20Ty-SNAPSHOT/tyboot-core-foundation-1.1.20Ty-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/esotericsoftware/reflectasm/reflectasm/1.09/reflectasm-1.09.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/github/axet/kaptcha/0.0.9/kaptcha-0.0.9.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/jhlabs/filters/2.0.235/filters-2.0.235.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-component-feign/1.6.0/amos-component-feign-1.6.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.5.RELEASE/spring-cloud-starter-openfeign-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-io/commons-io/2.2/commons-io-2.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-slf4j/10.10.1/feign-slf4j-10.10.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/brave/brave/5.12.3/brave-5.12.3.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter-brave/2.15.0/zipkin-reporter-brave-2.15.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/reporter2/zipkin-reporter/2.15.0/zipkin-reporter-2.15.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/zipkin/zipkin2/zipkin/2.21.1/zipkin-2.21.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/io/swagger/swagger-annotations/1.5.13/swagger-annotations-1.5.13.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.11.4/jackson-databind-2.11.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/yeejoin/amos-feign-systemctl/1.6.0/amos-feign-systemctl-1.6.0.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>