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

amos-boot-biz-common/pom.xml

@@ -71,6 +71,12 @@
           <artifactId>itext-asian</artifactId>
           <version>5.2.0</version>
       </dependency>
+      <dependency>
+          <groupId>com.google.zxing</groupId>
+          <artifactId>core</artifactId>
+          <version>3.3.0</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
 
 </project>

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

 package com.yeejoin.amos.boot.biz.common.dao.mapper;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 
@@ -10,5 +12,9 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 * @date 2021-06-07
 */
 public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
-
+	/**
+	 * 获取领域专家的列表信息，且带有该领域下的专家统计数量
+	 * @return
+	 */
+   public List<DataDictionary>  getDataDictionaryListAndCount();
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java

 package com.yeejoin.amos.boot.biz.common.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,4 +41,8 @@ public class DataDictionary extends BaseEntity {
     @ApiModelProperty(value = "排序字段")
     private int sortNum;
     
+    @ApiModelProperty(value = "对应消防专家的数量，仅适应与消防资源专家领域树结构的展示")
+    @TableField(exist = false)
+    private int count;
+
 }

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

 package com.yeejoin.amos.boot.biz.common.service.impl;
 
 
+import java.util.Collection;
+import java.util.List;
+
+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;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.dto.DataDictionaryDto;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
-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;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-
-import java.util.Collection;
-import java.util.List;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 
 /**
  * 数据字典 服务实现类
@@ -30,7 +34,8 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
 
     @Value("${redis.cache.failure.time}")
     private long time;
-
+    @Autowired
+    DataDictionaryMapper dataDictionaryMapper;
 
     @Override
     public Object getFireChemical(String type) throws Exception {
@@ -82,4 +87,11 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
         return menus;
 
     }
+    
+    
+    public List<DataDictionary> getDataDictionaryAndCount(){
+    	List<DataDictionary> list=	dataDictionaryMapper.getDataDictionaryListAndCount();
+		return list;
+    	
+    }
 }

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

+package com.yeejoin.amos.boot.biz.common.utils;
+
+/**
+ * tweeter的snowflake 移植到Java:
+ *   (a) id构成: 42位的时间前缀 + 10位的节点标识 + 12位的sequence避免并发的数字(12位不够用时强制得到新的时间前缀)
+ *       注意这里进行了小改动: snowkflake是5位的datacenter加5位的机器id; 这里变成使用10位的机器id
+ *   (b) 对系统时间的依赖性非常强，需关闭ntp的时间同步功能。当检测到ntp时间调整后，将会拒绝分配id
+ */
+
+public class IdWorker {
+
+    private final long workerId;
+    private final long epoch = 1403854494756L;   // 时间起始标记点，作为基准，一般取系统的最近时间
+    private final long workerIdBits = 10L;      // 机器标识位数
+    private final long maxWorkerId = -1L ^ -1L << this.workerIdBits;// 机器ID最大值: 1023
+    private long sequence = 0L;                   // 0，并发控制
+    private final long sequenceBits = 12L;      //毫秒内自增位
+
+    private final long workerIdShift = this.sequenceBits;                             // 12
+    private final long timestampLeftShift = this.sequenceBits + this.workerIdBits;// 22
+    private final long sequenceMask = -1L ^ -1L << this.sequenceBits;                 // 4095,111111111111,12位
+    private long lastTimestamp = -1L;
+
+    private IdWorker(long workerId) {
+        if (workerId > this.maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", this.maxWorkerId));
+        }
+        this.workerId = workerId;
+    }
+
+    public synchronized long nextId() throws Exception {
+        long timestamp = this.timeGen();
+        if (this.lastTimestamp == timestamp) { // 如果上一个timestamp与新产生的相等，则sequence加一(0-4095循环); 对新的timestamp，sequence从0开始
+            this.sequence = this.sequence + 1 & this.sequenceMask;
+            if (this.sequence == 0) {
+                timestamp = this.tilNextMillis(this.lastTimestamp);// 重新生成timestamp
+            }
+        } else {
+            this.sequence = 0;
+        }
+
+        if (timestamp < this.lastTimestamp) {
+            throw new Exception(String.format("clock moved backwards.Refusing to generate id for %d milliseconds", (this.lastTimestamp - timestamp)));
+        }
+
+        this.lastTimestamp = timestamp;
+        return timestamp - this.epoch << this.timestampLeftShift | this.workerId << this.workerIdShift | this.sequence;
+    }
+
+    private static IdWorker flowIdWorker = new IdWorker(1);
+    public static IdWorker getFlowIdWorkerInstance() {
+        return flowIdWorker;
+    }
+
+
+
+    /**
+     * 等待下一个毫秒的到来, 保证返回的毫秒数在参数lastTimestamp之后
+     */
+    private long tilNextMillis(long lastTimestamp) throws InterruptedException {
+        long timestamp = this.timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = this.timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 获得系统当前毫秒数
+     */
+    private static long timeGen() throws InterruptedException {
+        return System.currentTimeMillis();
+    }
+
+
+
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.biz.common.utils;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Random;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * 二维码工具类
+ *
+ * @author Administrator
+ */
+public class QRCodeUtil {
+
+    private static final String CHARSET = "utf-8";
+    private static final int QRCODE_SIZE = 45;
+    private static Random random = new Random();
+    private static int randomNumForQrCode;
+
+    /**
+     * <pre>
+     * 根据当前记录ID生成QRCode
+     * </pre>
+     *
+     * @return
+     */
+    public static String generateQRCode(Date dateCreated, String pointNo) {
+        return String.valueOf(dateCreated.getTime() + pointNo);
+    }
+
+
+    /**
+     * <pre>
+     * 生成QRCode
+     * </pre>
+     *
+     * @return
+     */
+    public static String generateQRCode() {
+        String res;
+        //加锁生成随机数，保证自增后释放
+        Lock lock = new ReentrantLock();
+        lock.lock();
+        randomNumForQrCode += 1;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        try {
+            res = simpleDateFormat.format(new Date(System.currentTimeMillis())).substring(5, 8) + String.valueOf(IdWorker.getFlowIdWorkerInstance().nextId()).substring(0, 10) + randomNumForQrCode;
+        } catch (Exception e) {
+            Random random = new Random(System.currentTimeMillis());
+            String tmp = "";
+            for (int i = 0; i < 13; i++) {
+                tmp += random.nextInt(10);
+            }
+            res = simpleDateFormat.format(new Date(System.currentTimeMillis())).substring(2, 8) + tmp.substring(0, 10) + randomNumForQrCode;
+        } finally {
+            lock.unlock();
+        }
+        return res;
+    }
+
+
+    /**
+     * 生成临时的qrCode
+     *
+     * @return
+     */
+    public static String temporaryQrCode() {
+        long qrCode = -1 * System.currentTimeMillis();
+        qrCode += (long) (random.nextDouble() * 10000000);
+        return String.valueOf(qrCode);
+    }
+
+    /**
+     * 根据二维码信息，生成二维码图片 用户excel，word等导出图片
+     *
+     * @param content
+     * @return
+     */
+    public static byte[] generateQRCodeImageByteData(String content) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try {
+            Hashtable<EncodeHintType, Object> hints = new Hashtable<EncodeHintType, Object>();
+            hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+            hints.put(EncodeHintType.CHARACTER_SET, CHARSET);
+            hints.put(EncodeHintType.MARGIN, 1);
+            BitMatrix bitMatrix = new MultiFormatWriter().encode(
+                    content
+                    , BarcodeFormat.QR_CODE
+                    , QRCODE_SIZE
+                    , QRCODE_SIZE,
+                    hints);
+            int width = bitMatrix.getWidth();
+            int height = bitMatrix.getHeight();
+            BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            for (int x = 0; x < width; x++) {
+                for (int y = 0; y < height; y++) {
+                    image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 : 0xFFFFFFFF);
+                }
+            }
+            ImageIO.write(image, "png", out);
+            return out.toByteArray();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                out.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -11,7 +11,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import com.alibaba.fastjson.JSONObject;
 
-@FeignClient(name = "AMOS-API-WORKFLOW-CJHENHAO", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+import javax.servlet.http.HttpServletResponse;
+
+@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**
 	 * 发起流程
@@ -104,4 +106,14 @@ public interface WorkflowFeignService {
 	@RequestMapping(value = "/task/completeTask/noFromInstanceAdd/{taskID}", method = RequestMethod.POST)
 	JSONObject completeNoExecuteFromInstanceAdd(@PathVariable("taskID") String taskID, @RequestBody(required = false) HashMap<String, Object> variable) throws Exception;
 
+/**
+ * 流程图高亮
+ * */
+	@RequestMapping(value = "/activitiHistory/gethighLineImg/{processInstanceId}",method = RequestMethod.GET)
+	JSONObject thighLineImg(@PathVariable("processInstanceId") String processInstanceId, HttpServletResponse resp) ;
+/**
+ * 流程图高亮图片
+ * */
+	@RequestMapping(value = "/activitiHistory/gethighLine",method = RequestMethod.GET)
+	JSONObject thighLine(@RequestParam("instanceId") String instanceId);
 }

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.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.DataDictionaryMapper">
+<mapper namespace="com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper">
+<select id="getDataDictionaryListAndCount" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
 
+SELECT
+	cdd.*, count(cfe.sequence_nbr) AS count
+FROM
+	cb_data_dictionary cdd
+LEFT JOIN (
+	SELECT
+		*
+	FROM
+		cb_fire_experts
+	WHERE
+		is_delete = 0
+) cfe ON cdd.`code` = cfe.expert_code
+WHERE
+	cdd.type = 'ZJLY'
+AND cdd.is_delete = 0
+GROUP BY
+	cdd. CODE ORDER BY sort_num 
+
+
+</select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/CheckObjectDto.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 lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value = "CheckObjectDto", description = "机构重点部位")
+public class CheckObjectDto extends BaseDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "机构名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "重点部位数量")
+    private int num;
+
+    @ApiModelProperty(value = "归属机构")
+    private String parentId;
+
+    @ApiModelProperty(value = "单位性质")
+    private String companyNature;
+
+    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
+    private String bizOrgType;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RescueEquipmentDto.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;
@@ -18,27 +22,37 @@ import lombok.EqualsAndHashCode;
 @ApiModel(value = "RescueEquipmentDto", description = "救援装备")
 public class RescueEquipmentDto extends BaseDto {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
 
+    @ExcelProperty(value = "车辆类型", index = 0)
+    @ExplicitConstraint(type = "JYZBLX", indexNum = 0, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "车辆类型")
     private String vehicleType;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "车辆类型code")
     private String vehicleTypeCode;
 
+    @ExcelProperty(value = "车辆数量", index = 1)
     @ApiModelProperty(value = "车辆数量")
     private Long vehicleNumber;
 
+    @ExcelProperty(value = "费用", index = 2)
     @ApiModelProperty(value = "费用")
     private Double fee;
 
+    @ExcelProperty(value = "单位名称", index =3)
+    @ExplicitConstraint(indexNum = 3, sourceClass = RoleNameExplicitConstraint.class,method="getUnitTeam") //动态下拉内容
     @ApiModelProperty(value = "单位名称")
     private String company;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "单位id")
     private Long companyId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "更新人名称")
     private String recUserName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/SpecialPositionStaffDto.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.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 com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -19,24 +23,32 @@ import java.util.Date;
 @ApiModel(value = "SpecialPositionStaffDto", description = "特岗人员")
 public class SpecialPositionStaffDto extends BaseDto {
 
+    @ExcelIgnore
     private static final long serialVersionUID = 1L;
 
-
+    @ExcelProperty(value = "岗位名称", index = 0)
+    @ExplicitConstraint(type = "GWMC", indexNum = 0, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "岗位名称")
     private String positionName;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "岗位名称code")
     private String positionNameCode;
 
+    @ExcelProperty(value = "人数", index = 1)
     @ApiModelProperty(value = "人数")
     private Long personNumber;
 
+    @ExcelProperty(value = "单位名称", index = 2)
+    @ExplicitConstraint(indexNum = 2, sourceClass = RoleNameExplicitConstraint.class,method="getUnitTeam") //动态下拉内容
     @ApiModelProperty(value = "单位名称")
     private String company;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "单位id")
     private Long companyId;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "更新人名称")
     private String recUserName;
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.dto;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 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;
@@ -33,10 +34,6 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "地址")
     private String address;
 
-
-//    @ApiModelProperty(value = "经纬度坐标")
-//    private String latLang;
-
     @ExcelIgnore
     @ApiModelProperty(value = "经度")
     private Double longitude;
@@ -308,4 +305,20 @@ public class WaterResourceDto extends BaseDto {
     @ExcelIgnore
     @ApiModelProperty(value = "物联参数")
     private WaterResourceIotDto waterResourceIotDto;
+
+    @ApiModelProperty("设施定义名称")
+    @ExcelProperty(value = "设施定义名称", index = 44)
+    private String equipName;
+
+    @ApiModelProperty("设施分类名称")
+    @ExcelProperty(value = "设施分类名称", index = 45)
+    private String equipCategoryName;
+
+    @ApiModelProperty("设施编码")
+    @ExcelProperty(value = "设施编码", index = 46)
+    private String equipCode;
+
+    @ApiModelProperty("维保周期")
+    @ExcelProperty(value = "维保周期(月)", index = 47)
+    private String maintenancePeriod;
 }

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

@@ -41,6 +41,11 @@ public class FirefightersContract extends BaseEntity {
     @ApiModelProperty(value = "签订日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date signedTime;
+    
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "起始时间")
+    private Date startTime;
+    
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "到期时间")
     private Date expireTime;

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

@@ -36,116 +36,157 @@ public class WaterResource extends BaseEntity {
      */
 	@TableField("address")
     private String address;
+
     /**
 	  * 经纬度坐标
      */
-//	@TableField("lat_lang")
-//    private String latLang;
-
     @ApiModelProperty(value = "经度")
     private Double longitude;
 
     @ApiModelProperty(value = "纬度")
     private Double latitude;
+
     /**
 	  * 资源类型（消火栓、消防水鹤、天然水源、消防水池）
      */
 	@TableField("resource_type")
     private String resourceType;
+
     /**
      * 资源类型名称（消火栓、消防水鹤、天然水源、消防水池）
      */
     @TableField("resource_type_name")
     private String resourceTypeName;
+
     /**
 	  * 所在建筑id
      */
 	@TableField("belong_building_id")
     private Long belongBuildingId;
+
     /**
 	  * 所在建筑
      */
 	@TableField("belong_building")
     private String belongBuilding;
+
     /**
 	  * 所属消防系统id
      */
 	@TableField("belong_fighting_system_id")
     private Long belongFightingSystemId;
+
     /**
 	  * 所属消防系统
      */
 	@TableField("belong_fighting_system")
     private String belongFightingSystem;
+
     /**
 	  * 管理单位id
      */
 	@TableField("management_unit_id")
     private Long managementUnitId;
+
     /**
 	  * 管理单位
      */
 	@TableField("management_unit")
     private String managementUnit;
+
     /**
 	  * 维保单位id
      */
 	@TableField("maintenance_unit_id")
     private Long maintenanceUnitId;
+
     /**
 	  * 维保单位
      */
 	@TableField("maintenance_unit")
     private String maintenanceUnit;
+
     /**
 	  * 建造日期
      */
 	@TableField("build_date")
     private Date buildDate;
+
     /**
 	  * 启用日期
      */
 	@TableField("enable_date")
     private Date enableDate;
+
     /**
 	  * 方位图
      */
 	@TableField("orientation_img")
     private String orientationImg;
+
     /**
 	  * 实景图
      */
 	@TableField("reality_img")
     private String realityImg;
+
     /**
 	  * 联系人姓名
      */
 	@TableField("contact_user")
     private String contactUser;
+
     /**
 	  * 联系人电话
      */
 	@TableField("contact_phone")
     private String contactPhone;
+
     /**
 	  * 是否有物联参数（1有，0没有）
      */
 	@TableField("is_iot")
     private Boolean isIot;
+
     /**
 	  * 消防救援机构_通用唯一识别码
      */
 	@TableField("rescue_org_code")
     private String rescueOrgCode;
+
     /**
 	  * 行政区划代码
      */
 	@TableField("administrative_code")
     private String administrativeCode;
+
     /**
 	  * 组织机构代码
      */
 	@TableField("org_code")
     private String orgCode;
 
+	@ApiModelProperty("设施定义")
+    @TableField("equip_id")
+	private Long equipId;
+
+    @ApiModelProperty("设施定义名称")
+    @TableField("equip_name")
+    private String equipName;
+
+    @ApiModelProperty("设施分类")
+    @TableField("equip_category_id")
+    private Long equipCategoryId;
+
+    @ApiModelProperty("设施分类名称")
+    @TableField("equip_category_name")
+    private String equipCategoryName;
+
+    @ApiModelProperty("设施编码")
+    @TableField("equip_code")
+    private String equipCode;
+
+    @ApiModelProperty("维保周期")
+    @TableField("maintenance_period")
+    private String maintenancePeriod;
 }

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

@@ -67,7 +67,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     /**
      * 查询单位基本信息列表和单位下所有的重点部位数量。
      */
-    List<OrgUsrTreeDto> getCompanyAndKeySite(Long companyId);
+    List<CheckObjectDto> getCompanyAndKeySite(Long companyId);
 
     List<UserUnitDto>  getUserUnit(String id, String type, String code);
 }

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

@@ -37,7 +37,7 @@ public interface IDutyCommonService {
      * @param endDate   结束日期
      * @return ResponseModel
      */
-    List<Map<String, Object>> list(String beginDate, String endDate) throws ParseException;
+    List<Map<String, Object>> list(Long teamId,String beginDate, String endDate) throws ParseException;
 
     /**
      * 获取表单参数

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

@@ -141,14 +141,16 @@ public interface IOrgUsrService {
 
 	List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
 
-
 	/**
 	 * * @param null
 	 *
-     * @return <PRE>
+	 * @return
+	 * 
+	 *         <PRE>
 	 * author tw
 	 * date 2021/7/20
 	 *         </PRE>
+	 * 
 	 *         列表
 	 */
 	List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
@@ -156,10 +158,13 @@ public interface IOrgUsrService {
 	/**
 	 * * @param null
 	 *
-     * @return <PRE>
+	 * @return
+	 * 
+	 *         <PRE>
 	 * author tw
 	 * date 2021/7/20
 	 *         </PRE>
+	 * 
 	 *         统计
 	 */
 	Integer listContractDtoCount(RequestData par);
@@ -167,7 +172,9 @@ public interface IOrgUsrService {
 	/**
 	 * * @param null
 	 *
-     * @return <PRE>
+	 * @return
+	 * 
+	 *         <PRE>
 	 * author tw
 	 * date 2021/7/26
 	 *         </PRE>
@@ -186,7 +193,7 @@ public interface IOrgUsrService {
 	/**
 	 * 根据登陆人获取公司部门人员树
 	 */
-	List<OrgMenuDto> companyUserTreeByUser (AgencyUserModel user);
+	List<OrgMenuDto> companyUserTreeByUser(AgencyUserModel user);
 
 	/**
 	 * 根据登陆人获取公司部门树
@@ -196,6 +203,13 @@ public interface IOrgUsrService {
 	/**
 	 * 根据登陆人获取公司列表(关联重点部位)
 	 */
-	List<OrgUsrTreeDto> companyListByUser(AgencyUserModel user);
+	List<CheckObjectDto> companyListByUser(AgencyUserModel user);
+
+    /**
+     * 获取登陆人关联机场单位人员信息，部门信息
+     */
+    List<Map<String, Object>> getLoginUserDetails(AgencyUserModel user);
+
+	List<OrgUsr> getPersonListByParentId(Long id);
 
 }

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

@@ -138,13 +138,24 @@
 		clu.rec_user_id AS recUserId,
 		clu.rec_date AS recDate,
 		clu.is_delete AS isDelete,
-		cre.vehicle_number AS vehicleNumber,
-		csps.person_number AS personNumber
+		(
+		SELECT
+		sum(cre.vehicle_number)
+		FROM
+		cb_rescue_equipment cre
+		WHERE
+		clu.sequence_nbr = cre.company_id
+		) AS vehicleNumber,
+		(
+		SELECT
+		sum(csps.person_number)
+		FROM
+		cb_special_position_staff csps
+		WHERE
+		clu.sequence_nbr = csps.company_id
+		) AS personNumber
 		FROM
 		cb_linkage_unit clu
-		LEFT JOIN cb_rescue_equipment cre ON clu.sequence_nbr = cre.company_id
-		LEFT JOIN cb_special_position_staff csps ON clu.sequence_nbr =
-		csps.company_id
 		WHERE clu.is_delete=0
 	 <if test="unitName != null and unitName != ''">
 		AND clu.unit_name LIKE concat(#{unitName}, '%')

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

@@ -355,7 +355,7 @@ LEFT JOIN (
     on b.instance_id=a.sequence_nbr where a.biz_org_name is not null
     </select>
 
-<select id="getCompanyAndKeySite" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTreeDto" >
+<select id="getCompanyAndKeySite" resultType="com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto" >
 
     SELECT
         company_sur.sequence_nbr as sequenceNbr,
@@ -363,6 +363,7 @@ LEFT JOIN (
         company_sur.parent_id as parentId,
         company_sur.biz_org_type as bizOrgType,
 --         cb.field_value_label,
+        (SELECT field_value_label FROM cb_dynamic_form_instance as cb WHERE company_sur.sequence_nbr = cb.instance_id AND field_code = 'companyNature' ) as companyNature,
         CASE
         WHEN keysite_sur.num IS NULL THEN
             0

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferResourceDto.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.List;
+
+/**
+* 调派资源dto
+*
+* @author tb
+* @date 2021-08-20
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="PowerTransferResourceDto", description="调派资源dto")
+public class PowerTransferResourceDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "资源名称")
+    private String name;
+
+    @ApiModelProperty(value = "资源类型（中队：company，车辆：car，人员：person）")
+    private String type;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "图片")
+    private String img;
+
+    @ApiModelProperty(value = "联系电话")
+    private String tel;
+
+    @ApiModelProperty(value = "负责人")
+    private String chargePerson;
+
+    @ApiModelProperty(value = "驾驶员")
+    private String driver;
+
+    @ApiModelProperty(value = "车辆状态")
+    private String carState;
+
+    @ApiModelProperty(value = "岗位")
+    private String post;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+}

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

@@ -21,7 +21,10 @@ public  enum ExcelEnums {
         CLZQ ("车辆执勤", "车辆执勤", "com.yeejoin.amos.boot.module.common.api.dto.DutyCarExcelDto","CLZQ"),//("CLZQ","车辆执勤")
         JCDWRY ("机场单位人员", "机场单位人员", "com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto","JCDWRY"),//("JCDW","机场单位")
         LDDW ("联动单位", "联动单位", "com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto","LDDW"),//("JCDW","机场单位")
-        RYZB ("人员值班", "人员值班", "com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto","RYZB");//("RYZB","人员值班")
+        RYZB ("人员值班", "人员值班", "com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto","RYZB"),//("RYZB","人员值班")
+        //  BUG 2455 相关代码 bykongfm
+        TGRY ("特岗人员", "特岗人员", "com.yeejoin.amos.boot.module.common.api.dto.SpecialPositionStaffDto","TGRY"),//("TGRY","特岗人员")
+        JYZB ("救援装备", "救援装备", "com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto","JYZB");//("JYZB","救援装备")
 
         private String fileName;
         private String sheetName;

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

@@ -23,4 +23,13 @@ public enum FireCarStatusEnum {
     private String key;
     private String code;
     private String name;
+
+    public static FireCarStatusEnum getEnum(String code) {
+        for (FireCarStatusEnum status : FireCarStatusEnum.values()) {
+            if (status.getCode().equals(code)) {
+                return status;
+            }
+        }
+        return null;
+    }
 }

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.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
+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.PowerTransferResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import org.apache.ibatis.annotations.Param;
 
@@ -76,4 +84,24 @@ public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
     List<PowerCompanyCountDto> getPowerCompanyCountDtocount(@Param("id") Long id);
 
     List<PowerCarCountDto> getPowerCarCountDtocount(@Param("alertCalledId") Long alertCalledId,@Param("companyId") Long companyId);
+
+    /**
+     * 根据参数获取警情当前已调派队伍资源列表信息
+     *
+     * @param alertCalledId 警情id
+     * @param page          分页参数
+     * @return
+     */
+    IPage<PowerTransferResourceDto> getPowerTransferTeamResource(Page<PowerTransferResourceDto> page,
+                                                                 @Param("alertCalledId") Long alertCalledId);
+
+    /**
+     * 根据参数获取警情当前已调派车辆资源列表信息
+     *
+     * @param alertCalledId 警情id
+     * @param page          分页参数
+     * @return
+     */
+    IPage<PowerTransferResourceDto> getPowerTransferCarResource(Page<PowerTransferResourceDto> page,
+                                                                @Param("alertCalledId") Long alertCalledId);
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.dto.PowerTransferResourceDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 
@@ -30,4 +33,14 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
      */
     List<FireBrigadeResourceDto> getPowerTree();
     List<PowerCompanyCountDto> getPowerCompanyCountDtocount( Long id);
+
+    /**
+     * 根据参数查询力量调派资源列表
+     *
+     * @param alertCalledId 警情id
+     * @param type 查询类型
+     * @param page 分页参数
+     * @return
+     */
+    IPage<PowerTransferResourceDto> getPowerTransferPageByParam(Long alertCalledId, String type, Page<PowerTransferResourceDto> page);
 }

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

@@ -108,7 +108,7 @@
     <select id="getTodayAlertCalled" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledTodyDto">
 
         select
-            jc_alert_called.alarm_type alarmType,
+            jc_alert_called.alert_type alarmType,
             jc_alert_called.address,
             jc_alert_called.call_time  callTime
             from jc_alert_called where is_delete=0

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

@@ -192,21 +192,38 @@
     GROUP BY
         c.resources_name ) m where m.carNum>0
     </select>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    <select id="getPowerTransferTeamResource"
+            resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto">
+        SELECT distinct
+            company.company_id sequenceNbr,
+            company.company_name NAME,
+            'company' type,
+            team.address,
+            team.contact_user chargePerson,
+            team.contact_phone tel,
+            team.img
+        FROM
+            jc_power_transfer_company company
+                LEFT JOIN jc_power_transfer transfer ON transfer.sequence_nbr = company.power_transfer_id
+                LEFT JOIN cb_fire_team team ON team.sequence_nbr = company.company_id
+        WHERE
+            transfer.alert_called_id = #{alertCalledId}
+            AND is_distribution_agencies = 0
+    </select>
+    <select id="getPowerTransferCarResource"
+            resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto">
+        SELECT DISTINCT
+            car.resources_id sequenceNbr,
+            car.resources_name,
+            'car' type
+        FROM
+            jc_power_transfer_company_resources car
+                LEFT JOIN jc_power_transfer_company company ON company.sequence_nbr = car.power_transfer_company_id
+                LEFT JOIN jc_power_transfer transfer ON transfer.sequence_nbr = company.power_transfer_id
+        WHERE
+            transfer.alert_called_id = #{alertCalledId}
+          AND is_distribution_agencies = 0
+    </select>
 
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/request/AddPlanRequest.java

+package com.yeejoin.amos.supervision.core.common.request;
+
+import com.yeejoin.amos.supervision.dao.entity.Plan;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddPlanRequest {
+    private List<Long> ownerId;
+    private Plan plan;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/response/PlanPointRespone.java

+package com.yeejoin.amos.supervision.core.common.response;
+
+import com.yeejoin.amos.supervision.dao.entity.Plan;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PlanPointRespone {
+    private static final long serialVersionUID = 1L;
+
+    private List<Long> ownerId;
+    private Plan plan;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java

@@ -203,6 +203,7 @@ public class InputItem extends BasicEntity {
     /**
      * 适用检查类别
      */
+    @Lob
     @Column(name="item_type_classify")
     private String itemTypeClassify;
 
@@ -216,13 +217,13 @@ public class InputItem extends BasicEntity {
      * 检查项启用
      */
     @Column(name="item_start")
-    private String itemStart;
+    private Integer itemStart;
 
-    public String getItemStart() {
+    public Integer getItemStart() {
         return itemStart;
     }
 
-    public void setItemStart(String itemStart) {
+    public void setItemStart(Integer itemStart) {
         this.itemStart = itemStart;
     }
 

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Plan.java

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import javax.persistence.*;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.LastModifiedDate;
 
 
@@ -266,6 +267,62 @@ public class Plan extends BasicEntity {
 	@Column(name="user_dept")
 	private String userDept;
 
+	/**
+	 * 用户部门名称
+	 */
+	@Column(name="maker_user_dept_name")
+	private String makerUserDeptName;
+
+	/**
+	 * 牵头部门
+	 */
+	@Column(name="lead_department_ids")
+	private String leadDepartmentIds;
+
+	/**
+	 * 牵头人名称，多个
+	 */
+	@Column(name="lead_people_names")
+	private String leadPeopleNames;
+
+	/**
+	 * 牵头人
+	 */
+	@Column(name="lead_people_ids")
+	private String leadPeopleIds;
+
+	/**
+	 * 牵头部门名称
+	 */
+	@Column(name="lead_department_names")
+	private String leadDepartmentNames;
+
+	/**
+	 * 参与人
+	 */
+	@Column(name="maker_user_id")
+	private String makerUserId;
+
+	/**
+	 * 参与人名称
+	 */
+	@Column(name="maker_user_name")
+	private String makerUserName;
+
+	/**
+	 * 检查类型id
+	 */
+	@Column(name="check_type_id")
+	private String checkTypeId;
+
+	/**
+	 * 检查类型名称
+	 */
+	@Column(name="check_type_name")
+	private String checkTypeName;
+
+
+
 	public String getUserDept() {
 		return userDept;
 	}
@@ -616,4 +673,76 @@ public class Plan extends BasicEntity {
 	public void setIsSingleExecution(boolean isSingleExecution) {
 		this.isSingleExecution = isSingleExecution;
 	}
+
+	public String getCheckTypeName() {
+		return checkTypeName;
+	}
+
+	public void setCheckTypeName(String checkTypeName) {
+		this.checkTypeName = checkTypeName;
+	}
+
+	public String getCheckTypeId() {
+		return checkTypeId;
+	}
+
+	public void setCheckTypeId(String checkTypeId) {
+		this.checkTypeId = checkTypeId;
+	}
+
+	public String getLeadDepartmentNames() {
+		return leadDepartmentNames;
+	}
+
+	public void setLeadDepartmentNames(String leadDepartmentNames) {
+		this.leadDepartmentNames = leadDepartmentNames;
+	}
+
+	public String getLeadPeopleIds() {
+		return leadPeopleIds;
+	}
+
+	public void setLeadPeopleIds(String leadPeopleIds) {
+		this.leadPeopleIds = leadPeopleIds;
+	}
+
+	public String getLeadPeopleNames() {
+		return leadPeopleNames;
+	}
+
+	public void setLeadPeopleNames(String leadPeopleNames) {
+		this.leadPeopleNames = leadPeopleNames;
+	}
+
+	public String getLeadDepartmentIds() {
+		return leadDepartmentIds;
+	}
+
+	public void setLeadDepartmentIds(String leadDepartmentIds) {
+		this.leadDepartmentIds = leadDepartmentIds;
+	}
+
+	public String getMakerUserId() {
+		return makerUserId;
+	}
+
+	public void setMakerUserId(String makerUserId) {
+		this.makerUserId = makerUserId;
+	}
+
+	public String getMakerUserName() {
+		return makerUserName;
+	}
+
+	public void setMakerUserName(String makerUserName) {
+		this.makerUserName = makerUserName;
+	}
+
+	public String getMakerUserDeptName() {
+		return makerUserDeptName;
+	}
+
+	public void setMakerUserDeptName(String makerUserDeptName) {
+		this.makerUserDeptName = makerUserDeptName;
+	}
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Point.java

@@ -270,7 +270,7 @@ public class Point extends BasicEntity {
 	/**
 	 * 所在建筑名称
 	 */
-	@Column(name="building_name")
+//	@Column(name="building_name")
 	private String buildingName;
 
 	public String getBuildingName() {
@@ -292,7 +292,7 @@ public class Point extends BasicEntity {
 	/**
 	 * 所在建筑Id
 	 */
-	@Column(name="building_id")
+//	@Column(name="building_id")
 	private String buildingId;
 
 	/**

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

@@ -118,9 +118,11 @@ public class CommandController extends BaseController {
     @Value("${video.url}")
  	private String videoUrl;
 
-
     @Autowired
     IDutyPersonService iDutyPersonService;
+
+
+
     /**
      * 警情列表
      *
@@ -876,26 +878,26 @@ public class CommandController extends BaseController {
 
 
 
-    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/testPostApi")
-    @ApiOperation(httpMethod = "GET", value = "视频地址", notes = "视频地址")
-    public Object testPost(Integer pageNum, Integer pageSize) throws URISyntaxException {
-        RestTemplate restTemplate = new RestTemplate();
-        URI uri = new URI(videoUrl+"artemis/api/resource/v1/camera/advance/cameraList");
-        HttpHeaders headers = new HttpHeaders();
-//        headers.add("Authorization", "APPCODE " + appCode);
-        //添加参数,因为HttpEntity里面的参数是MultiValueMap类型的，所以使用这个map集合
-        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
-        map.add("pageSize", 100);
-        map.add("pageNo", 1);
-        //添加请求的实体类，这里第一个参数是要发送的参数，第二个参数是请求头里的数据
-        HttpEntity<Object> requestEntity = new HttpEntity<Object>(map, headers);
-        ResponseEntity<String> exchange = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, String.class);
-        JSONObject jsonObject = JSON.parseObject(exchange.getBody());
-        System.out.println(jsonObject);
-        return jsonObject;
-
-    }
+//    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+//    @GetMapping(value = "/testPostApi")
+//    @ApiOperation(httpMethod = "GET", value = "视频地址", notes = "视频地址")
+//    public Object testPost(Integer pageNum, Integer pageSize) throws URISyntaxException {
+//        RestTemplate restTemplate = new RestTemplate();
+//        URI uri = new URI(videoUrl+"artemis/api/resource/v1/camera/advance/cameraList");
+//        HttpHeaders headers = new HttpHeaders();
+////        headers.add("Authorization", "APPCODE " + appCode);
+//        //添加参数,因为HttpEntity里面的参数是MultiValueMap类型的，所以使用这个map集合
+//        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
+//        map.add("pageSize", 100);
+//        map.add("pageNo", 1);
+//        //添加请求的实体类，这里第一个参数是要发送的参数，第二个参数是请求头里的数据
+//        HttpEntity<Object> requestEntity = new HttpEntity<Object>(map, headers);
+//        ResponseEntity<String> exchange = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, String.class);
+//        JSONObject jsonObject = JSON.parseObject(exchange.getBody());
+//        System.out.println(jsonObject);
+//        return jsonObject;
+//
+//    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "根据灾情id建筑部位树",   notes = "根据灾情id建筑部位树")
@@ -939,4 +941,16 @@ public class CommandController extends BaseController {
         return ResponseHelper.buildResponse(dto);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "app-根据警情id查询力量调派列表",   notes = "app-根据警情id查询力量调派列表")
+    @GetMapping(value = "/app/transferList")
+    public ResponseModel getPowerTransferList(@RequestParam String alertId,
+                                              @RequestParam(defaultValue = "company") String type,
+                                              @RequestParam(value = "current") int current,
+                                              @RequestParam(value = "size") int size) {
+        Page page = new Page();
+        page.setSize(size);
+        page.setCurrent(current);
+        return ResponseHelper.buildResponse(powerTransferService.getPowerTransferPageByParam(Long.valueOf(alertId), type, page));
+    }
 }
\ 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/DutyCarController.java

@@ -63,7 +63,7 @@ public class DutyCarController extends BaseController {
     public ResponseModel list(
             @ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
             @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
-        return ResponseHelper.buildResponse(iDutyCarService.list(beginDate, endDate));
+        return ResponseHelper.buildResponse(iDutyCarService.list(null,beginDate, endDate));
     }
 
 

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

@@ -61,8 +61,9 @@ public class DutyPersonController extends BaseController {
     @GetMapping(value = "/list")
     @ApiOperation(httpMethod = "GET", value = "值班列表视图-不分页", notes = "值班列表视图-不分页")
     public ResponseModel list(@ApiParam(value = "开始日期", required = true) @RequestParam String beginDate,
-                              @ApiParam(value = "结束日期", required = true) @RequestParam String endDate) throws ParseException {
-        return ResponseHelper.buildResponse(iDutyPersonService.list(beginDate, endDate));
+                              @ApiParam(value = "结束日期", required = true) @RequestParam String endDate,
+                             @RequestParam(required = false) Long teamId) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyPersonService.list(teamId,beginDate, endDate));
     }
 
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -58,6 +59,9 @@ public class FireExpertsController extends BaseController {
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
     
+    @Autowired
+    DataDictionaryMapper dataDictionaryMapper;
+
     /**
      * 新增
      *
@@ -167,12 +171,15 @@ public class FireExpertsController extends BaseController {
     @RequestMapping(value = "/getExpertsTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取专家领域树", notes = "获取专家领域树")
     public ResponseModel<Object> getExpertsTree() throws Exception {
-        String type = "ZJLY";
-        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
-        queryWrapper.orderByAsc("sort_num");
-
-        Collection<DataDictionary> list = dataDictionaryService.list(queryWrapper);
+//        String type = "ZJLY";
+//        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("type", type);
+//        queryWrapper.orderByAsc("sort_num");
+
+        Collection<DataDictionary> list = dataDictionaryService.getDataDictionaryAndCount();
+        list.forEach(i->{
+        	i.setName(i.getName()+" ("+i.getCount()+")");
+        });
         List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
                 , "getParent",null);
         Menu menu = new Menu(-1L, "专家领域", -1L, menus,0);

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

@@ -349,10 +349,10 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyListByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表")
-    public ResponseModel<List<OrgUsrTreeDto>> companyListByUser() {
+    public ResponseModel<List<CheckObjectDto>> companyListByUser() {
         // 获取登陆人角色
         AgencyUserModel user = getUserInfo();
-        List<OrgUsrTreeDto> menus = iOrgUsrService.companyListByUser(user);
+        List<CheckObjectDto> menus = iOrgUsrService.companyListByUser(user);
         return ResponseHelper.buildResponse(menus);
     }
 
@@ -370,4 +370,20 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(userId));
     }
 
+    /**
+     * 获取登陆人绑定的人员关系
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getLoginUserDetails", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系")
+    public ResponseModel<List<Map<String, Object>>> getLoginUserDetails() {
+        // 获取登陆人角色
+        AgencyUserModel user = getUserInfo();
+        List<Map<String, Object>> loginUserDetails = iOrgUsrService.getLoginUserDetails(user);
+        return ResponseHelper.buildResponse(loginUserDetails);
+    }
+
 }
\ 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/WaterResourceController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
+import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceCraneDto;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceHydrantDto;
@@ -400,4 +401,16 @@ public class WaterResourceController extends BaseController {
     public ResponseModel<List<WaterResourceTypeDto>> selectResourceTypeList() {
         return ResponseHelper.buildResponse(waterResourceServiceImpl.getWaterResourceTypeList(true));
     }
+
+    /**
+     * 生成二维码code
+     *
+     * @return string
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "生成二维码code", notes = "生成二维码code")
+    @GetMapping(value = "/qr/code")
+    public ResponseModel<String> genQrCode() {
+        return ResponseHelper.buildResponse(QRCodeUtil.generateQRCode());
+    }
 }

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

@@ -53,8 +53,15 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
             MaintenanceCompany company = maintenanceCompanyService.getMaintenanceCompany(amosUserId);
             companyId = company.getSequenceNbr();
         }
-        return queryForContractPageByParam(page, isDelete, companyId, signedCompanyId, name, typeCode,
+        
+        //
+        Page<ContractDto>  resultPage= queryForContractPageByParam(page, isDelete, companyId, signedCompanyId, name, typeCode,
                 signedDate);
+        List<ContractDto>  resultContractDtos=    resultPage.getRecords();
+        resultContractDtos.stream().forEach(i->{
+        	i.setAttachment(sourceFileServiceImpl.findBySourceId(i.getSequenceNbr()));
+        });
+        return   page.setRecords(resultContractDtos);
     }
 
     public Page<ContractDto> queryForContractPageByParam(Page<ContractDto> page, Boolean 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/DutyCommonServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
@@ -14,6 +15,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
 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;
 import com.yeejoin.amos.boot.module.common.api.enums.DutyViewTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyCommonService;
 
@@ -70,10 +72,10 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	 */
 	final int LIMIT_SHIFT_NUMBER = 2;
 
-
 	@Override
-    public IPage<Map<String, Object>> pageList(int current, int size, String beginDate, String endDate) throws ParseException {
-        //1.已column为准 进行返回
+	public IPage<Map<String, Object>> pageList(int current, int size, String beginDate, String endDate)
+			throws ParseException {
+		// 1.已column为准 进行返回
 		String groupCode = this.getGroupCode();
 		IPage<Map<String, Object>> iPage = dynamicFormInstanceService.pageList(current, size, groupCode);
 		for (Map<String, Object> m : iPage.getRecords()) {
@@ -84,17 +86,18 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 
 	private void fillDutyShiftData(String beginDate, String endDate, Map<String, Object> m) throws ParseException {
 		String instanceId = m.get("instanceId").toString();
-        List<DutyShift> dutyShifts =
-                dutyShiftService.list(new LambdaQueryWrapper<DutyShift>().eq(BaseEntity::getIsDelete, false).eq(DutyShift::getAppKey, RequestContext.getAppKey()));
-        Map<Long, DutyShift> keyNameMap = dutyShifts.stream().collect(Collectors.toMap(BaseEntity::getSequenceNbr,
-                Function.identity()));
-        List<DutyPersonShiftDto> personShiftList = dutyPersonShiftService.list(new LambdaQueryWrapper<DutyPersonShift>()
-                .eq(DutyPersonShift::getInstanceId, instanceId)
+		List<DutyShift> dutyShifts = dutyShiftService.list(new LambdaQueryWrapper<DutyShift>()
+				.eq(BaseEntity::getIsDelete, false).eq(DutyShift::getAppKey, RequestContext.getAppKey()));
+		Map<Long, DutyShift> keyNameMap = dutyShifts.stream()
+				.collect(Collectors.toMap(BaseEntity::getSequenceNbr, Function.identity()));
+		List<DutyPersonShiftDto> personShiftList = dutyPersonShiftService
+				.list(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId)
 						.ge(beginDate != null, DutyPersonShift::getDutyDate, beginDate)
-                .le(endDate != null, DutyPersonShift::getDutyDate, endDate)).stream().map(e -> {
+						.le(endDate != null, DutyPersonShift::getDutyDate, endDate))
+				.stream().map(e -> {
 					DutyPersonShiftDto dto = new DutyPersonShiftDto();
 					Bean.copyExistPropertis(e, dto);
-            //没值班信息，默认休
+					// 没值班信息，默认休
 					DutyShift dutyShift = keyNameMap.get(e.getShiftId());
 					dto.setShiftName(dutyShift != null ? dutyShift.getName() : "休");
 					dto.setColor(dutyShift != null ? dutyShift.getColor() : "");
@@ -134,9 +137,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	private DutyViewTypeEnum inferView(String beginDate, String endDate, String appKey) {
 		Map<String, Long> result = dutyPersonShiftService.getBaseMapper().calMaxPersonAndShiftNum(beginDate, endDate,
 				appKey, this.getGroupCode());
-        //计算班次最大执勤人数，时间区间内
+		// 计算班次最大执勤人数，时间区间内
 		Long maxDutyPersonNumDay = result.get("maxDutyPersonNumDay");
-        //计算天的最大班次数量，时间区间内
+		// 计算天的最大班次数量，时间区间内
 		Long maxShiftNumDay = result.get("maxShiftNumDay");
 		if (maxDutyPersonNumDay <= LIMIT_PERSON_NUMBER && maxShiftNumDay <= LIMIT_SHIFT_NUMBER) {
 			return DutyViewTypeEnum.BANK;
@@ -146,14 +149,29 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 	}
 
 	@Override
-    public List<Map<String, Object>> list(String beginDate, String endDate) throws ParseException {
-        //1.已column为准 进行返回
+	public List<Map<String, Object>> list(Long teamId, String beginDate, String endDate) throws ParseException {
+		// 1.已column为准 进行返回
 		String groupCode = this.getGroupCode();
 		List<Map<String, Object>> list = dynamicFormInstanceService.listAll(groupCode);
-        //2.组织值班数据
+		
+		// 2.组织值班数据
 		for (Map<String, Object> map : list) {
 			this.fillDutyShiftData(beginDate, endDate, map);
 		}
+		/*bug2472 添加根据部门id筛选数据的方法  陈浩 2021-08-21 开始	*/
+		if(teamId!=null && teamId.intValue()!=0) {
+			List<OrgUsr> orgUsrList = orgUsrService.getPersonListByParentId(teamId);
+			List<Map<String, Object>>  resultList= new ArrayList<Map<String, Object>>();
+			list.stream().forEach(i->{
+				orgUsrList.forEach(m->{
+					if(i.get("userId").toString().equals(m.getSequenceNbr().longValue()+"")) {
+						resultList.add(i);
+					}
+				});
+			});
+			return resultList;
+		}
+		/*bug2472 添加根据部门id筛选数据的方法  陈浩 2021-08-21 结束	*/
 		return list;
 	}
 
@@ -164,7 +182,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 
 	@Override
 	public List downloadList(String beginDate, String endDate) throws ParseException {
-        List<Map<String, Object>> maps = this.list(beginDate, endDate);
+		List<Map<String, Object>> maps = this.list(null,beginDate, endDate);
 		JSONArray jsonArray = new JSONArray();
 		jsonArray.addAll(maps);
 		List<?> list = new ArrayList<>();
@@ -183,53 +201,52 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		List<DynamicFormInstance> formInstanceList = new ArrayList<>();
 		Set<DutyPersonShift> dutyPersonShifts = new HashSet<>();
 		dataList.forEach(d -> {
-            //TODO： 业务唯一索引，用户id
+			// TODO： 业务唯一索引，用户id
 			String userId = d.get("userId").toString();
-            List<DynamicFormInstance> instances =
-                    dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>()
-                            .eq(DynamicFormInstance::getFieldCode, "userId")
+			List<DynamicFormInstance> instances = dynamicFormInstanceService
+					.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "userId")
 							.eq(DynamicFormInstance::getFieldValue, userId)
 							.eq(DynamicFormInstance::getGroupCode, this.getGroupCode()));
 			Long instanceId = null;
-            List<DynamicFormColumn> columns =
-                    dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, this.getGroupCode()));
-            //1.组装动态表单数据
+			List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>()
+					.eq(DynamicFormColumn::getGroupCode, this.getGroupCode()));
+			// 1.组装动态表单数据
 			if (!instances.isEmpty()) {
-                //0.定位instanceId，准备进行更新操作
+				// 0.定位instanceId，准备进行更新操作
 				instanceId = instances.get(0).getInstanceId();
-                //1.查询已有数据
-                List<DynamicFormInstance> instancesInDb =
-                        dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
-                //2.list 转 map
+				// 1.查询已有数据
+				List<DynamicFormInstance> instancesInDb = dynamicFormInstanceService
+						.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId,
+								instanceId));
+				// 2.list 转 map
 				Map<Object, DynamicFormInstance> instanceMap = Bean.listToMap(instancesInDb, "fieldCode",
 						DynamicFormInstance.class);
-                //3.待更新数据组装，待批量入库
+				// 3.待更新数据组装，待批量入库
 				this.updateFormValue(formInstanceList, d, instanceId, columns, instanceMap);
 			} else {
-                //0.新数据，生成id
+				// 0.新数据，生成id
 				instanceId = sequence.nextId();
 				Long finalInstanceId1 = instanceId;
-                //1.组装数据
+				// 1.组装数据
 				List<DynamicFormInstance> newInstances = columns.stream().map(column -> {
 					DynamicFormInstance instance = new DynamicFormInstance();
 					buildFormInstanceData(finalInstanceId1, d, column, instance);
 					return instance;
 				}).collect(Collectors.toList());
-                //2.待更新数据组装，待批量入库
+				// 2.待更新数据组装，待批量入库
 				formInstanceList.addAll(newInstances);
 			}
-            //2.组装值班数据
+			// 2.组装值班数据
 			List<DutyPersonShiftDto> shiftDtos = (List<DutyPersonShiftDto>) d.get("dutyShift");
 			Long finalInstanceId = instanceId;
-            //按照业务唯一索引查询主键
-            List<DutyPersonShift> dutyPersonShiftsDb =
-                    dutyPersonShiftService.list(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId));
-            Map<Date, Long> dutyPersonShiftMap =
-                    dutyPersonShiftsDb.stream().collect(Collectors.toMap(DutyPersonShift::getDutyDate,
-                            DutyPersonShift::getSequenceNbr));
-            //todo: 只更新当天及值班之后数据
-            Set<DutyPersonShift> needToDb = shiftDtos.stream().filter(s -> DateUtils.dateCompare(s.getDutyDate(),
-                    new Date()) >= 0).map(shiftDto -> {
+			// 按照业务唯一索引查询主键
+			List<DutyPersonShift> dutyPersonShiftsDb = dutyPersonShiftService
+					.list(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId));
+			Map<Date, Long> dutyPersonShiftMap = dutyPersonShiftsDb.stream()
+					.collect(Collectors.toMap(DutyPersonShift::getDutyDate, DutyPersonShift::getSequenceNbr));
+			// todo: 只更新当天及值班之后数据
+			Set<DutyPersonShift> needToDb = shiftDtos.stream()
+					.filter(s -> DateUtils.dateCompare(s.getDutyDate(), new Date()) >= 0).map(shiftDto -> {
 						DutyPersonShift dutyPersonShift = new DutyPersonShift();
 						Bean.copyExistPropertis(shiftDto, dutyPersonShift);
 						dutyPersonShift.setInstanceId(finalInstanceId);
@@ -252,11 +269,11 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		for (DynamicFormColumn column : columns) {
 			DynamicFormInstance formInstance = instanceMap.get(column.getFieldCode());
 			if (!ObjectUtils.isEmpty(formInstance)) {
-                //有的更新
-                formInstance.setFieldValue(d.get(column.getFieldCode()) != null ?
-                        d.get(column.getFieldCode()).toString() : "");
+				// 有的更新
+				formInstance.setFieldValue(
+						d.get(column.getFieldCode()) != null ? d.get(column.getFieldCode()).toString() : "");
 			} else {
-                //没有的新增
+				// 没有的新增
 				formInstance = new DynamicFormInstance();
 				buildFormInstanceData(instanceId, d, column, formInstance);
 			}
@@ -276,15 +293,16 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		formInstance.setInstanceId(instanceId);
 		formInstance.setSequenceNbr(l);
 		formInstance.setFormColumnId(column.getSequenceNbr());
-        formInstance.setFieldValue(map.get(column.getFieldCode()) != null ?
-                map.get(column.getFieldCode()).toString() : "");
+		formInstance
+				.setFieldValue(map.get(column.getFieldCode()) != null ? map.get(column.getFieldCode()).toString() : "");
 	}
 
 	@Override
 	public Boolean deleteDutyData(Long instanceId) {
-        dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
-        dutyPersonShiftService.remove(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId,
-                instanceId));
+		dynamicFormInstanceService.remove(
+				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
+		dutyPersonShiftService
+				.remove(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId));
 		return true;
 	}
 
@@ -293,8 +311,8 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		String groupCode = this.getGroupCode();
 		Map<String, String> params = new HashMap<>();
 		params.put("postType", postType);
-        List<DynamicFormColumn> columns =
-                dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
+		List<DynamicFormColumn> columns = dynamicFormColumnService
+				.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
 		Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
 		return dynamicFormInstanceService.getBaseMapper().listOneDayDutyPerson(dutyDay, shiftId, fieldCodes,
 				RequestContext.getAppKey(), groupCode, params);
@@ -309,11 +327,11 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		String shiftIds = StringUtils.join(shiftIdList.toArray(), ",");
 		String dutyDay = now.toString("yyyy-MM-dd");
 		// 获取当前值班人员
-        List<DynamicFormColumn> columns =
-                dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
+		List<DynamicFormColumn> columns = dynamicFormColumnService
+				.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
 		Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
-        List<Map<String, Object>> maps = dynamicFormInstanceService.getBaseMapper().listOnDutyPerson(dutyDay,
-                shiftIds, fieldCodes, groupCode);
+		List<Map<String, Object>> maps = dynamicFormInstanceService.getBaseMapper().listOnDutyPerson(dutyDay, shiftIds,
+				fieldCodes, groupCode);
 		// 获取人员照片和电话
 		List<Long> ids = new ArrayList<>();
 		maps.forEach(item -> ids.add(Long.valueOf(String.valueOf(item.get("userId")))));
@@ -351,7 +369,8 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 			Integer endMinute = Integer.valueOf(endTime[1]);
 			if ("当日".equals(start[0])) {
 				if (hour > startHour || hour == startHour && minute > startMinute) {
-                    if ("次日".equals(end[0]) || "当日".equals(end[0]) && (hour < endHour || hour == endHour && minute < endMinute)) {
+					if ("次日".equals(end[0])
+							|| "当日".equals(end[0]) && (hour < endHour || hour == endHour && minute < endMinute)) {
 						shiftIds.add(item.getSequenceNbr());
 					}
 				}

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

@@ -227,7 +227,7 @@ public class MaintenanceCompanyServiceImpl
 	@Override
 	public List<Map<String, Object>> getMaintenanceCompanyDropDownList() {
 		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
-		wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName);
+		wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName, MaintenanceCompany::getSequenceNbr);
 		wrapper.eq(MaintenanceCompany::getType, COMPANY);
 		wrapper.eq(MaintenanceCompany::getIsDelete, false);
 		return maintenanceCompanyMapper.selectMaps(wrapper);

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

@@ -5,6 +5,7 @@ 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.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
@@ -20,6 +21,8 @@ import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1094,15 +1097,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     ;
 
     @Override
-    public List<OrgUsrTreeDto> companyListByUser(AgencyUserModel user) {
-        List<OrgUsrTreeDto> list = new ArrayList<>();
+    public List<CheckObjectDto> companyListByUser(AgencyUserModel user) {
+        List<CheckObjectDto> list = new ArrayList<>();
         // 需要角色为机场单位或管理员，其余角色返回空
         String code = UserRolesEnum.AIRPORTUNIT.getCode();
         String codeAdmin = UserRolesEnum.ADMIN.getCode();
         String roles = getRoles(user, code);
 
         if (!StringUtils.isEmpty(roles)) {
-            List<OrgUsrTreeDto> companyList = this.baseMapper.getCompanyAndKeySite(null);
+            List<CheckObjectDto> companyList = this.baseMapper.getCompanyAndKeySite(null);
             if (roles.equals(codeAdmin)) {
                 // 返回全部单位列表
                 return companyAndKeySiteList(companyList);
@@ -1118,7 +1121,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                     Long parent = ObjectUtils.isEmpty(orgUsr.getParentId()) ? 0L : Long.parseLong(orgUsr.getParentId());
                     if (set.add(parent)) {
                         Long companyIdByDto = getCompanyIdByDto(parent, companyList);
-                        List<OrgUsrTreeDto> orgUsrTreeDtoList = this.baseMapper.getCompanyAndKeySite(companyIdByDto);
+                        List<CheckObjectDto> orgUsrTreeDtoList = this.baseMapper.getCompanyAndKeySite(companyIdByDto);
                         list.addAll(companyAndKeySiteList(orgUsrTreeDtoList));
                     }
                 });
@@ -1132,9 +1135,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 获取登陆人所在公司
      */
-    private Long getCompanyIdByDto(Long parentId, List<OrgUsrTreeDto> companyDepartmentMsgList) {
+    private Long getCompanyIdByDto(Long parentId, List<CheckObjectDto> companyDepartmentMsgList) {
         Long pid = null;
-        for (OrgUsrTreeDto orgUsr : companyDepartmentMsgList) {
+        for (CheckObjectDto orgUsr : companyDepartmentMsgList) {
             if (orgUsr.getSequenceNbr().equals(parentId)) {
                 if (orgUsr.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && ObjectUtils.isEmpty(orgUsr.getParentId())) {
                     return orgUsr.getSequenceNbr();
@@ -1149,19 +1152,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 查询单位列表
      */
-    private List<OrgUsrTreeDto> companyAndKeySiteList(List<OrgUsrTreeDto> companyList) {
-        List<OrgUsrTreeDto> list = new ArrayList<>();
+    private List<CheckObjectDto> companyAndKeySiteList(List<CheckObjectDto> companyList) {
+        List<CheckObjectDto> list = new ArrayList<>();
         if (ObjectUtils.isEmpty(companyList)) {
             return list;
         }
-        Map<Long, OrgUsrTreeDto> map = new HashMap<>(companyList.size());
+        Map<Long, CheckObjectDto> map = new HashMap<>(companyList.size());
         companyList.forEach(e -> map.put(e.getSequenceNbr(), e));
-        Set<? extends Map.Entry<Long, ? extends OrgUsrTreeDto>> entries = map.entrySet();
+        Set<? extends Map.Entry<Long, ? extends CheckObjectDto>> entries = map.entrySet();
         entries.parallelStream().forEach(entry -> {
-            OrgUsrTreeDto value = entry.getValue();
+            CheckObjectDto value = entry.getValue();
             if (!ObjectUtils.isEmpty(value)) {
                 Long parent = ObjectUtils.isEmpty(value.getParentId()) ? 0L : Long.parseLong(value.getParentId());
-                OrgUsrTreeDto orgUsrTreeDto = map.get(parent);
+                CheckObjectDto orgUsrTreeDto = map.get(parent);
                 if (!ObjectUtils.isEmpty(orgUsrTreeDto)) {
                     int num = orgUsrTreeDto.getNum() + value.getNum();
                     orgUsrTreeDto.setNum(num);
@@ -1294,6 +1297,45 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return pid;
     }
 
+    /**
+     * 查询组织机构下面的人员信息
+     * @param id
+     * @return
+     */
+     public  List<OrgUsr> getPersonListByParentId(Long id) {
+    	 LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+    	 wrapper.eq(OrgUsr::getIsDelete, false);
+    	 wrapper.eq(OrgUsr::getParentId,id);
+    	 wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+    	 return this.baseMapper.selectList(wrapper);    	 
+     }
+    
+    
+    
+    
+   @Override
+   public List<Map<String, Object>> getLoginUserDetails (AgencyUserModel user) {
+
+        // 获取登陆人关联账号
+       List<OrgUsr> orgUsrs = orgUsrList(user);
+       List<Map<String, Object>> list = new ArrayList<>();
+       if (!ObjectUtils.isEmpty(orgUsrs)) {
+           orgUsrs.forEach(orgUsr -> {
+               Map<String, Object> map = new HashMap<>();
+               map.put(OrgPersonEnum.人员.getKey(), orgUsr);
+               // 获取关联账号所在部门/公司
+               LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+               wrapper.eq(OrgUsr::getIsDelete, false);
+               wrapper.eq(BaseEntity::getSequenceNbr, orgUsr.getParentId());
+               OrgUsr one = this.getOne(wrapper);
+               map.put("other",one);
+               list.add(map);
+           });
+
+       }
+       return list;
+   }
+
 }
 
 

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

@@ -125,7 +125,6 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/reporting/list", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表")
-
     public ResponseModel<SchedulingReportingDto> listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
         queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode());
         return ResponseHelper.buildResponse(alertSubmittedService.listReportingByParam(queryParam));

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

@@ -327,7 +327,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         });
         Map<String, Integer> statusCountMap = alertCalledMapper.queryAlertStatusCount(beginDate, endDate);
         Integer unFinishedCount =
-                this.count(new LambdaQueryWrapper<AlertCalled>().eq(AlertCalled::getAlertStatus, "0"));
+                this.count(new LambdaQueryWrapper<AlertCalled>().eq(AlertCalled::getAlertStatus, false));//bug2532 未结案警情统计错误 bykongfm
 
         result.put("alertInfoList", contentList);
         result.putAll(statusCountMap);

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

@@ -7,7 +7,9 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.LinkageUnitServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -67,6 +69,9 @@ public class DataSourcesImpl implements DataSources {
 	@Autowired
 	private RestTemplate restTemplate;
 
+	@Autowired
+	LinkageUnitServiceImpl linkageUnitServiceImpl;
+
 	@Value("${security.systemctl.name}")
 	private String systemctl;
 
@@ -130,9 +135,9 @@ public class DataSourcesImpl implements DataSources {
 			case "getparent":
 				str =getparent();
 				break;
-
-
-
+			case "getUnitTeam":
+				str =getUnitTeam();
+				break;
 			}
 		}
 		return str;
@@ -294,4 +299,17 @@ public class DataSourcesImpl implements DataSources {
 
 		return str;
 	}
+
+	/**
+	 * 特岗人员模板及救援车辆模板获取联动单位   BUG 2455 相关代码 bykongfm
+	 * @return
+	 */
+	private String[] getUnitTeam() {
+		List<LinkageUnitDto> units = linkageUnitServiceImpl.queryForLinkageUnitList(false);
+		List<String> names = units.stream().map(item -> {
+			return item.getUnitName() + "@" + item.getSequenceNbr();
+		}).collect(Collectors.toList());
+		String[] str = names.toArray(new String[names.size()]);
+		return str;
+	}
 }

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

@@ -16,6 +16,8 @@ import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.entity.RescueEquipment;
+import com.yeejoin.amos.boot.module.common.api.entity.SpecialPositionStaff;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
 import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
@@ -100,6 +102,10 @@ public class ExcelServiceImpl {
     DynamicFormColumnServiceImpl dynamicFormColumnServiceImpl;
     @Autowired
     LinkageUnitServiceImpl linkageUnitServiceImpl;
+    @Autowired
+    SpecialPositionStaffServiceImpl specialPositionStaffServiceImpl;
+    @Autowired
+    RescueEquipmentServiceImpl rescueEquipmentServiceImpl;
 
     public void templateExport(HttpServletResponse response, ExcelDto excelDto) throws ClassNotFoundException {
         String url = excelDto.getClassUrl();
@@ -216,10 +222,90 @@ public class ExcelServiceImpl {
             case "LDDW":
                 excelImportLinkageUnitZhDto(multipartFile);
                 break;
+                //  BUG 2455 相关代码 bykongfm
+            case "TGRY":
+                excelImportLinkageUnitTGRYDto(multipartFile);
+                break;
+            case "JYZB":
+                excelImportLinkageUnitJYZBDto(multipartFile);
+                break;
         }
         return;
     }
 
+    private void excelImportLinkageUnitTGRYDto(MultipartFile multipartFile) throws Exception {
+        List<SpecialPositionStaffDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
+                SpecialPositionStaffDto.class, 1);
+
+        if(excelDtoList!=null&&excelDtoList.size()>0){
+            outer : for(SpecialPositionStaffDto positionStaffDto : excelDtoList)  {
+                String code = "";
+                if(positionStaffDto.getPositionName()!=null){
+                    String[] certificates = positionStaffDto.getPositionName().split("@");
+                    positionStaffDto.setPositionName(certificates[0]);
+                    positionStaffDto.setPositionNameCode(certificates[1]);
+                    code = certificates[1];
+                } else {
+                    continue;
+                }
+                if(positionStaffDto.getCompany()!=null){
+                    String[] certificates = positionStaffDto.getCompany().split("@");
+                    positionStaffDto.setCompany(certificates[0]);
+                    positionStaffDto.setCompanyId(Long.parseLong(certificates[1]));
+                    // 获取特岗人员已经存在的岗位 如果存在则不导入
+                    LambdaQueryWrapper<SpecialPositionStaff> queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(SpecialPositionStaff::getCompanyId,Long.parseLong(certificates[1])).eq(SpecialPositionStaff::getIsDelete,false);
+                    List<SpecialPositionStaff> tempList = specialPositionStaffServiceImpl.list(queryWrapper);
+                    for(SpecialPositionStaff temp : tempList) {
+                        if(temp.getPositionNameCode().equals(code)) {
+                            continue outer; // 已经存在则不导入继续循环
+                        }
+                    }
+                } else {
+                    continue;
+                }
+                specialPositionStaffServiceImpl.createWithModel(positionStaffDto);
+            }
+        }
+    }
+
+    private void excelImportLinkageUnitJYZBDto(MultipartFile multipartFile) throws Exception {
+        List<RescueEquipmentDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
+                RescueEquipmentDto.class, 1);
+        if(excelDtoList!=null&&excelDtoList.size()>0){
+            outer : for(RescueEquipmentDto rescueEquipmentDto : excelDtoList ) {
+                String code = "";
+                if(rescueEquipmentDto.getVehicleType()!=null){
+                    String[] certificates = rescueEquipmentDto.getVehicleType().split("@");
+                    rescueEquipmentDto.setVehicleType(certificates[0]);
+                    rescueEquipmentDto.setVehicleTypeCode(certificates[1]);
+                    code = certificates[1];
+                } else {
+                    continue;
+                }
+                if(rescueEquipmentDto.getCompany()!=null){
+                    String[] certificates = rescueEquipmentDto.getCompany().split("@");
+                    rescueEquipmentDto.setCompany(certificates[0]);
+                    rescueEquipmentDto.setCompanyId(Long.parseLong(certificates[1]));
+                    // 获取救援装备已经存在的装备 如果存在则不导入
+                    LambdaQueryWrapper<RescueEquipment> queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(RescueEquipment::getCompanyId,Long.parseLong(certificates[1])).eq(RescueEquipment::getIsDelete,false);
+                    List<RescueEquipment> tempList = rescueEquipmentServiceImpl.list(queryWrapper);
+                    for(RescueEquipment temp : tempList) {
+                        if(temp.getVehicleTypeCode().equals(code)) {
+                            continue outer; // 已经存在则不导入继续循环
+                        }
+                    }
+                } else {
+                    continue ;
+                }
+
+                rescueEquipmentServiceImpl.createWithModel(rescueEquipmentDto);
+            }
+
+        }
+    }
+
 
 
     private void excelImportLinkageUnitZhDto(MultipartFile multipartFile) throws Exception {

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+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.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
-import com.yeejoin.amos.boot.module.jcs.api.dto.*;
+import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto;
+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.PowerTransferCompanyResourcesDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -21,25 +38,17 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.common.collect.Lists;
-import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
-import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 力量调派 服务实现类
@@ -75,6 +84,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     PowerTransferMapper powerTransferMapper;
 
     @Autowired
+    EquipFeignClient equipFeignClient;
+
+    @Autowired
     private EmqKeeper emqKeeper;
 
     @Value("${mqtt.topic.command.power.deployment}")
@@ -148,7 +160,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                                 || FireCarStatusEnum.出动.getCode().equals(car.get("carState"))).forEach(car -> {
                     FireBrigadeResourceDto fireCarDto = (FireBrigadeResourceDto) Bean.mapToBean(car,
                             FireBrigadeResourceDto.class);
-                    // TODO 后期根据车物联状态来返回，现在为"在位=执勤","执勤=出动"
+                    // TODO 后期根据车物联状态来返回，现在为"(装备)在位=执勤","(装备)执勤=出动"
                     if (FireCarStatusEnum.执勤.getCode().equals(fireCarDto.getCarState())) {
                         fireCarDto.setCarStateDesc(FireCarStatusEnum.执勤.getName());
                     } else {
@@ -352,4 +364,53 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         }
         return list;
     }
+
+    @Override
+    public IPage<PowerTransferResourceDto> getPowerTransferPageByParam(Long alertCalledId, String type, Page<PowerTransferResourceDto> page) {
+        if (ValidationUtil.isEmpty(alertCalledId)) {
+            throw new BaseException("警情id为空", "", "警情id为空");
+        }
+        IPage<PowerTransferResourceDto> resultPage = null;
+        switch (type) {
+            case "company":
+                resultPage = powerTransferMapper.getPowerTransferTeamResource(page, alertCalledId);
+                break;
+            case "car":
+                resultPage = getPowerTransferCarResource(page, alertCalledId);
+                break;
+            case "person":
+                // TODO 暂时没有调度人员
+                resultPage = new Page<>();
+                break;
+            default:
+                break;
+        }
+        return resultPage;
+    }
+
+    private IPage<PowerTransferResourceDto> getPowerTransferCarResource(Page<PowerTransferResourceDto> page, Long alertCalledId) {
+        ResponseModel<Object> result = equipFeignClient.getFireCarListAll();
+        Map<String, List<Map<String, Object>>> carInfoMap = Maps.newConcurrentMap();
+        if (!ValidationUtil.isEmpty(result)) {
+            List<Map<String, Object>> fireCarListMapList = (List<Map<String, Object>>) result.getResult();
+            if (!ValidationUtil.isEmpty(fireCarListMapList)) {
+                carInfoMap =
+                        fireCarListMapList.stream().collect(Collectors.groupingBy(car -> car.get("id").toString()));
+            }
+        }
+
+        IPage<PowerTransferResourceDto> carResourcePage = powerTransferMapper.getPowerTransferCarResource(page, alertCalledId);
+        Map<String, List<Map<String, Object>>> finalCarInfoMap = carInfoMap;
+        carResourcePage.getRecords().forEach(car -> {
+            String seq = car.getSequenceNbr().toString();
+            car.setName((String) finalCarInfoMap.get(seq).get(0).get("name"));
+            String carStateCode = (String) finalCarInfoMap.get(seq).get(0).get("carState");
+            FireCarStatusEnum.getEnum(carStateCode);
+            car.setCarState(!ValidationUtil.isEmpty(FireCarStatusEnum.getEnum(carStateCode)) ?
+                    FireCarStatusEnum.getEnum(carStateCode).getName() : "");
+            List<String> images = (List<String>) finalCarInfoMap.get(seq).get(0).get("image");
+            car.setImg(!ValidationUtil.isEmpty(images) ? images.get(0) : "");
+        });
+        return carResourcePage;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/InputItemController.java

@@ -93,7 +93,7 @@ public class InputItemController extends AbstractBaseController {
             BeanUtils.copyProperties(param, inputItem);
             inputItem.setOrgCode(loginOrgCode);
             inputItem.setCreateBy(user.getUserId());
-            inputItem.setItemStart("0");
+            inputItem.setItemStart(0);
             inputItemService.addNewInputItem(inputItem);
             return CommonResponseUtil.success();
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanController.java

@@ -3,15 +3,13 @@ package com.yeejoin.amos.supervision.business.controller;
 import java.util.HashMap;
 import java.util.List;
 
+import com.yeejoin.amos.supervision.core.common.request.AddPlanRequest;
+import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
@@ -86,7 +84,7 @@ public class PlanController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "巡检计划新增及编辑", notes = "巡检计划新增及编辑")
     @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
+    public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody AddPlanRequest param) {
         try {
             String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
@@ -188,4 +186,33 @@ public class PlanController extends AbstractBaseController {
         return CommonResponseUtil.success(list);
     }
 
+    /**
+     * 计划启用停用
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "计划启用停用", notes = "计划启用停用")
+    @RequestMapping(value = "/setPlanStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse setPlanStatus(
+            @ApiParam(value = "计划id") @RequestParam(value = "planId", required = false) Long planId,
+            @ApiParam(value = "计划状态") @RequestParam(value = "status", required = false) byte status ) {
+        planService.setplanstatus(planId, status);
+        return CommonResponseUtil.success();
+    }
+
+    /**
+     * 获取计划详情
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "计划启用停用", notes = "计划启用停用")
+    @RequestMapping(value = "/getPlanDetails", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse getPlanDetails(
+            @ApiParam(value = "计划id") @RequestParam(value = "planId", required = false) Long planId ) {
+        PlanPointRespone planRequest = planService.getplandetails(planId);
+        return CommonResponseUtil.success(planRequest);
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PointMapper.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.supervision.business.param.PointImportQueryParam;
 import com.yeejoin.amos.supervision.business.vo.LeavelMovePointVo;
 import com.yeejoin.amos.supervision.business.vo.PointInputItemVo;
 import com.yeejoin.amos.supervision.business.vo.PointVo;
+import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
 import org.apache.ibatis.annotations.Param;
 
 import com.yeejoin.amos.supervision.core.common.response.PointResponse;
@@ -141,4 +142,18 @@ public interface PointMapper extends BaseMapper {
 	 */
 	List<Map<String, Object>> getPointRefItem(List<Long> list);
 
+	/**
+	 * 根据业主单位查询点
+	 */
+	List<Long> getPointRouteList(List<Long> list);
+
+	/**
+	 * 根据业主单位查询点
+	 */
+	List<PointInputItem> getPointRouteItem(List<Long> list);
+
+	/**
+	 * 根据路线id查询所有点
+	 */
+	List<Long> getPointoriginalidbyrouteid(@Param(value = "routeId") Long routeId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/PlanInfoPageParam.java

@@ -47,6 +47,21 @@ public class PlanInfoPageParam extends CommonPageable {
 	 */
 	private String ownerId;
 
+	/**
+	 * 业主单位id
+	 */
+	private String planStatus;
+
+	/**
+	 * 业主单位id
+	 */
+	private String checkTypeId;
+
+	/**
+	 * 业主单位id
+	 */
+	private String leadPerson;
+
 	public String getOwnerId() {
 		return ownerId;
 	}
@@ -103,4 +118,27 @@ public class PlanInfoPageParam extends CommonPageable {
 		this.userId = userId;
 	}
 
+	public String getPlanStatus() {
+		return planStatus;
+	}
+
+	public void setPlanStatus(String planStatus) {
+		this.planStatus = planStatus;
+	}
+
+	public String getCheckTypeId() {
+		return checkTypeId;
+	}
+
+	public void setCheckTypeId(String checkTypeId) {
+		this.checkTypeId = checkTypeId;
+	}
+
+	public String getLeadPerson() {
+		return leadPerson;
+	}
+
+	public void setLeadPerson(String leadPerson) {
+		this.leadPerson = leadPerson;
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

 package com.yeejoin.amos.supervision.business.service.impl;
 
 import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import com.yeejoin.amos.supervision.business.dao.mapper.PlanMapper;
-import com.yeejoin.amos.supervision.business.dao.repository.IPlanDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IPlanTaskDetailDao;
-import com.yeejoin.amos.supervision.business.dao.repository.IRouteDao;
+import com.yeejoin.amos.supervision.business.dao.mapper.PointMapper;
+import com.yeejoin.amos.supervision.business.dao.mapper.RouteMapper;
+import com.yeejoin.amos.supervision.business.dao.repository.*;
 import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanService;
+import com.yeejoin.amos.supervision.core.common.request.AddPlanRequest;
+import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
 import com.yeejoin.amos.supervision.core.util.DateUtil;
-import com.yeejoin.amos.supervision.dao.entity.Plan;
-import com.yeejoin.amos.supervision.dao.entity.Route;
+import com.yeejoin.amos.supervision.dao.entity.*;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
+import org.apache.velocity.util.ArrayListWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -44,6 +47,24 @@ public class PlanServiceImpl implements IPlanService {
     @Autowired
     IRouteDao iRouteDao;
 
+    @Autowired
+    IPointDao iPointDao;
+
+    @Autowired
+    private PointMapper pointMapper;
+
+    @Autowired
+    private IRoutePointDao iRoutePointDao;
+
+    @Autowired
+    private IRoutePointItemDao iRoutePointItemDao;
+
+    @Autowired
+    private IPointInputItemDao iPointInputItemDao;
+
+    @Autowired
+    private IPlanService planService;
+
     private static final Logger logger = LoggerFactory.getLogger(PlanServiceImpl.class);
 
     @Override
@@ -80,14 +101,21 @@ public class PlanServiceImpl implements IPlanService {
     }
 
     @Override
+    @Transactional
     public void addPlan(HashMap<String, Object> map) {
-        Plan param = (Plan) map.get("param");
+        // 新增路线
+        AddPlanRequest addPlanRequest = (AddPlanRequest) map.get("param");
+        Plan param = addPlanRequest.getPlan();
         String orgCode = map.get("org_code") == null ? "" : map.get("org_code").toString();
         String userId = map.get("user_id") == null ? "" : map.get("user_id").toString();
         param.setOrgCode(orgCode);
-        param.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_START));
+        param.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_STOP));
         param.setNextGenDate(DateUtil.getIntervalDate(new Date(), 0));
         param.setCreateBy(userId);
+        addPlanRequest.setPlan(param);
+        Route route = save(addPlanRequest);
+        if (!ObjectUtils.isEmpty(route)) {
+            param.setRouteId(route.getId());
             //编辑计划
             if (param.getId() > 0) {
                 Plan oriPlan = planDao.findById(param.getId()).get();
@@ -102,6 +130,58 @@ public class PlanServiceImpl implements IPlanService {
             }
             planDao.save(param);
         }
+    }
+
+    /**
+     *  默认新增路线
+     */
+    public Route save (AddPlanRequest addPlanRequest) {
+        Route saveRoute = new Route();
+        Plan plan = addPlanRequest.getPlan();
+
+        // 判断是新增还是修改
+        if (plan.getId()>0) {
+            // 删除相关点项内容
+            iRoutePointDao.delRoutePointByRouteId(plan.getRouteId());
+            iRoutePointItemDao.delRoutePointItem(plan.getRouteId());
+            saveRoute.setId(plan.getRouteId());
+        }
+
+        saveRoute.setName(plan.getName());
+        saveRoute.setOrgCode(plan.getOrgCode());
+        saveRoute.setCreatorId(plan.getCreateBy());
+        Route route = iRouteDao.save(saveRoute);
+
+        if (!ObjectUtils.isEmpty(route.getId())) {
+            // 新增路线与点关系
+            List<Long> ownerIds = addPlanRequest.getOwnerId();
+            if (!ObjectUtils.isEmpty(ownerIds)) {
+                List<Long> pointVos = pointMapper.getPointRouteList(ownerIds);
+                if (!ObjectUtils.isEmpty(pointVos)) {
+                    if (!ObjectUtils.isEmpty(pointVos)) {
+                        pointVos.forEach(point -> {
+                            RoutePoint routePoint = new RoutePoint();
+                            routePoint.setOrgCode(plan.getOrgCode());
+                            routePoint.setCreatorId(plan.getCreateBy());
+                            routePoint.setRouteId(route.getId());
+                            routePoint.setPointId(point);
+                            iRoutePointDao.save(routePoint);
+                        });
+                        List<PointInputItem> pointInputItems = pointMapper.getPointRouteItem(pointVos);
+                        if (!ObjectUtils.isEmpty(pointInputItems)) {
+                            pointInputItems.forEach(pointInputItem -> {
+                                RoutePointItem routePointItem = new RoutePointItem();
+                                routePointItem.setRoutePointId(route.getId());
+                                routePointItem.setPointInputItemId(pointInputItem.getId());
+                                iRoutePointItemDao.save(routePointItem);
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        return route;
+    }
 
     @Override
     @Transactional
@@ -176,5 +256,22 @@ public class PlanServiceImpl implements IPlanService {
         return planMapper.queryPlanListByOrgCode(loginOrgCode);
     }
 
+    @Override
+    public void setplanstatus (Long id, byte status) {
+        Plan oriPlan = planDao.findById(id).get();
+        oriPlan.setStatus(status);
+        planDao.save(oriPlan);
+    }
 
+    @Override
+    public PlanPointRespone  getplandetails (Long id) {
+        PlanPointRespone planRequest = new PlanPointRespone();
+        Plan plan =  planService.queryPlanById(id);;
+        if (!ObjectUtils.isEmpty(plan)) {
+            List<Long> ids = pointMapper.getPointoriginalidbyrouteid(plan.getRouteId());
+            planRequest.setPlan(plan);
+            planRequest.setOwnerId(ids);
+        }
+        return planRequest;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPlanService.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.supervision.business.service.intfc;
 import java.util.HashMap;
 import java.util.List;
 
+import com.yeejoin.amos.supervision.core.common.request.AddPlanRequest;
+import com.yeejoin.amos.supervision.core.common.response.PlanPointRespone;
+import com.yeejoin.amos.supervision.dao.entity.Point;
 import org.springframework.data.domain.Page;
 
 import com.yeejoin.amos.supervision.business.param.PlanInfoPageParam;
@@ -70,5 +73,13 @@ public interface IPlanService {
 	 */
 	List<HashMap<String, Object>> queryPlanListByOrgCode(String loginOrgCode);
 
+	/**
+	 * 计划启用停用
+	 */
+	void setplanstatus(Long id, byte status);
 
+	/**
+	 * 获取计划详情
+	 */
+	PlanPointRespone getplandetails(Long id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/PlanPageParamUtil.java

@@ -24,6 +24,12 @@ public class PlanPageParamUtil {
 				param.setRemark(toString(queryRequests.get(i).getValue()));
 			}else if("ownerId".equals(name)){
 				param.setOwnerId(toString(queryRequests.get(i).getValue()));
+			}else if("planStatus".equals(name)){
+				param.setPlanStatus(toString(queryRequests.get(i).getValue()));
+			}else if("leadPerson".equals(name)){
+				param.setLeadPerson(toString(queryRequests.get(i).getValue()));
+			}else if("checkTypeId".equals(name)){
+				param.setCheckTypeId(toString(queryRequests.get(i).getValue()));
 			}
 		}		
 		param.setOrgCode(perMap.get("orgCode") == null ? null:perMap.get("orgCode").toString());

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.SystemClock;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -10,18 +11,24 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlarmStatisticsDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCallInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledObjsDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledRequestDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.MaintenanceUnitDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
+import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchPaperServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ESAlertCalledService;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -34,6 +41,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -45,6 +53,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -63,14 +72,25 @@ public class AlertCalledController extends BaseController {
 
 	@Autowired
 	RedisUtils redisUtils;
+
 	@Autowired
 	AlertCalledServiceImpl iAlertCalledService;
+
 	@Autowired
-	private ESAlertCalledService eSAlertCalledService;
+	ESAlertCalledService eSAlertCalledService;
+
 	@Autowired
 	DispatchPaperServiceImpl dispatchPaperServiceImpl;
+
 	@Autowired
 	AlertFormValueServiceImpl iAlertFormValueService;
+
+	@Autowired
+	ElevatorServiceImpl elevatorServiceImpl;
+
+	@Autowired
+	MaintenanceCompanyServiceImpl maintenanceCompanyService;
+
     /**
      * 新增警情接警填报记录
      *
@@ -89,7 +109,6 @@ public class AlertCalledController extends BaseController {
 		return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto());
 	}
 
-
 	/**
 	 *
 	 * <pre>
@@ -114,8 +133,6 @@ public class AlertCalledController extends BaseController {
 		return ResponseHelper.buildResponse(esAlertCalledDtoPage);
 	}
 
-
-
     /**
      * 根据id查询
      *
@@ -147,7 +164,6 @@ public class AlertCalledController extends BaseController {
 		return ResponseHelper.buildResponse(alertCallInfoDto);
 	}
 
-
 	/**
 	 * 获取下一个 工单编号
 	 *
@@ -271,9 +287,6 @@ public class AlertCalledController extends BaseController {
 		return queryWrapper;
 	}
 
-
-
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询警情事件记录", notes = "查询警情事件记录")
 	@PostMapping("/selectRecord")
@@ -296,7 +309,6 @@ public class AlertCalledController extends BaseController {
 				AlertCalledQueryDto.class, null, false);
 	}
 
-
 	/**
 	 * 冻结工单-维修
 	 * @return

amos-boot-system-jcs/pom.xml

@@ -22,6 +22,10 @@
 			<artifactId>amos-boot-module-command-biz</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
+      <dependency>
+          <groupId>org.liquibase</groupId>
+          <artifactId>liquibase-core</artifactId>
+      </dependency>
   </dependencies>
 
     <build>

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -83,5 +83,19 @@
 			INSERT INTO `jc_controller_equip` VALUES (1397145718640209921, 1428325285853433857, '103', '4号门', '1', '2021-08-20 09:46:02', 3111584, 'admin_jcs', '0');
     	</sql>
 	</changeSet>
+	<changeSet author="tb" id="2021-08-23-tb-1">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="cb_water_resource"/>
+		</preConditions>
+		<comment>modify table cb_water_resource add several columns</comment>
+		<sql>
+			ALTER TABLE `cb_water_resource` ADD equip_id BIGINT ( 20 ) COMMENT '设施定义',
+			ADD COLUMN equip_name VARCHAR ( 50 ) COMMENT '设施定义名称',
+			ADD COLUMN equip_category_id BIGINT ( 20 ) COMMENT '设施分类',
+			ADD COLUMN equip_category_name VARCHAR ( 50 ) COMMENT '设施分类名称',
+			ADD COLUMN equip_code VARCHAR ( 20 ) COMMENT '设施编码',
+			ADD COLUMN maintenance_period VARCHAR ( 10 ) COMMENT '维保周期';
+		</sql>
+	</changeSet>
 	
 </databaseChangeLog>

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -26,6 +26,11 @@
 			 <if test="testRequirement != null ">test_requirement=#{testRequirement},</if>
 			 <if test="inputClassify != null ">input_classify=#{inputClassify},</if>
 			 <if test="unit != null ">unit=#{unit},</if>
+			 <if test="checkType != null ">check_type=#{checkType},</if>
+			 <if test="itemParent != null ">item_parent=#{itemParent},</if>
+			 <if test="itemClassify != null ">item_classify=#{itemClassify},</if>
+			 <if test="itemTypeClassify != null ">item_type_classify=#{itemTypeClassify},</if>
+			 <if test="itemLevel != null ">item_level=#{itemLevel},</if>
  		</trim>
  		WHERE id=#{id}
 	</update>

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -147,6 +147,16 @@
 		b.owner_name AS ownerName,
 	    b.boss_name as bossName,
 	    a.user_name as userName,
+	    a.check_type_id as checkTypeId,
+		a.check_type_name as checkTypeName,
+		a.lead_department_ids as leadDepartmentIds,
+		a.lead_department_names as leadDepartmentNames,
+		a.lead_people_ids as leadPeopleIds,
+		a.lead_people_names as leadPeopleNames,
+		a.maker_user_id as makerUserId,
+		a.maker_user_name as makerUserName,
+		a.maker_user_dept_name as makerUserDeptName,
+		(select count(1) from p_route_point ppo where ppo.route_id = b.id) as totalPoint,
 		(select count(1) from p_plan_task t where t.plan_id = a.id) as totalPlanTask,
 		(select count(1) from p_plan_task t where t.plan_id = a.id and t.finish_status <![CDATA[<=]]> 1 ) as waitFinishPlanTask
 		FROM
@@ -155,7 +165,8 @@
 		WHERE
 		a.route_Id = b.id and a.is_delete = 0
 		<if test="planName!=null"> and a.name like concat(concat("%",#{planName}),"%")</if>
-		<if test="planType!=null"> and a.plan_Type = #{planType}</if>
+		<if test="checkTypeId!=null and checkTypeId != '' "> and a.check_type_id = #{checkTypeId}</if>
+		<if test="leadPerson!=null and leadPerson != '' "> and a.lead_people_ids = #{leadPerson}</if>
 		<if test="routeId!=null"> and a.route_Id = #{routeId}</if>
 		<if test="remark!=null"> and a.remark1 like concat(concat("%",#{remark}),"%")</if>
 		<if test="userId!=null"> and FIND_IN_SET(#{userId},a.user_id)</if>

amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml

@@ -1100,4 +1100,43 @@
 					#{pointId}
 		 		</foreach>
 	</select>
+
+	<select id="getPointRouteList" parameterType="list" resultType="Long">
+		SELECT
+			ppi.id
+		FROM
+			p_point ppi
+		WHERE
+			ppi.original_id IN
+		<foreach collection="list" open="(" close=")" separator="," item="routeId">
+			#{routeId}
+		</foreach>
+	</select>
+
+
+	<select id="getPointRouteItem" parameterType="list" resultType="com.yeejoin.amos.supervision.dao.entity.PointInputItem">
+		SELECT
+		ppi.id
+		, ppi.input_item_id itemId
+		, ppi.point_id pointId
+		, ppi.classify_ids classifyId
+		FROM
+		p_point_inputitem ppi
+		WHERE
+		ppi.point_id IN
+		<foreach collection="list" open="(" close=")" separator="," item="pointId">
+			#{pointId}
+		</foreach>
+	</select>
+
+	<select id="getPointoriginalidbyrouteid"  parameterType="long" resultType="Long">
+		SELECT
+			original_id
+		FROM
+			p_point as ppo
+		LEFT JOIN p_route_point as prp ON
+			ppo.id = prp.point_id
+		WHERE
+		 	prp.route_id = #{routeId}
+	</select>
 </mapper>
\ No newline at end of file

pom.xml

@@ -308,16 +308,16 @@
 			<name>maven-public</name>
 			<url>http://172.16.1.6:8081/nexus/content/repositories/maven-public/</url>
 		</repository>
-		<repository>
-			<id>maven-public1</id>
-			<name>maven-public</name>
-			<url>http://repo.typroject.org:8081/repository/maven-public/</url>
-		</repository>
-		<repository>
-			<id>maven-snapshot</id>
-			<name>maven-snapshot</name>
-			<url>http://repo.typroject.org:8081/repository/maven-snapshots/</url>
-		</repository>
+<!--		<repository>-->
+<!--			<id>maven-public1</id>-->
+<!--			<name>maven-public</name>-->
+<!--			<url>http://repo.typroject.org:8081/repository/maven-public/</url>-->
+<!--		</repository>-->
+<!--		<repository>-->
+<!--			<id>maven-snapshot</id>-->
+<!--			<name>maven-snapshot</name>-->
+<!--			<url>http://repo.typroject.org:8081/repository/maven-snapshots/</url>-->
+<!--		</repository>-->
 	</repositories>
 
 	<modules>