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/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/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/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/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/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对象
      *