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

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

@@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import feign.Response;
 
-@FeignClient(name = "AMOS-API-WORKFLOW-CHENZHAO", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**
 	 * 发起流程

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

@@ -14,6 +14,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.util.Date;
+import java.util.Map;
 
 /**
  * @author Dell
@@ -39,10 +40,10 @@ public class MetaHandler implements MetaObjectHandler {
 	 */
 	@Override
 	public void insertFill(MetaObject metaObject) {		
-	   autoFillUser(metaObject);
+	   autoFillUser(metaObject, metaObject.getOriginalObject());
 	}
 
-	private void autoFillUser(MetaObject metaObject) {
+	private void autoFillUser(MetaObject metaObject, Object entity) {
 		//获取用户信息 以及当前用户登录公司部门，角色
 		ReginParams reginParams =
 				JSONObject.parseObject(null != redisUtils.get(RedisKey.buildKey(getToken())) ?
@@ -54,12 +55,12 @@ public class MetaHandler implements MetaObjectHandler {
 
 		if(ObjectUtils.isEmpty(reginParams) || ObjectUtils.isEmpty(agencyUserModel)){
 			return;
-		}	
-		Object entity = metaObject.getOriginalObject();
+		}
+//		Object entity = metaObject.getOriginalObject();
 		if (isExistField("recUserId", entity)) {
 			this.setFieldValByName("recUserId", agencyUserModel.getUserId(), metaObject);
 		}
-		
+
 		if (isExistField("recUserName", entity)) {
 			this.setFieldValByName("recUserName", agencyUserModel.getUserName(), metaObject);
 		}
@@ -71,8 +72,8 @@ public class MetaHandler implements MetaObjectHandler {
 			Date currentDate = new Date();
 			this.setFieldValByName("recDate", currentDate, metaObject);
 		}
-		
-		
+
+
 //		if (isExistField("companyCode", entity)) {
 //			this.setFieldValByName("companyCode", reginParams.getDepartment().getOrgCode(), metaObject);
 //		}				
@@ -102,6 +103,8 @@ public class MetaHandler implements MetaObjectHandler {
 	 */
 	@Override
 	public void updateFill(MetaObject metaObject) {
+		Object updateEntity = ((Map)metaObject.getOriginalObject()).get("et");
+		autoFillUser(metaObject, updateEntity);
 		Date currentDate = new Date();
 		this.setFieldValByName("updateTime", currentDate, metaObject);
 	}

amos-boot-biz-common/src/main/resources/template/controller.java.ftl

@@ -35,7 +35,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 <#else>
 @Controller
 </#if>
-@RequestMapping(value = "<#if package.ModuleName??>/${package.ModuleName}</#if>/<#if controllerMappingHyphenStyle??>${controllerMappingHyphen}<#else>${table.entityPath}</#if>")
+@RequestMapping(value = "/<#if controllerMappingHyphenStyle??>${controllerMappingHyphen}<#else>${table.entityPath}</#if>")
 <#if kotlin>
     class ${table.controllerName}<#if superControllerClass??> : ${superControllerClass}()</#if>
 <#else>

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import java.util.Date;
 /**
 * 消防员合同
 *
@@ -52,5 +55,8 @@ public class FirefightersContractDto extends BaseDto {
 
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
+    
+    @ApiModelProperty(value = "附件")
+    private Map<String, List<AttachmentDto>> attachments;
 
 }

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

@@ -306,10 +306,16 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "物联参数")
     private WaterResourceIotDto waterResourceIotDto;
 
+    @ApiModelProperty("设施定义id")
+    private Long equipId;
+
     @ApiModelProperty("设施定义名称")
     @ExcelProperty(value = "设施定义名称", index = 44)
     private String equipName;
 
+    @ApiModelProperty("设施分类id")
+    private Long equipCategoryId;
+
     @ApiModelProperty("设施分类名称")
     @ExcelProperty(value = "设施分类名称", index = 45)
     private String equipCategoryName;

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +14,8 @@ import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 /**
 * 消防员合同
 *
@@ -66,4 +70,9 @@ public class FirefightersContract extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
+    
+    @TableField(exist = false)
+    @ApiModelProperty(value = "附件")
+    private Map<String, List<AttachmentDto>> attachments;
+ 
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersContractDto;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 /**
 * 消防员合同 服务类
 *
@@ -7,5 +10,14 @@ package com.yeejoin.amos.boot.module.common.api.service;
 * @date 2021-06-07
 */
 public interface IFirefightersContractService {
+  
+	
+	/**
+	 * 保存
+	 * @param firefightersContract
+	 * @return
+	 */
+	public FirefightersContractDto save(FirefightersContractDto firefightersContract);
 
+	public FirefightersContractDto updateById(FirefightersContractDto firefightersContract, AgencyUserModel userInfo);
 }

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

@@ -50,4 +50,5 @@ public interface ILinkageUnitService {
 	public  List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName) ;
 	List<LinkageUnitDto> exportToExcel();
 
+	List<LinkageUnitDto> queryForLinkageUnitList(Boolean isDelete);
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 机构/部门/人员表 服务类

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

@@ -110,8 +110,8 @@
                              when ISNULL(belong_fighting_system) = 0 and LENGTH(trim(belong_fighting_system)) > 0
                                  then belong_fighting_system
                              else '其他' end) belong_fighting_system,
-                        resource_type,
-                        resource_type_name
+                        equip_id as resource_type,
+                        equip_name as resource_type_name
         from cb_water_resource
         where is_delete = #{isDelete}
     </select>

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AircraftDtos extends BaseRowModel {
+    @ExcelIgnore
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty(value = "飞机型号", index = 0)
+    @ApiModelProperty(value = "飞机型号")
+    private String aircraftModel;
+
+    @ExcelProperty(value = "中文全称", index = 1)
+    @ApiModelProperty(value = "中文全称")
+    private String fullName;
+
+    @ExcelProperty(value = "飞机长度", index = 2)
+    @ApiModelProperty(value = "飞机长度")
+    private Double aircraftLength;
+
+    @ExcelProperty(value = "机舱长度", index = 3)
+    @ApiModelProperty(value = "机舱长度")
+    private Double cabinLength;
+
+    @ExcelProperty(value = "尾翼高度", index = 4)
+    @ApiModelProperty(value = "尾翼高度")
+    private Double tailHeight;
+
+    @ExcelProperty(value = "翼展", index = 5)
+    @ApiModelProperty(value = "翼展")
+    private Double wingspan;
+
+    @ExcelProperty(value = "机身直径", index = 6)
+    @ApiModelProperty(value = "机身直径")
+    private Double fuselageDiameter;
+
+    @ExcelProperty(value = "翼展面积", index = 7)
+    @ApiModelProperty(value = "翼展面积")
+    private Double wingspanArea;
+
+    @ExplicitConstraint(type = "FDJLX", indexNum = 8, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "发动机类型", index = 8)
+    @ApiModelProperty(value = "发动机类型")
+    private String engineType;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "发动机类型code")
+    private String engineTypeCode;
+
+    @ExcelProperty(value = "发动机数量", index = 9)
+    @ApiModelProperty(value = "发动机数量")
+    private Integer enginesmNum;
+
+    @ExcelProperty(value = "发动机型号", index = 10)
+    @ApiModelProperty(value = "发动机型号")
+    private String engineModel;
+
+    @ExplicitConstraint(type = "RYLX", indexNum = 11, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "燃油类型", index = 11)
+    @ApiModelProperty(value = "燃油类型")
+    private String fuelType;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "燃油类型code")
+    private String fuelTypeCode;
+
+    @ExcelProperty(value = "最大载油量", index = 12)
+    @ApiModelProperty(value = "最大载油量")
+    private Double oilLoadMax;
+
+    @ExcelProperty(value = "标准燃油", index = 13)
+    @ApiModelProperty(value = "标准燃油")
+    private Double standardFuel;
+
+    @ExcelProperty(value = "空重", index = 14)
+    @ApiModelProperty(value = "空重")
+    private Double emptyWeight;
+
+    @ExcelProperty(value = "飞机主要构造材料", index = 15)
+    @ApiModelProperty(value = "飞机主要构造材料")
+    private String structuralMaterial;
+
+    @ExcelProperty(value = "氧气瓶数量", index = 16)
+    @ApiModelProperty(value = "氧气瓶数量")
+    private Integer oxygenCylinderNum;
+
+    @ExcelProperty(value = "氧气瓶位置描述", index = 17)
+    @ApiModelProperty(value = "氧气瓶位置描述")
+    private String oxygenCylinderLocation;
+
+    @ExcelProperty(value = "标准坐席数", index = 18)
+    @ApiModelProperty(value = "标准坐席数")
+    private Integer seatNum;
+
+    @ExcelProperty(value = "商载(吨)", index = 19)
+    @ApiModelProperty(value = "商载(吨)")
+    private Double commercialLoad;
+
+    @ExcelProperty(value = "货仓容积（立方米）", index = 20)
+    @ApiModelProperty(value = "货仓容积（立方米）")
+    private Double warehouseVolume;
+
+    @ExcelProperty(value = "最大起飞总重（吨）", index = 21)
+    @ApiModelProperty(value = "最大起飞总重（吨）")
+    private Double takeoffWeightNum;
+
+    @ExcelProperty(value = "最大巡航速度（马赫）", index = 22)
+    @ApiModelProperty(value = "最大巡航速度（马赫）")
+    private Double cruiseSpeedNum;
+
+    @ExcelProperty(value = "航程", index = 23)
+    @ApiModelProperty(value = "航程")
+    private Double voyage;
+
+    @ExcelProperty(value = "主要设施", index = 24)
+    @ApiModelProperty(value = "主要设施")
+    private String facilitie;
+
+    @ExcelProperty(value = "主要燃烧物质", index = 25)
+    @ApiModelProperty(value = "主要燃烧物质")
+    private String combustionMaterial;
+
+    @ExcelProperty(value = "疏散出口及安全通道", index = 26)
+    @ApiModelProperty(value = "疏散出口及安全通道")
+    private String exitPassage;
+
+    @ExcelProperty(value = "备注", index = 27)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ExcelProperty(value = "外观图", index = 28)
+    @ApiModelProperty(value = "外观图")
+    private String appearanceImages;
+
+    @ExcelProperty(value = "平面图", index = 29)
+    @ApiModelProperty(value = "平面图")
+    private String planeImages;
+
+    @ExcelProperty(value = "救援图", index = 30)
+    @ApiModelProperty(value = "救援图")
+    private String rescueImages;
+
+    @ExcelProperty(value = "方位图", index = 31)
+    @ApiModelProperty(value = "方位图")
+    private String positionImages;
+
+    @ExcelProperty(value = "三维模型", index = 32)
+    @ApiModelProperty(value = "三维模型")
+    private String models;
+
+    @ApiModelProperty(value = "现场图片")
+    private List<String> scenePicture;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AlertLocationLogDto", description="")
+public class AlertLocationLogDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "警情id")
+    private Long alertId;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 集结点
+ *
+ * @author system_generator
+ * @date 2021-08-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="RallyPointDto", description="集结点")
+public class RallyPointDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "警情id")
+    private Long alertId;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2021-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_alert_location_log")
+public class AlertLocationLog extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 警情id
+     */
+	@TableField("alert_id")
+    private Long alertId;
+
+    /**
+     * 经度
+     */
+	@TableField("longitude")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("latitude")
+    private String latitude;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 集结点
+ *
+ * @author system_generator
+ * @date 2021-08-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_rally_point")
+public class RallyPoint extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 地址
+     */
+	@TableField("address")
+    private String address;
+
+    /**
+     * 警情id
+     */
+	@TableField("alert_id")
+    private Long alertId;
+
+    /**
+     * 经度
+     */
+	@TableField("longitude")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("latitude")
+    private String latitude;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertLocationLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-08-26
+ */
+public interface AlertLocationLogMapper extends BaseMapper<AlertLocationLog> {
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.RallyPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 集结点 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-08-25
+ */
+public interface RallyPointMapper extends BaseMapper<RallyPoint> {
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2021-08-26
+ */
+public interface IAlertLocationLogService {
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+ * 集结点接口类
+ *
+ * @author system_generator
+ * @date 2021-08-25
+ */
+public interface IRallyPointService {
+
+}

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

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

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

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

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

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import io.swagger.annotations.ApiImplicitParam;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -178,8 +179,8 @@ public class FailureDetailsController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "流程信息", notes = "流程信息")
-    @GetMapping(value = "/processHistory/{sequenceNbr}")
-    public ResponseModel<Object> selectHistoryt(@PathVariable Long sequenceNbr) {
+    @GetMapping(value = "/processHistory")
+    public ResponseModel<Object> selectHistoryt(@RequestParam Long sequenceNbr) {
         return ResponseHelper.buildResponse(failureDetailsServiceImpl.getCurrentProcessHistoryTask(sequenceNbr));
     }
 

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,20 +16,14 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -59,8 +56,7 @@ public class FireExpertsController extends BaseController {
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
     
-    @Autowired
-    DataDictionaryMapper dataDictionaryMapper;
+
 
     /**
      * 新增
@@ -188,4 +184,40 @@ public class FireExpertsController extends BaseController {
         // 创建挂在主节点
         return ResponseHelper.buildResponse(menuList);
     }
+
+    /**
+     *
+     * 导入航空器信息
+     *
+     * **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/ImportData")
+    @ApiOperation(httpMethod = "POST", value = "导入消防专家", notes = "导入消防专家")
+    public Boolean ImportData (@RequestPart MultipartFile multipartFile)  {
+        List<FireExperts> aircraftList = new ArrayList<>();
+        try {
+
+            EasyExcel.read(multipartFile.getInputStream(), FireExpertsDto.class, new AnalysisEventListener<FireExpertsDto>() {
+
+                // 每读取一行就调用该方法
+                @Override
+                public void invoke(FireExpertsDto data, AnalysisContext context) {
+
+                    FireExperts fireExperts = new FireExperts();
+                    BeanUtils.copyProperties(data,fireExperts);
+                    aircraftList.add(fireExperts);
+                }
+                // 全部读取完成就调用该方法
+                @Override
+                public void doAfterAllAnalysed(AnalysisContext context) {
+                    System.out.println("读取完成");
+                }
+            }).sheet().doRead();
+
+            fireExpertsServiceImpl.saveBatch(aircraftList);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -28,8 +29,11 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FirefightersContractDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.common.api.service.IFirefightersContractService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContractServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +52,12 @@ public class FirefightersContractController extends BaseController {
 
     @Autowired
     FirefightersContractServiceImpl iFirefightersContractService;
+ 
+    @Autowired
+    IFirefightersContractService firefightersContractService;
+    
+    @Autowired
+  	SourceFileServiceImpl sourceFileService;
     @Autowired
     RedisUtils redisUtils;
     @Value("${redis.cache.failure.time}")
@@ -59,9 +69,8 @@ public class FirefightersContractController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防员合同", notes = "新增消防员合同")
-    public ResponseModel<FirefightersContract> saveFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContract firefightersContract){
-    	 iFirefightersContractService.save(firefightersContract);
-       	 return ResponseHelper.buildResponse(firefightersContract);
+    public ResponseModel<FirefightersContractDto> saveFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContractDto firefightersContract){
+       	 return ResponseHelper.buildResponse(firefightersContractService.save(firefightersContract));
     }
 
     /**
@@ -93,8 +102,8 @@ public class FirefightersContractController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改消防员合同", notes = "修改消防员合同")
-    public ResponseModel<FirefightersContract> updateByIdFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContract firefightersContract){
-        iFirefightersContractService.updateById(firefightersContract);    
+    public ResponseModel<FirefightersContractDto> updateByIdFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContractDto firefightersContract){
+    	firefightersContractService.updateById(firefightersContract, getUserInfo());    
        //删除缓存
        redisUtils.del(RedisKey.CONTRACT_ID+firefightersContract.getSequenceNbr());
        return ResponseHelper.buildResponse(firefightersContract);  	          	      	
@@ -116,9 +125,12 @@ public class FirefightersContractController extends BaseController {
             return ResponseHelper.buildResponse(obj);
         }else{
             FirefightersContract firefightersContract= iFirefightersContractService.getById(id);
-            redisUtils.set(RedisKey.CONTRACT_ID+id, JSON.toJSON(firefightersContract),time);
-            return ResponseHelper.buildResponse(firefightersContract);
-        }
+            FirefightersContractDto dto = new  FirefightersContractDto();
+            Bean.copyExistPropertis(firefightersContract, dto);
+            dto.setAttachments(sourceFileService.getAttachments(id));
+           redisUtils.set(RedisKey.CONTRACT_ID+id, JSON.toJSON(dto),time);
+            return ResponseHelper.buildResponse(dto);
+       }
     }
 
 
@@ -173,6 +185,9 @@ public class FirefightersContractController extends BaseController {
             pageBean = new Page<FirefightersContract>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iFirefightersContractService.page(pageBean, firefightersContractQueryWrapper);
+         page.getRecords().forEach(i->{
+        	i.setAttachments(sourceFileService.getAttachments(i.getSequenceNbr()));
+        });
         return ResponseHelper.buildResponse(page);  	 
         }
     }

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

@@ -268,6 +268,14 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPerson(ids));
     }
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/company/person/{amosUserId}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据amosUserId获取单位ID", notes = "根据amosUserId获取单位ID")
+    public ResponseModel<String> selectPersonId(@PathVariable String amosUserId) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.getParentId(amosUserId));
+    }
+
+
     /**
      * 根据id获取单位人员列表
      *

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

@@ -348,12 +348,12 @@ public class WaterResourceController extends BaseController {
                                                               @RequestParam(value = "size") int size, String name,
                                                               @RequestParam(value = "belongBuildingId", required = false) ArrayList<Long> belongBuildingId,
                                                               Long belongFightingSystemId, Long sequenceNbr,
-                                                              String resourceType) {
+                                                              String classifyId) {
         Page<WaterResourceDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourcePage(page, name,
-                resourceType, belongBuildingId, belongFightingSystemId, sequenceNbr));
+                classifyId, belongBuildingId, belongFightingSystemId, sequenceNbr));
     }
 
     /**
@@ -384,9 +384,9 @@ public class WaterResourceController extends BaseController {
     @GetMapping(value = "/select_list")
     public ResponseModel<List<WaterResourceDto>> selectList(String name, Long sequenceNbr,
                                                             Long belongFightingSystemId, Long belongBuildingId,
-                                                            String belongBuilding, String resourceType, String classifyId) {
+                                                            String belongBuilding, String resourceType) {
         return ResponseHelper.buildResponse(waterResourceServiceImpl.queryWaterResourceList(true, name,
-                sequenceNbr, belongFightingSystemId, belongBuildingId, belongBuilding, resourceType, classifyId));
+                sequenceNbr, belongFightingSystemId, belongBuildingId, belongBuilding, resourceType));
     }
 
     /**

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

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +45,8 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Autowired
     FailureRepairlogServiceImpl failureRepairlogService;
 
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
 
 
     /**
@@ -62,8 +65,9 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
 
         int auditResult = 0;
         Boolean repairResult = null;
+        Long seq = Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId()));
         //根据审核的结果进行业务操作
-        if (condition == AuditResultEnum.AGREE.getCode() && userInfo.getDepartment().getSequenceNbr().equals(failureDetailsDto.getBizCode())) {
+        if (condition == AuditResultEnum.AGREE.getCode() && seq.equals(failureDetailsDto.getBizCode())) {
             auditResult = AuditResultEnum.AGREE.getCode();
             repairResult = updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo, condition);
         } else if (condition == (AuditResultEnum.REFUSE.getCode())) {

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

@@ -65,6 +65,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     @Autowired
     IFailureRepairlogService failureRepairlog;
 
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
 
     public static String EMERGENCY_COMMAND = "应急指挥科";
     public static String[] PROCESS_NAME = {"提交报修单", "审核", "维修", "验收", "维修中"};
@@ -222,7 +224,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         failureDetailsDto.setSubmissionTime(new Date());
         failureDetailsDto.setFailureCode(buildOrderNo());
         failureDetailsDto.setSubmissionName(userInfo.getUserModel().getRealName());
-        failureDetailsDto.setBizCode(userInfo.getDepartment().getSequenceNbr());
+        failureDetailsDto.setBizCode(Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId())));
         model = this.createWithModel(failureDetailsDto);
 
         if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
@@ -234,7 +236,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         Integer processAuditorId = model.getSubmissionPid();
         String processResult = "提交报修单";
         String processDepartment = userInfo.getDepartment().getDepartmentName();
-        Long departmentId = userInfo.getDepartment().getSequenceNbr();
+        Long departmentId = failureDetailsDto.getBizCode();
         Date processTime = model.getSubmissionTime();
         String processAuditorName = failureDetailsDto.getSubmissionName();
         repairlog(faultId, processAuditorId, departmentId, processTime, processDepartment, processResult, processAuditorName);
@@ -266,7 +268,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         Integer processAuditorId = model.getSubmissionPid();
         String processResult = "重新提交报修单";
         String processDepartment = userInfo.getDepartment().getDepartmentName();
-        Long departmentId = userInfo.getDepartment().getSequenceNbr();
+        Long departmentId = failureDetailsDto.getBizCode();
         Date processTime = model.getSubmissionTime();
         String processAuditorName = failureDetailsDto.getSubmissionName();
         repairlog(faultId, processAuditorId, departmentId, processTime, processDepartment, processResult, processAuditorName);
@@ -396,6 +398,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 
     public Map<String, Object> checkExcuteTaskAuthMap(Long sequenceNbr, ReginParams userInfo) {
         // 获取当前登录用户的角色
+
         String currentLoginUserRole = userInfo.getRole().getRoleName();
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("checkFlag", false);
@@ -404,7 +407,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         Long failureEquipmentId = failureDetailsDto.getSubmissionBranchId();
         FailureDetails details = this.baseMapper.selectById(sequenceNbr);
         String procressId = details.getProcessId();
-        Long seq = userInfo.getDepartment().getSequenceNbr();
+        Long seq = Long.valueOf(iOrgUsrService.getParentId(userInfo.getUserModel().getUserId()));
         JSONObject teskObject = workflowFeignService.getTaskList(procressId);
         if (ObjectUtils.isNotEmpty(teskObject)) {
             JSONArray taskDetailArray = teskObject.getJSONArray("data");

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+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 com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersContractDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersContractMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFirefightersContractService;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 /**
 * 消防员合同 服务实现类
@@ -17,4 +31,68 @@ import com.yeejoin.amos.boot.module.common.api.service.IFirefightersContractServ
 @Service
 public class FirefightersContractServiceImpl extends BaseService<FirefightersContractDto,FirefightersContract,FirefightersContractMapper> implements IFirefightersContractService {
 
+
+	@Autowired
+	SourceFileServiceImpl sourceFileService;
+	@Autowired
+	private Sequence sequence;
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public FirefightersContractDto save(FirefightersContractDto firefightersContract) {
+		long sequenceId = sequence.nextId();
+		FirefightersContract detail=new FirefightersContract();
+		Bean.copyExistPropertis(firefightersContract, detail);
+		firefightersContract.setSequenceNbr(sequenceId);
+		detail.setSequenceNbr(sequenceId);
+		this.save(detail);
+		saveAttachments(firefightersContract);
+		return firefightersContract;
+	}
+	
+	
+	public void saveAttachments(FirefightersContractDto firefightersContract) {
+		if (!ValidationUtil.isEmpty(firefightersContract.getAttachments())) {
+			List<SourceFile> sourceFiles = Lists.newArrayList();
+			Map<String, List<AttachmentDto>> attachmentMap = firefightersContract.getAttachments();
+			attachmentMap.entrySet().forEach(entry -> {
+				List<AttachmentDto> atts = entry.getValue();
+				sourceFiles.addAll(attachment2SourceFile(entry.getKey(), atts));
+			});
+			sourceFileService.saveSourceFile(firefightersContract.getSequenceNbr(), sourceFiles);
+		}
+	}
+
+	private List<SourceFile> attachment2SourceFile(String type, List<AttachmentDto> attachmentDtoList) {
+		List<SourceFile> sourceFiles = Lists.newArrayList();
+		if (!ValidationUtil.isEmpty(attachmentDtoList)) {
+			attachmentDtoList.forEach(a -> {
+				SourceFile s = new SourceFile();
+				s.setFilePath(a.getUrl());
+				s.setFileName(a.getName());
+				s.setFileCategory(type);
+				sourceFiles.add(s);
+			});
+		}
+		return sourceFiles;
+	}
+
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public FirefightersContractDto updateById(FirefightersContractDto firefightersContract, AgencyUserModel userInfo) {
+		FirefightersContract detail=new FirefightersContract();
+		Bean.copyExistPropertis(firefightersContract, detail);
+		detail.setIsDelete(false);
+		detail.setRecDate(new Date());
+		detail.setRecUserId(userInfo.getUserId());
+		detail.setRecUserName(userInfo.getUserName());
+		this.baseMapper.updateById(detail);
+		Map<String, List<AttachmentDto>> map = firefightersContract.getAttachments();
+		if (ObjectUtils.isNotEmpty(map)) {
+			this.saveAttachments(firefightersContract);
+		}
+		return firefightersContract;
+	}
+
 }

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

@@ -111,6 +111,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	/**
 	 * 列表查询 示例
 	 */
+	@Override
 	public List<LinkageUnitDto> queryForLinkageUnitList(@Condition(Operator.eq) Boolean isDelete) {
 		return this.queryForList("", false, isDelete);
 	}

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

@@ -967,6 +967,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return this.queryBySeq(Long.valueOf(person.getParentId()));
     }
 
+    public String getParentId(String amosOrgId) {
+        List<OrgUsrDto> orgUsrDtos = queryForList("", false, amosOrgId);
+        String parentId = null;
+        if (orgUsrDtos.size() >= 1){
+            parentId = orgUsrDtos.get(0).getParentId();
+        }else {
+            return null;
+        }
+        return parentId;
+    }
+
+
     public OrgUsrDto queryForListByParentIdAndOrgType(String amosOrgId) {
         return this.queryModelByParams(amosOrgId);
     }

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

@@ -56,13 +56,11 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
      */
     public Page<WaterResourceDto> queryForWaterResourcePage(Page<WaterResourceDto> page,
                                                             @Condition(Operator.like) String name,
-                                                            @Condition(Operator.eq) String resourceType,
+                                                            @Condition(Operator.eq) String equipId,
                                                             @Condition(Operator.in) ArrayList<Long> belongBuildingId,
                                                             @Condition(Operator.eq) Long belongFightingSystemId,
                                                             @Condition(Operator.eq) Long sequenceNbr) {
-//        return this.queryForPage(page, null, false, name, resourceType, belongBuildingId, belongFightingSystemId,
-//                sequenceNbr, isDelete);
-        return this.waterResourceMapper.getWaterResourcePageByParams(page, name, resourceType, belongBuildingId,
+        return this.waterResourceMapper.getWaterResourcePageByParams(page, name, equipId, belongBuildingId,
                 belongFightingSystemId, sequenceNbr);
     }
 
@@ -82,10 +80,9 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                                                          @Condition(Operator.eq) Long belongFightingSystemId,
                                                          @Condition(Operator.eq) Long belongBuildingId,
                                                          @Condition(Operator.like) String belongBuilding,
-                                                         @Condition(Operator.eq) String resourceType,
-                                                         @Condition(Operator.eq) String equipId) {
+                                                         @Condition(Operator.eq) String resourceType) {
         return this.queryForList("", false, isDelete, name, sequenceNbr, belongFightingSystemId, belongBuildingId,
-                belongBuilding, resourceType, equipId);
+                belongBuilding, resourceType);
     }
 
 

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

@@ -299,4 +299,17 @@ public class AlertCalledController extends BaseController {
 
     	return ResponseHelper.buildResponse(iAlertCalledService.controlEquip());
     }
+
+    /**
+     * 警情重新定位
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/reLocate")
+    @ApiOperation(httpMethod = "PUT", value = "警情重新定位", notes = "警情重新定位")
+    public ResponseModel<Boolean> reLocateById(@RequestParam String alertCalled, @RequestParam String longitude,
+                                @RequestParam String latitude) {
+        return ResponseHelper.buildResponse(iAlertCalledService.reLocate(alertCalled, longitude, latitude));
+    }
 }
\ No newline at end of file

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

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

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

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jcs.api.dto.RallyPointDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.RallyPoint;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.RallyPointServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 集结点
+ *
+ * @author system_generator
+ * @date 2021-08-25
+ */
+@RestController
+@Api(tags = "集结点Api")
+@RequestMapping(value = "/rally-point")
+public class RallyPointController extends BaseController {
+
+    @Autowired
+    RallyPointServiceImpl rallyPointServiceImpl;
+
+    /**
+     * 新增集结点
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增集结点", notes = "新增集结点")
+    public ResponseModel<RallyPointDto> save(@RequestBody RallyPointDto model) {
+        model = rallyPointServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新集结点", notes = "根据sequenceNbr更新集结点")
+    public ResponseModel<RallyPoint> updateBySequenceNbrRallyPoint(@RequestBody RallyPointDto model,
+																	  @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        RallyPoint rallyPoint = new RallyPoint();
+        BeanUtils.copyProperties(model, rallyPoint);
+        rallyPointServiceImpl.saveOrUpdate(rallyPoint);
+        return ResponseHelper.buildResponse(rallyPoint);
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除集结点", notes = "根据sequenceNbr删除集结点")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(rallyPointServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个集结点", notes = "根据sequenceNbr查询单个集结点")
+    public ResponseModel<RallyPointDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(rallyPointServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "集结点分页查询", notes = "集结点分页查询")
+    public ResponseModel<Page<RallyPointDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+            (value = "size") int size) {
+        Page<RallyPointDto> page = new Page<RallyPointDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(rallyPointServiceImpl.queryForRallyPointPage(page));
+    }
+
+    /**
+     * 根据警情id查询集结点列表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据警情id查询集结点列表", notes = "根据警情id查询集结点列表")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<RallyPointDto>> selectForList(@RequestParam String alertId) {
+        return ResponseHelper.buildResponse(rallyPointServiceImpl.queryForRallyPointList(alertId));
+    }
+}

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

@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertLocationLog;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.jcs.api.enums.ControllerTypeEnum;
@@ -86,6 +87,10 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     private ControllerServiceImpl controllerService;
     @Autowired
     private ControllerEquipServiceImpl controllerEquipService;
+
+    @Autowired
+    private AlertLocationLogServiceImpl alertLocationLogService;
+
     @Autowired
     private EmqKeeper emqKeeper;
     @Value("${mqtt.topic.command.alert.notice}")
@@ -538,4 +543,34 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
     	
 		return true;
     }
+
+    /**
+     * 警情重新定位
+     *
+     * @param alertId 警情id
+     * @param longitude 经度
+     * @param latitude 纬度
+     * @return
+     */
+    public Boolean reLocate(String alertId, String longitude, String latitude) {
+        try {
+            // 更新警情主表
+            AlertCalled alertCalled = this.baseMapper.selectById(alertId);
+            alertCalled.setCoordinateX(Double.valueOf(longitude));
+            alertCalled.setCoordinateY(Double.valueOf(latitude));
+            this.updateById(alertCalled);
+            // 插入定位日志表
+            AlertLocationLog alertLocationLog = new AlertLocationLog();
+            alertLocationLog.setAlertId(Long.valueOf(alertId));
+            alertLocationLog.setLongitude(longitude);
+            alertLocationLog.setLatitude(latitude);
+            alertLocationLogService.save(alertLocationLog);
+
+            return true;
+        } catch (Exception e) {
+            log.error(e.toString());
+            e.printStackTrace();
+            throw new RuntimeException("警情定位失败!");
+        }
+    }
 }

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertLocationLog;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertLocationLogMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertLocationLogService;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertLocationLogDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2021-08-26
+ */
+@Service
+public class AlertLocationLogServiceImpl extends BaseService<AlertLocationLogDto,AlertLocationLog,AlertLocationLogMapper> implements IAlertLocationLogService {
+    /**
+     * 分页查询
+     */
+    public Page<AlertLocationLogDto> queryForAlertLocationLogPage(Page<AlertLocationLogDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<AlertLocationLogDto> queryForAlertLocationLogList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

@@ -9,7 +9,7 @@ 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 com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -70,7 +70,7 @@ public class DataSourcesImpl implements DataSources {
 	private RestTemplate restTemplate;
 
 	@Autowired
-	LinkageUnitServiceImpl linkageUnitServiceImpl;
+	ILinkageUnitService linkageUnitServiceImpl;
 
 	@Value("${security.systemctl.name}")
 	private String systemctl;

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.RallyPointDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.RallyPoint;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.RallyPointMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IRallyPointService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 集结点服务实现类
+ *
+ * @author system_generator
+ * @date 2021-08-25
+ */
+@Service
+public class RallyPointServiceImpl extends BaseService<RallyPointDto, RallyPoint, RallyPointMapper> implements IRallyPointService {
+    /**
+     * 分页查询
+     */
+    public Page<RallyPointDto> queryForRallyPointPage(Page<RallyPointDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<RallyPointDto> queryForRallyPointList(String alertId) {
+        return this.queryForList("", false, alertId);
+    }
+}
\ No newline at end of file

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

@@ -73,6 +73,8 @@ import com.yeejoin.amos.supervision.dao.entity.PlanTask;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 @RestController
 @RequestMapping(value = "/api/check")
@@ -601,4 +603,46 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "源ids,逗号分隔", required = true) @PathVariable String... relationId) {
         return CommonResponseUtil.success(checkService.obtainLastCheckRecord(relationId));
     }
+
+    /**
+     * 查询计划执行结果信息
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "查询计划执行结果信息", notes = "查询计划执行结果信息")
+    @GetMapping(value = "/page/list", produces = "application/json;charset=UTF-8")
+    public ResponseModel getPlanExecuteInfo(
+            @ApiParam(value = "计划id") @RequestParam(value = "planId") Long planId,
+            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) Long pointId,
+            @ApiParam(value = "执行状态") @RequestParam(value = "executeState", required = false) String executeState,
+            @ApiParam(value = "状态") @RequestParam(value = "status", required = false) String status,
+            @ApiParam(value = "单位id") @RequestParam(value = "companyName", required = false) String companyName,
+            @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
+            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("planId", planId);
+        map.put("pointId", pointId);
+        map.put("executeState", executeState);
+        map.put("status", status);
+        map.put("companyName", companyName);
+        CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
+        return ResponseHelper.buildResponse(checkService.getPlanExecuteInfo(map, pageable));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "查询计划执行状态", notes = "查询计划执行状态")
+    @GetMapping(value = "/search/states", produces = "application/json;charset=UTF-8")
+    public ResponseModel getPlanExecuteState() {
+        return ResponseHelper.buildResponse(checkService.getPlanExecuteStates());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "查询计划执行所有单位", notes = "查询计划执行所有单位")
+    @GetMapping(value = "/search/teams", produces = "application/json;charset=UTF-8")
+    public ResponseModel getPlanExecuteTeams() {
+        return ResponseHelper.buildResponse(checkService.getPlanExecuteTeams());
+    }
+
 }

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

@@ -40,6 +40,8 @@ import com.yeejoin.amos.supervision.dao.entity.RoutePoint;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 @RestController
 @RequestMapping(value = "/api/route")
@@ -419,4 +421,19 @@ public class RouteController extends AbstractBaseController {
         LinkedHashMap<String, Object> routePointIdMap = routeService.getPointIdByRouteId(routeIdList);
         return CommonResponseUtil.success(routePointIdMap);
     }
+
+    /**
+     * 根据路线查询点
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "根据路线查询点信息", notes = "根据路线查询点信息")
+    @GetMapping(value = "/point/{id}", produces = "application/json;charset=UTF-8")
+    public ResponseModel queryPointByRouteId(
+            @ApiParam(value = "巡检路线id", required = true) @PathVariable(name = "id") long id) {
+            return ResponseHelper.buildResponse(routeService.queryPointByRouteId(id));
+    }
+
 }

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

@@ -277,4 +277,10 @@ public interface CheckMapper extends BaseMapper {
 
     //Map<String, String> queryUserInfoByIds(@Param(value = "userIds") String userIds);
 
+	long getItemCount(HashMap<String, Object> params);
+
+	List<HashMap<String, Object>> getCheckItems(HashMap<String, Object> params);
+
+	List<Map<String, Object>> getPlanExecuteTeams();
+
 }

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

@@ -100,4 +100,6 @@ public interface RouteMapper extends BaseMapper {
 	List<HashMap<String, Object>> queryRoutePointItemByCondition(RoutePointInputItemRequest request);
 	
 	List<Route> queryRoutesByOrgCode(@Param(value = "ownerId") String ownerId, @Param("orgCode") String orgCode);
+
+	List<Map<String, Object>> queryPointByRouteId(@Param("id") Long id);
 }

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

@@ -23,6 +23,8 @@ import com.yeejoin.amos.supervision.business.service.intfc.IEquipmentHandlerServ
 import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
 import com.yeejoin.amos.supervision.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.supervision.business.vo.CheckInfoVo;
+import com.yeejoin.amos.supervision.common.enums.*;
+import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.core.util.DateUtil;
 import com.yeejoin.amos.supervision.core.util.StringUtil;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
@@ -78,10 +80,6 @@ import com.yeejoin.amos.supervision.business.param.CheckRecordParam;
 import com.yeejoin.amos.supervision.business.param.CheckStatisticalParam;
 import com.yeejoin.amos.supervision.business.util.CheckDetailInputPageParam;
 import com.yeejoin.amos.supervision.business.util.Toke;
-import com.yeejoin.amos.supervision.common.enums.CheckStatusEnum;
-import com.yeejoin.amos.supervision.common.enums.PointLevelEnum;
-import com.yeejoin.amos.supervision.common.enums.PointStatusEnum;
-import com.yeejoin.amos.supervision.common.enums.RuleTypeEnum;
 import com.yeejoin.amos.supervision.core.common.response.AppCheckInputRespone;
 import com.yeejoin.amos.supervision.core.common.response.AppPointCheckRespone;
 import com.yeejoin.amos.supervision.core.common.response.CalendarStatusCountRespone;
@@ -1152,6 +1150,38 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
+    public Page<HashMap<String, Object>> getPlanExecuteInfo(HashMap<String, Object> map, CommonPageable page) {
+        List<HashMap<String, Object>> content = org.assertj.core.util.Lists.newArrayList();
+        long total = checkMapper.getItemCount(map);
+        if (total == 0) {
+            return new PageImpl<>(content, page, total);
+        }
+        ;
+        map.put("status", PlanTaskFinishStatusEnum.getValue(String.valueOf(map.get("status"))));
+        map.put("offset", page.getOffset());
+        map.put("pageSize", page.getPageSize());
+        content = checkMapper.getCheckItems(map);
+        content.forEach(c -> {
+            if (c.containsKey("finishStatus")) {
+                String finishStatusDesc = PlanTaskFinishStatusEnum.getName(Integer.parseInt(c.get("finishStatus").toString()));
+                c.put("finishStatus", finishStatusDesc);
+            }
+        });
+        return new PageImpl<>(content, page, total);
+    }
+
+    @Override
+    public List<Map<String, String>> getPlanExecuteStates() {
+        return PlanTaskFinishStatusEnum.getEnumList();
+    }
+
+    @Override
+    public List<Map<String, Object>> getPlanExecuteTeams() {
+        List<Map<String, Object>> list = checkMapper.getPlanExecuteTeams();
+        return list;
+    }
+
+    @Override
     public List<HashMap<String, Object>> getEquipInputByCheckId(CheckDetailInputPageParam param) {
         // 如果不传巡检ID，则获取最新一条巡检点对应的巡检记录ID
         if (param.getCheckID() == -1) {

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

@@ -422,4 +422,9 @@ public class RouteServiceImpl implements IRouteService {
         // TODO Auto-generated method stub
         return routeMapper.queryRoutesByOrgCode(ownerId, orgCode);
     }
+
+    @Override
+    public List<Map<String, Object>> queryPointByRouteId(Long id) {
+        return routeMapper.queryPointByRouteId(id);
+    }
 }

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

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.yeejoin.amos.supervision.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.supervision.business.vo.CheckInfoVo;
+import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
 import com.yeejoin.amos.supervision.exception.YeeException;
 import org.springframework.data.domain.Page;
 import org.springframework.transaction.annotation.Transactional;
@@ -271,4 +272,10 @@ public interface ICheckService {
      * @return CheckRecordDto
      */
     Map<String,CheckRecordDto> obtainLastCheckRecord(String[] relationId);
+
+    Page<HashMap<String, Object>> getPlanExecuteInfo(HashMap<String, Object> map, CommonPageable page);
+
+    List<Map<String, String>> getPlanExecuteStates();
+
+    List<Map<String, Object>> getPlanExecuteTeams();
 }

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

@@ -204,4 +204,6 @@ public interface IRouteService {
      */
     boolean existRouteName(String orgCode, String name);
 
+    List<Map<String, Object>> queryPointByRouteId(Long id);
+
 }

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

@@ -32,6 +32,12 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>
 			<version>2.0.8</version>
+			 <exclusions>
+                <exclusion>
+                    <artifactId>servlet-api</artifactId>
+                    <groupId>javax.servlet</groupId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 	</dependencies>
 

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

@@ -97,5 +97,49 @@
 			ADD COLUMN maintenance_period VARCHAR ( 10 ) COMMENT '维保周期';
 		</sql>
 	</changeSet>
+	<changeSet author="tb" id="2021-08-27-tb-1">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<tableExists tableName="jc_rally_point"/>
+			</not>
+		</preConditions>
+		<comment>create table jc_rally_point</comment>
+		<sql>
+			CREATE TABLE `jc_rally_point` (
+			`sequence_nbr` bigint(30) NOT NULL COMMENT '主键',
+			`name` varchar(100) DEFAULT NULL COMMENT '名称',
+			`address` varchar(255) DEFAULT NULL COMMENT '地址',
+			`alert_id` bigint(30) NOT NULL COMMENT '警情id',
+			`longitude` varchar(20) NOT NULL COMMENT '经度',
+			`latitude` varchar(20) NOT NULL COMMENT '纬度',
+			`rec_user_id` bigint(30) NOT NULL COMMENT '更新用户id',
+			`rec_user_name` varchar(30) NOT NULL COMMENT '更新用户名称',
+			`rec_date` datetime NOT NULL COMMENT '更新日期',
+			`is_delete` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除(1:删除,0:未删除)',
+			PRIMARY KEY (`sequence_nbr`)
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='集结点';
+		</sql>
+	</changeSet>
+	<changeSet author="tb" id="2021-08-27-tb-2">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<tableExists tableName="jc_alert_location_log"/>
+			</not>
+		</preConditions>
+		<comment>create table jc_alert_location_log</comment>
+		<sql>
+			CREATE TABLE `jc_alert_location_log` (
+			`sequence_nbr` bigint(30) NOT NULL COMMENT '主键',
+			`alert_id` bigint(30) NOT NULL COMMENT '警情id',
+			`longitude` varchar(30) NOT NULL COMMENT '经度',
+			`latitude` varchar(30) NOT NULL COMMENT '纬度',
+			`rec_user_id` bigint(30) NOT NULL COMMENT '更新人员id',
+			`rec_user_name` varchar(50) NOT NULL COMMENT '更新人员名称',
+			`rec_date` datetime NOT NULL COMMENT '更新时间',
+			`is_delete` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除(1: 已删除，0:未删除)',
+			PRIMARY KEY (`sequence_nbr`)
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+		</sql>
+	</changeSet>
 	
 </databaseChangeLog>

amos-boot-system-supervision/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@ spring.datasource.url = jdbc:mysql://172.16.11.20:3306/amos-supervision_v1.0?use
 spring.datasource.username= root
 spring.datasource.password= root_123
 ## eureka properties:
-eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
+eureka.client.serviceUrl.defaultZone=http://172.16.11.20:10001/eureka/
 
 security.password=a1234560
 security.loginId=jc_wjk006
@@ -12,10 +12,10 @@ security.productApp=STUDIO_APP_MOBILE
 security.appKey=studio_normalapp_3168830
 
 #redis 配置
-spring.redis.database=0
-spring.redis.host=172.16.10.85
+spring.redis.database=1
+spring.redis.host=172.16.11.20
 spring.redis.port=6379
-spring.redis.password=amos2019Redis
+spring.redis.password=1234560
 spring.redis.jedis.pool.max-active=200
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=10
@@ -45,9 +45,9 @@ linux.img.path = /
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
-emqx.broker=tcp://172.16.10.85:1883
-emqx.user-name=super
-emqx.password=a123456
+emqx.broker=tcp://172.16.11.33:1883
+emqx.user-name=admin
+emqx.password=public
 emqx.max-inflight=1000
 
 file.url=http://39.98.45.134:9000/
\ No newline at end of file

amos-boot-system-supervision/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -168,4 +168,52 @@
             alter table `p_plan_task_detail` modify column `is_finish` int(11) COMMENT '0-未开始，1-执行中，2-已完成，3-超时漏检(有一个检查项漏检则为漏检)' after `create_date`;
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1629886127-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="company_id"/>
+            </not>
+        </preConditions>
+        <comment>p_check ADD COLUMN company_id</comment>
+        <sql>
+            ALTER TABLE `p_check` ADD COLUMN `company_id` varchar(32) DEFAULT NULL COMMENT '责任单位id' AFTER `dep_name`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629886127-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="company_name"/>
+            </not>
+        </preConditions>
+        <comment>p_check ADD COLUMN company_name</comment>
+        <sql>
+            ALTER TABLE `p_check` ADD COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '责任单位名称' AFTER `company_id`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629886127-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check_input" columnName="safety_danger_num"/>
+            </not>
+        </preConditions>
+        <comment>p_check_input ADD COLUMN safety_danger_num</comment>
+        <sql>
+            ALTER TABLE `p_check_input` ADD COLUMN `safety_danger_num` int(11) DEFAULT NULL COMMENT '安全隐患个数' AFTER `danger_handle_state`;
+        </sql>
+    </changeSet>
+
+    <changeSet author="keyong" id="1629886127-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check_input" columnName="major_danger_num"/>
+            </not>
+        </preConditions>
+        <comment>p_check_input ADD COLUMN major_danger_num</comment>
+        <sql>
+            ALTER TABLE `p_check_input` ADD COLUMN `major_danger_num` int(11) DEFAULT NULL COMMENT '重大隐患个数' AFTER `safety_danger_num`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -1894,4 +1894,66 @@
         d.date
     </select>
 
+    <select id="getItemCount" resultType="long">
+        SELECT
+            count(1)
+        FROM
+        p_check pc, p_check_input pci, p_plan_task_detail pptd
+        WHERE
+        pc.id = pci.check_id
+        AND pc.plan_task_detail_id = pptd.id
+        AND pc.plan_id = #{planId}
+        <if test="pointId != null and pointId != ''">
+            AND pc.point_id = #{pointId}
+        </if>
+        <if test="executeState != null and executeState != ''">
+            AND pptd.is_finish = #{executeState}
+        </if>
+        <!--            <if test="status != null and status != ''">-->
+        <!--                AND pc.point_id = #{status}-->
+        <!--            </if>-->
+        <if test="teamId != null and teamId != ''">
+            AND pc.company_id = #{teamId}
+        </if>
+    </select>
+
+    <select id="getCheckItems" resultType="Map">
+        SELECT
+            pc.id checkId,
+            pci.id checkInputId,
+            pci.input_name itemName,
+            pptd.is_finish finishStatus,
+            pci.safety_danger_num safetyNum,
+            pci.major_danger_num majorNum,
+            DATE_FORMAT(pc.check_time,'%Y-%m-%d %H:%i:%s') checkTime,
+            pc.user_name executeName,
+            pc.company_name companyName
+        FROM
+            p_check pc, p_check_input pci, p_plan_task_detail pptd
+        WHERE
+            pc.id = pci.check_id
+            AND pc.plan_task_detail_id = pptd.id
+            AND pc.plan_id = #{planId}
+            <if test="pointId != null and pointId != '' and pointId != -1">
+                AND pc.point_id = #{pointId}
+            </if>
+            <if test="status != null and status != ''">
+                AND pptd.is_finish = #{status}
+            </if>
+<!--            <if test="status != null and status != ''">-->
+<!--                AND pc.point_id = #{status}-->
+<!--            </if>-->
+            <if test="companyName != null and companyName != ''">
+                AND pc.company_name = #{company_name}
+            </if>
+        LIMIT limit #{offset},#{pageSize}
+    </select>
+
+    <select id="getPlanExecuteTeams" resultType="Map">
+        SELECT
+            pc.company_id value,
+            pc.company_name name
+        FROM
+            p_check pc
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -119,7 +119,7 @@
 		<if test="name!=null"> and a.name like concat(concat("%",#{name}),"%")</if>
 		<if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if>
 		<if test="itemType!=null"> and a.item_Type = #{itemType} </if>
-		<if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>
+		<!-- <if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>-->
 		<if test="itemClassify != null"> and a.item_classify = #{itemClassify}</if>
 		order by a.id desc
 		<choose>

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

@@ -345,4 +345,17 @@
 				and r.owner_id = #{ownerId}
 			</if>
 	</select>
+
+	<select id="queryPointByRouteId" resultType="map">
+		SELECT
+			pp.id pointId,
+			pp.name name
+		FROM
+			p_route_point prp
+			LEFT JOIN p_point pp ON pp.id = prp.point_id
+		where
+			prp.route_id = #{id}
+		ORDER BY
+			prp.order_no
+	</select>
 </mapper>
\ No newline at end of file