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

@@ -37,6 +37,9 @@ public class FirefightersContractDto extends BaseDto {
 
     @ApiModelProperty(value = "到期时间")
     private Date expireTime;
+    
+    @ApiModelProperty(value = "起始时间")
+    private Date startTime;
 
     @ApiModelProperty(value = "服务内容")
     private String serviceContent;

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/mapper/FailureDetailsMapper.java

@@ -22,7 +22,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
 
     /**
      * 查询全部 分页
-     *
+     * @param currentStatus 当前任务状态
+     *      * @param  startTime 起始时间
+     *      * @param endTime 结束时间
+     *      * @param submissionPid 报送人
      * @param current 当前页
      * @return
      */
@@ -30,11 +33,17 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
     List<FailureDetails> selectAllPage(Long current,Long size, Long currentStatus,
                                         String startTime,String endTime, Integer submissionPid);
 
+
+
+
     /**
      * 查询我发起的 分页
      * current 当前页
      * size 条数
-     *
+     * @param currentStatus 当前任务状态
+     *      * @param  startTime 起始时间
+     *      * @param endTime 结束时间
+     *      * @param submissionPid 报送人
      * @return
      */
     List<FailureDetails> selectISubPage(Long current,Long size, Long currentStatus,
@@ -42,7 +51,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
 
     /**
      * 查询待处理 分页
-     *
+     * @param currentStatus 当前任务状态
+     *      * @param  startTime 起始时间
+     *      * @param endTime 结束时间
+     *      * @param submissionPid 报送人
      * @param
      * @return
      */
@@ -58,7 +70,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
                                              String startTime,String endTime, Integer submissionPid);
     /**
      * 查询待处理  维修人员分页
-     *
+     * @param currentStatus 当前任务状态
+     *      * @param  startTime 起始时间
+     *      * @param endTime 结束时间
+     *      * @param submissionPid 报送人
      * @param
      * @return
      */

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

@@ -58,7 +58,7 @@ public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
      * @return
      */
     Page<List<LinkageUnitDto>> getEmergencyLinkageUnitList(IPage<LinkageUnitDto> page,String unitName,
-			 String linkageUnitType,  String emergencyLinkageUnitCode);
+			 String linkageUnitType, String linkageUnitTypeCode, String emergencyLinkageUnitCode);
 
     List<LinkageUnitDto> exportToExcel();
     

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

@@ -2,16 +2,12 @@ package com.yeejoin.amos.boot.module.common.api.service;
 
 import java.util.List;
 
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
 
 /**
  * 联动单位接口类
@@ -37,17 +33,17 @@ public interface ILinkageUnitService {
 	 * @param emergencyLinkageUnitCode 紧急联动单位类型code
 	 * @return
 	 */
-	Page<LinkageUnitDto> queryForLinkageUnitPage(IPage<LinkageUnitDto> page,
-            @Condition(Operator.eq) Boolean isDelete,
-            @Condition(Operator.like) String unitName,
-            @Condition(Operator.eq) String linkageUnitTypeCode,
-            @Condition(Operator.eq) String emergencyLinkageUnitCode, 
-            String inAgreement);
+	Page<LinkageUnitDto> queryForLinkageUnitPage(IPage<LinkageUnitDto> page, Boolean isDelete, String unitName,
+			String linkageUnitTypeCode, String linkageUnitType, String emergencyLinkageUnitCode, String inAgreement);
+
 	/**
 	 * 获取当前存在的联动单位的类型组code
+	 * 
 	 * @return
 	 */
-	public  List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName) ;
+	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/resources/mapper/FailureDetailsMapper.xml

@@ -29,9 +29,11 @@
             </if>
         </where>
         order by submission_time DESC limit #{current},#{size}
-
     </select>
 
+
+
+
     <select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
         SELECT sequence_nbr,
         current_status,

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

@@ -192,5 +192,9 @@
 			test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != ''">
 			AND clu.emergency_linkage_unit_code =#{emergencyLinkageUnitCode}
 		</if>
+		<if
+			test="linkageUnitTypeCode != null and linkageUnitTypeCode != ''">
+			AND clu.linkage_unit_type_code =#{linkageUnitTypeCode}
+		</if>
 	</select>
 </mapper>

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-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/PlanTypeEnum.java

+package com.yeejoin.amos.maintenance.common.enums;
+
+import lombok.Data;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @author DELL
+ */
+public enum  PlanTypeEnum {
+    /**
+     * 计划类型枚举
+     */
+    PLAN_TYPE_DAY("1","日计划"),
+    PLAN_TYPE_WEEK("2","周计划"),
+    PLAN_TYPE_MONTH("3","月计划"),
+    PLAN_TYPE_YEAR("4","年计划");
+
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * code
+     */
+    private String code;
+
+    PlanTypeEnum(String code, String name){
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static PlanTypeEnum getEnumByCode(String code) {
+        Optional<PlanTypeEnum> op = Arrays.stream(PlanTypeEnum.values()).filter(e->e.code.equals(code)).findFirst();
+        return op.orElse(null);
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

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

@@ -268,9 +268,15 @@ public class Point extends BasicEntity {
 	private String riskSourceId;
 
 	/**
+	 * 所在建筑Id
+	 */
+	@Column(name="building_id")
+	private String buildingId;
+
+	/**
 	 * 所在建筑名称
 	 */
-//	@Column(name="building_name")
+	@Column(name="building_name")
 	private String buildingName;
 
 	public String getBuildingName() {
@@ -290,12 +296,6 @@ public class Point extends BasicEntity {
 	}
 
 	/**
-	 * 所在建筑Id
-	 */
-//	@Column(name="building_id")
-	private String buildingId;
-
-	/**
 	 * ue4位置
 	 */
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertCalledDto.java

@@ -140,4 +140,7 @@ public class AlertCalledDto  extends BaseDto {
 
     @ApiModelProperty(value = "结案说明")
     private String finalReason;
+
+    @ApiModelProperty(value = "是否辅屏查询")
+    private String isAuxiliaryScreen;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/AlertCalled.java

@@ -217,4 +217,8 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "响应级别")
     private String responseLevel;
 
+    @TableField(exist=false)
+    @ApiModelProperty(value = "是否辅屏查询")
+    private String isAuxiliaryScreen;
+
 }

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

 package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -43,8 +45,21 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
     /**
      * 根据查询条件返回警情记录
-     * @param alertCalledQueryDto
+     * @param workOrderNumber
      * @return
      */
-    List<AlertCalledQueryDto> queryAlertListByQueryDto(@Param("alertCalledQueryDto") AlertCalledQueryDto alertCalledQueryDto);
+    Page<List<AlertCalledQueryDto>> queryAlertListByQueryDto(IPage<AlertCalledQueryDto> page,
+                                                            String workOrderNumber,
+                                                             String creator,
+                                                             String emergency,
+                                                             String emergencyTimeStart,
+                                                             String emergencyTimeEnd,
+                                                             String emergencyCall,
+                                                             String deviceId,
+                                                             String elevatorAddress,
+                                                             String alertType,
+                                                             String alertSource,
+                                                             String alertStage,
+                                                             String alertStatus,
+                                                             String address);
 }

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

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
-
-import java.util.List;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 
 /**
  * 警情接警填报记录接口类
@@ -32,10 +34,22 @@ public interface IAlertCalledService {
 
     /**
      * 根据查询条件返回警情记录
-     * @param alertCalledQueryDto
+     * @param workOrderNumber
      * @return
      */
-    List<AlertCalledQueryDto> queryAlertListByQueryDto(AlertCalledQueryDto alertCalledQueryDto);
+    Page<AlertCalledQueryDto> queryAlertListByQueryDto(IPage<AlertCalledQueryDto> page,
+                                                             @Condition(Operator.like) String workOrderNumber,
+                                                             @Condition(Operator.like) String creator,
+                                                             @Condition(Operator.like) String emergency,
+                                                             @Condition(Operator.lt) String emergencyTimeStart,
+                                                             @Condition(Operator.gt) String emergencyTimeEnd,
+                                                             @Condition(Operator.like) String emergencyCall,
+                                                             @Condition(Operator.like) String deviceId,
+                                                             @Condition(Operator.like) String elevatorAddress,
+                                                             @Condition(Operator.eq) String alertType,
+                                                             @Condition(Operator.eq) String alertSource,
+                                                             @Condition(Operator.eq) String alertStage,
+                                                             @Condition(Operator.eq) String alertStatus);
 
     /**
      * 更新警情阶段信息

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

@@ -145,7 +145,7 @@
         </if>
     </select>
 
-    <select id="queryAlertListByQueryDto" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto">
+    <select id="queryAlertListByQueryDto" resultType="java.util.Map">
         SELECT
         a.work_order_number AS workOrderNumber,
         a.rec_user_name AS creator,
@@ -170,52 +170,49 @@
         tz_alert_called a
         LEFT JOIN tcb_elevator e ON e.rescue_code = a.device_id
         WHERE 1=1
-        <if test="alertCalledQueryDto.workOrderNumber != null and alertCalledQueryDto.workOrderNumber != ''">
-            AND a.work_order_number like CONCAT(CONCAT('%',#{alertCalledQueryDto.workOrderNumber}),'%')
+        <if test="workOrderNumber != null and workOrderNumber != ''">
+            AND a.work_order_number like CONCAT(CONCAT('%',#{workOrderNumber}),'%')
         </if>
-        <if test="alertCalledQueryDto.creator != null and alertCalledQueryDto.creator != ''">
-            AND a.rec_user_name like CONCAT(CONCAT('%',#{alertCalledQueryDto.creator}),'%')
+        <if test="creator != null and creator != ''">
+            AND a.rec_user_name like CONCAT(CONCAT('%',#{creator}),'%')
         </if>
-        <if test="alertCalledQueryDto.emergency != null and alertCalledQueryDto.emergency != ''">
-            AND a.emergency_person like CONCAT(CONCAT('%',#{alertCalledQueryDto.emergency}),'%')
+        <if test="emergency != null and emergency != ''">
+            AND a.emergency_person like CONCAT(CONCAT('%',#{emergency}),'%')
         </if>
-        <if test="alertCalledQueryDto.emergencyTimeStart != null ">
-            and #{alertCalledQueryDto.emergencyTimeStart} <![CDATA[ <= ]]>  a.call_time
+        <if test="emergencyTimeStart != null ">
+            and #{emergencyTimeStart} <![CDATA[ <= ]]>  a.call_time
         </if>
-        <if test="alertCalledQueryDto.emergencyTimeEnd != null ">
-            and a.call_time <![CDATA[ <= ]]>  #{alertCalledQueryDto.emergencyTimeEnd}
+        <if test="emergencyTimeEnd != null ">
+            and a.call_time <![CDATA[ <= ]]>  #{emergencyTimeEnd}
         </if>
-        <if test="alertCalledQueryDto.workOrderNumber != null and alertCalledQueryDto.workOrderNumber != ''">
+        <if test="workOrderNumber != null and workOrderNumber != ''">
             and call_time <![CDATA[ <= ]]> #{endDate}
         </if>
-        <if test="alertCalledQueryDto.emergencyCall != null and alertCalledQueryDto.emergencyCall != ''">
-            AND a.emergency_call like CONCAT(CONCAT('%',#{alertCalledQueryDto.emergencyCall}),'%')
+        <if test="emergencyCall != null and emergencyCall != ''">
+            AND a.emergency_call like CONCAT(CONCAT('%',#{emergencyCall}),'%')
         </if>
-        <if test="alertCalledQueryDto.deviceId != null and alertCalledQueryDto.deviceId != ''">
-            AND a.device_id like CONCAT(CONCAT('%',#{alertCalledQueryDto.deviceId}),'%')
+        <if test="deviceId != null and deviceId != ''">
+            AND a.device_id like CONCAT(CONCAT('%',#{deviceId}),'%')
         </if>
-        <if test="alertCalledQueryDto.elevatorAddress != null and alertCalledQueryDto.elevatorAddress != ''">
-            AND e.address  like CONCAT(CONCAT('%',#{alertCalledQueryDto.elevatorAddress}),'%')
+        <if test="elevatorAddress != null and elevatorAddress != ''">
+            AND e.address  like CONCAT(CONCAT('%',#{elevatorAddress}),'%')
         </if>
-        <if test="alertCalledQueryDto.address != null and alertCalledQueryDto.address != ''">
-            AND a.region_code  like CONCAT(CONCAT('%',#{alertCalledQueryDto.address}),'%')
+        <if test="address != null and address != ''">
+            AND a.region_code  like CONCAT(CONCAT('%',#{address}),'%')
         </if>
-        <if test="alertCalledQueryDto.alertType != null and alertCalledQueryDto.alertType != ''">
-            AND a.alarm_type_code  = #{alertCalledQueryDto.alertType}
+        <if test="alertType != null and alertType != ''">
+            AND a.alarm_type_code  = #{alertType}
         </if>
-        <if test="alertCalledQueryDto.alertSource != null and alertCalledQueryDto.alertSource != ''">
-            AND a.alert_source_code  = #{alertCalledQueryDto.alertSource}
+        <if test="alertSource != null and alertSource != ''">
+            AND a.alert_source_code  = #{alertSource}
         </if>
-        <if test="alertCalledQueryDto.alertStage != null and alertCalledQueryDto.alertStage != ''">
-            AND a.alert_stage_code  = #{alertCalledQueryDto.alertStage}
+        <if test="alertStage != null and alertStage != ''">
+            AND a.alert_stage_code  = #{alertStage}
         </if>
-        <if test="alertCalledQueryDto.alertStatus != null and alertCalledQueryDto.alertStatus != ''">
-            AND a.alert_status  = #{alertCalledQueryDto.alertStatus}
-        </if>
-        ORDER BY a.rec_date
-        <if test="alertCalledQueryDto.pageNum != null and alertCalledQueryDto.pageSize != ''">
-            limit #{alertCalledQueryDto.pageNum},#{alertCalledQueryDto.pageSize}
+        <if test="alertStatus != null and alertStatus != ''">
+            AND a.alert_status  = #{alertStatus}
         </if>
+ 
 
 
 

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

@@ -541,12 +541,12 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
     public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoQueryForPage(@RequestParam(value = "pageNum") int pageNum,
                                                             @RequestParam(value = "pageSize") int pageSize,
-                                                            String unitName, String linkageUnitType, String inAgreement) {
+                                                            String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement) {
         Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false,
-                unitName, linkageUnitType, null, inAgreement);
+                unitName,linkageUnitTypeCode, linkageUnitType, null, inAgreement);
 
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }

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

@@ -145,6 +145,7 @@ public class FailureDetailsController extends BaseController {
             failureDetailsDtoList.add(failureDetailsDto);
         });
         failureDetailDTOsIPage.setRecords(failureDetailsDtoList);
+        failureDetailDTOsIPage.setTotal(failureDetailsIPage.getTotal());
 
         return ResponseHelper.buildResponse(failureDetailDTOsIPage);
     }
@@ -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));
     }
 
@@ -241,4 +242,53 @@ public class FailureDetailsController extends BaseController {
         }
         
     }
+
+    /**
+     * Web端列表分页查询
+     *
+     * @param current 当前页
+     * @param size    每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/weblist")
+    @ApiOperation(httpMethod = "GET", value = "Web端列表分页查询", notes = "Web端列表分页查询")
+    public ResponseModel<IPage<FailureDetailsDto>> queryForPageList(@RequestParam(value = "current") Long current, @RequestParam
+            (value = "size") Long size, @RequestParam (required = false) Long currentStatus,
+                                                                    @RequestParam (required = false)String submissionName,
+                                                                    @RequestParam (required = false) String startTime,
+                                                                    @RequestParam (required = false) String endTime,
+                                                                    @RequestParam (required = false) Long  submissionBranchId,
+                                                                    @RequestParam (required = false) Long sequenceNbr ) {
+        Page<FailureDetailsDto> page = new Page<>();
+        if (current.longValue() > 0) {
+            page.setCurrent((current - 1) * size);
+        } else {
+            page.setCurrent(current);
+        }
+
+        page.setSize(size);
+        ReginParams userInfo = getSelectedOrgInfo();
+        IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
+
+        IPage<FailureDetailsDto> failureDetailsIPage = failureDetailsServiceImpl.queryForPageList(page, userInfo,
+                currentStatus, startTime, endTime, submissionName,submissionBranchId,sequenceNbr);
+
+        BeanUtils.copyProperties(failureDetailsIPage, FailureDetailsDto.class);
+        List<FailureDetailsDto> records = failureDetailsIPage.getRecords();
+        List<FailureDetailsDto> failureDetailsDtoList = new ArrayList<FailureDetailsDto>();
+        records.stream().forEach(failureDetails -> {
+            FailureDetailsDto failureDetailsDto = new FailureDetailsDto();
+            BeanUtils.copyProperties(failureDetails, failureDetailsDto);
+
+            failureDetailsDto.setCurrentStatusName(
+                    Constants.currentStatusNameMap.get(failureDetails.getCurrentStatus()));
+            failureDetailsDtoList.add(failureDetailsDto);
+        });
+        failureDetailDTOsIPage.setRecords(failureDetailsDtoList);
+        failureDetailDTOsIPage.setTotal(failureDetailsIPage.getTotal());
+
+        return ResponseHelper.buildResponse(failureDetailDTOsIPage);
+    }
+
 }

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/LinkageUnitController.java

@@ -123,12 +123,12 @@ public class LinkageUnitController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
     public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, String unitName, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode) {
+            (value = "size") int size, String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode) {
     	Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(current);
         page.setSize(size);
     	Page<LinkageUnitDto> linkageUnitDtoPage = linkageUnitServiceImpl.queryForLinkageUnitPage(page, false,
-                unitName, linkageUnitType, emergencyLinkageUnitCode,inAgreement);
+                unitName, linkageUnitTypeCode,linkageUnitType, emergencyLinkageUnitCode,inAgreement);
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }
 

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
@@ -37,10 +38,6 @@ import java.util.Map;
 public class OrgPersonController {
     @Autowired
     OrgUsrServiceImpl iOrgUsrService;
-    @Autowired
-    EmqKeeper emqKeeper;
-    @Value("${jcs.company.topic.delete}")
-    private String airportDeleteTopic;
 
     /**
      * 新增人员信息
@@ -69,11 +66,6 @@ public class OrgPersonController {
         // 删除时，只作逻辑删除
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete",
                 CommonConstant.IS_DELETE_01));
-        try {
-            emqKeeper.getMqttClient().publish(airportDeleteTopic, String.valueOf(id).getBytes(), 2, true);
-        } catch (Exception e) {
-            e.getMessage();
-        }
         return ResponseHelper.buildResponse(null);
     }
 

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,7 +18,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -44,6 +47,10 @@ public class OrgUsrController extends BaseController {
     OrgUsrServiceImpl iOrgUsrService;
     @Autowired
     ESOrgUsrService eSOrgUsrService;
+    @Autowired
+    EmqKeeper emqKeeper;
+    @Value("${jcs.company.topic.delete}")
+    private String airportDeleteTopic;
 
 
     /**
@@ -74,12 +81,11 @@ public class OrgUsrController extends BaseController {
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
         try {
             eSOrgUsrService.deleteById(id);
+            emqKeeper.getMqttClient().publish(airportDeleteTopic, JSON.toJSONString(id).getBytes(), 2, false);
         } catch (Exception e) {
-
             e.printStackTrace();
             throw new RuntimeException();
         }
-
         return ResponseHelper.buildResponse(null);
     }
 
@@ -268,6 +274,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 = {"提交报修单", "审核", "维修", "验收", "维修中"};
@@ -102,6 +104,16 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         return this.queryForWaitManage(page, userInfo, currentStatus, startTime, endTime, userId);
     }
 
+    /**
+     * web端列表查询
+     */
+    public IPage<FailureDetailsDto> queryForPageList(Page<FailureDetailsDto> page, ReginParams userInfo, Long currentStatus,
+                                                            String startTime, String endTime, String submissionName, Long  submissionBranchId,
+                                                  Long sequenceNbr ) {
+
+        return  queryForPage(page,"",false,currentStatus,startTime, endTime, submissionName,submissionBranchId,sequenceNbr);
+
+    }
 
     /**
      * 待处理分页查询
@@ -110,7 +122,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
                                                     String startTime, String endTime, Integer userId) {
 
         if (userInfo.getRole().getRoleName().equals(roleName[0])) {
-            IPage<FailureDetails> wxIpage = new Page<>();
+            IPage<FailureDetails> wxIpage = new Page<FailureDetails>();
             List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(),currentStatus, startTime, endTime, userId);
             wxIpage.setRecords(list);
             return wxIpage;
@@ -222,7 +234,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,11 +246,14 @@ 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();
+        System.out.println(System.currentTimeMillis());
         repairlog(faultId, processAuditorId, departmentId, processTime, processDepartment, processResult, processAuditorName);
+
         if (excuteTask(instance.getString("id"), userInfo, null)) {
+
             return true;
         } else {
             throw new Exception("执行流程失败");
@@ -266,7 +281,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 +411,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 +420,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/FailureMaintainServiceImpl.java

@@ -5,14 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
 
-import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import org.apache.commons.lang3.ObjectUtils;
 
-import org.slf4j.Logger;
-
-import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -20,14 +15,8 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.transaction.annotation.Transactional;
 
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
@@ -38,8 +27,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
 
 import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
 
-import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
-
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureMaintainMapper;

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

@@ -5,12 +5,10 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureRepairlogMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService;

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

@@ -72,10 +72,11 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	 */
 	@Override
 	public Page<LinkageUnitDto> queryForLinkageUnitPage(IPage<LinkageUnitDto> page,
-			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String unitName,
-			@Condition(Operator.eq) String linkageUnitType, @Condition(Operator.eq) String emergencyLinkageUnitCode,
+			 Boolean isDelete, String unitName,
+			String linkageUnitTypeCode,
+			 String linkageUnitType,  String emergencyLinkageUnitCode,
 			String inAgreement) {
-		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType, emergencyLinkageUnitCode);
+		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode);
 		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()), Map.class);
 		
 		List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode());
@@ -87,7 +88,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 				}
 			});
 		});
-		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()),
+		List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitListMap),
 				LinkageUnitDto.class);
 		List<LinkageUnitDto> detaiList = resultDtoList.stream().map(item -> {
 			Date now = new Date();
@@ -111,6 +112,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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -435,7 +436,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsrFormDto formDto = this.selectCompanyById(orgUsr.getSequenceNbr());
         if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
             try {
-                emqKeeper.getMqttClient().publish(airportAddTopic, formDto.toString().getBytes(), 2, true);
+                emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
             } catch (Exception e) {
                 e.getMessage();
             }
@@ -967,6 +968,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-maintenance-biz/pom.xml

@@ -24,6 +24,10 @@
 					<groupId>org.typroject</groupId>
 					<artifactId>tyboot-core-auth</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>fastjson</artifactId>
+					<groupId>com.alibaba</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -36,12 +40,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!-- 添加fastjson 依赖包. -->
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.15</version>
-		</dependency>
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>

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

@@ -3,8 +3,6 @@ package com.yeejoin.amos.maintenance.business.controller;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dto.CheckDto;
-import com.yeejoin.amos.maintenance.business.dto.CheckInputDto;
-import com.yeejoin.amos.maintenance.business.dto.CheckShotDto;
 import com.yeejoin.amos.maintenance.business.param.CheckInfoPageParam;
 import com.yeejoin.amos.maintenance.business.param.CheckRecordParam;
 import com.yeejoin.amos.maintenance.business.param.CheckStatisticalParam;
@@ -13,6 +11,7 @@ import com.yeejoin.amos.maintenance.business.util.*;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;
 import com.yeejoin.amos.maintenance.common.enums.CheckRecordOrderByEnum;
+import com.yeejoin.amos.maintenance.common.enums.CheckStatusEnum;
 import com.yeejoin.amos.maintenance.core.async.AsyncTask;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
@@ -80,10 +79,11 @@ public class CheckController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "巡检记录查询", notes = "巡检记录查询")
     @RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse qryCheckInfoPage(
-            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
+            @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
         String orgCode = getOrgCode(reginParams);
@@ -307,7 +307,7 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "维保日历-mobile", notes = "维保日历-mobile")
     @GetMapping(value = "/{date}/checkCalendar", produces = "application/json;charset=UTF-8")
     public CommonResponse checkCalendar(
-            @ApiParam(value = "date,格式YYYY-MM-DD",required = true)@PathVariable String date) {
+            @ApiParam(value = "date,格式YYYY-MM-DD", required = true) @PathVariable String date) {
         Map<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
@@ -480,7 +480,7 @@ public class CheckController extends AbstractBaseController {
         return CommonResponseUtil.success(checkService.obtainLastCheckRecord(relationId));
     }
 
-    @PersonIdentify(isNeedIdentity = true)
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保记录分页查询", notes = "维保记录分页查询")
     @GetMapping(value = "/page")
@@ -492,10 +492,10 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "开始时间") @RequestParam(value = "beginTime", required = false) String beginTime,
             @ApiParam(value = "结束时间") @RequestParam(value = "endTime", required = false) String endTime,
             @ApiParam(value = "维保人员") @RequestParam(value = "personId", required = false) String person,
-            @ApiParam(value = "业主单位") @RequestParam(value = "teamId", required = false) String teamId,
+            @ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId,
             @ApiParam(value = "设施Id") @RequestParam(value = "equipId", required = false) String equipId,
             @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
-            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception{
+            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
@@ -510,7 +510,7 @@ public class CheckController extends AbstractBaseController {
         params.put("beginTime", beginTime);
         params.put("endTime", endTime);
         params.put("person", person);
-        params.put("teamId", teamId);
+        params.put("companyId", companyId);
         params.put("equipId", equipId);
         params.put("orgCode", loginOrgCode);
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
@@ -519,9 +519,9 @@ public class CheckController extends AbstractBaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保记录详情", notes = "维保记录详情")
-    @GetMapping(value = "/detail/{id}")
+    @GetMapping(value = "/{id}/detail")
     public CommonResponse getCheckDetail(
-            @ApiParam(value = "记录Id") @PathVariable(value = "id") String id) throws Exception{
+            @ApiParam(value = "记录Id",required = true) @PathVariable(value = "id") String id) {
         return CommonResponseUtil.success(checkService.getCheckDetail(id));
     }
 
@@ -532,21 +532,28 @@ public class CheckController extends AbstractBaseController {
         return ResponseHelper.buildResponse(CheckRecordOrderByEnum.getEnumList());
     }
 
-    @ApiOperation(value = "/设备设施维保记录分页列表",notes = "外部接口装备和者水源使用")
+    @ApiOperation(value = "/设备设施维保记录分页列表", notes = "外部接口装备和者水源使用")
     @GetMapping(value = "page/{originalId}/list")
     public ResponseModel getCheckListByOriginalId(
             @PathVariable String originalId,
             @RequestParam(value = "current") int pageNum,
             @RequestParam(value = "size") int pageSize
-            ){
-        CommonPageable pageable = new CommonPageable(pageNum,pageSize);
-        return ResponseHelper.buildResponse(checkService.getCheckListByOriginalId(originalId,pageable));
+    ) {
+        CommonPageable pageable = new CommonPageable(pageNum, pageSize);
+        return ResponseHelper.buildResponse(checkService.getCheckListByOriginalId(originalId, pageable));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "web端维保记录详情")
     @GetMapping(value = "input/{checkId}/detail")
-    public ResponseModel inputDetail(@ApiParam(value = "记录主表id") @PathVariable String checkId){
+    public ResponseModel inputDetail(@ApiParam(value = "记录主表id") @PathVariable String checkId) {
         return ResponseHelper.buildResponse(checkService.getInputDetail(checkId));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "维保检查结果下拉列表")
+    @GetMapping(value = "/isOk-list")
+    public ResponseModel statusList() {
+        return ResponseHelper.buildResponse(CheckStatusEnum.getEnumList());
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java

@@ -23,6 +23,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -35,6 +36,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author DELL
+ */
 @RestController
 @RequestMapping(value = "/api/planTask")
 @Api(tags = "计划执行api")
@@ -155,23 +159,6 @@ public class PlanTaskController extends AbstractBaseController {
     }
 
     /**
-     * 定时查询任务状态
-     *
-     * @return
-     */
-    @ApiOperation(value = "定时执行任务表生成", notes = "定时执行任务表生成")
-    @RequestMapping(value = "/queryOmission", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
-    public CommonResponse pushCarData() {
-        try {
-            planTaskService.taskExecution(null);
-            return CommonResponseUtil.success();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return CommonResponseUtil.failure();
-        }
-    }
-
-    /**
      * 模拟定时任务调起服务
      *
      * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PointController.java

 package com.yeejoin.amos.maintenance.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.maintenance.business.dto.PointDto;
 import com.yeejoin.amos.maintenance.business.param.PointImportParam;
 import com.yeejoin.amos.maintenance.business.param.PointImportQueryParam;
@@ -210,7 +209,6 @@ public class PointController extends AbstractBaseController {
             Page<PointDto> pointList = iPointService.queryPointInfoWithItem(criterias, commonPageable, ownerId);
             return CommonResponseUtil.success(pointList);
         } catch (Exception e) {
-            e.printStackTrace();
             log.error(e.getMessage(), e);
             return CommonResponseUtil.failure("查询巡检点信息失败");
         }
@@ -636,10 +634,9 @@ public class PointController extends AbstractBaseController {
     public CommonResponse syncSavePoint(
             @ApiParam(value = "同步请求参数") @RequestBody() List<MaintenanceResourceData> list) {
         ReginParams reginParams = getSelectedOrgInfo();
-        AgencyUserModel model = getUserInfo();
-        String orgCode = getOrgCode(reginParams);
-        iPointService.syncSavePoint(list, orgCode, model.getUserId());
+        iPointService.syncSavePoint(list, reginParams);
         return CommonResponseUtil.success();
     }
 
+
 }

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

 package com.yeejoin.amos.maintenance.business.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.maintenance.business.param.RoutePageParam;
 import com.yeejoin.amos.maintenance.business.service.intfc.IRouteService;
@@ -35,14 +9,23 @@ import com.yeejoin.amos.maintenance.business.util.RoutePageParamUtil;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
 import com.yeejoin.amos.maintenance.core.common.request.RoutePointInputItemRequest;
+import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
 import com.yeejoin.amos.maintenance.dao.entity.InputItem;
-import com.yeejoin.amos.maintenance.dao.entity.Plan;
 import com.yeejoin.amos.maintenance.dao.entity.Route;
 import com.yeejoin.amos.maintenance.dao.entity.RoutePoint;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping(value = "/api/route")
@@ -122,39 +105,8 @@ public class RouteController extends AbstractBaseController {
     @ApiOperation(value = "删除巡检路线", notes = "删除巡检路线")
     @DeleteMapping(value = "/deleteRoute", produces = "application/json;charset=UTF-8")
     public CommonResponse deleteRoute(@ApiParam(value = "巡检路线ID", required = false) @RequestParam List<Long> routeIds) {
-        try {
-            //校验1：线路上有点时返回删除失败
-            Map<Long, String> idNameMap = new HashMap<>();
-            for (long id : routeIds) {
-                int routePointCount = routeService.countRoutePoint(id);
-                if (routePointCount > 0) {
-                    Route route = routeService.queryRouteById(id);
-                    idNameMap.put(id, route.getName());
-                }
-            }
-            if (idNameMap.size() > 0) {
-                return CommonResponseUtil.failure(idNameMap, "删除路线失败：路线上已设置巡检点");
-            }
-            //校验2：计划在使用，删除失败
-            idNameMap.clear();
-            for (long id : routeIds) {
-                int routePointCount = routeService.countRoutePoint(id);
-                if (routePointCount > 0) {
-                    List<Plan> planList = routeService.queryPlanByRouteId(id);
-                    if (planList != null && planList.size() > 0) {
-                        idNameMap.put(id, planList.get(0).getName());
-                    }
-                }
-            }
-            if (idNameMap.size() > 0) {
-                return CommonResponseUtil.failure(idNameMap, "删除路线失败：计划在使用");
-            }
-            routeService.delRouteById(routeIds.toArray(new Long[0]));
-            return CommonResponseUtil.success();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return CommonResponseUtil.failure("删除巡检路线失败");
-        }
+        routeService.delRouteById(routeIds.toArray(new Long[0]));
+        return CommonResponseUtil.success();
     }
 
     /**

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

@@ -279,7 +279,7 @@ public interface CheckMapper extends BaseMapper {
 
 	long getCheckCount(HashMap<String, Object> params);
 
-	List<HashMap<String, Object>> getChecks(HashMap<String, Object> params);
+	List<Map<String, Object>> getChecks(HashMap<String, Object> params);
 
 	Map<String, Object> getCheckDetail(@Param(value = "id") String id);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/entity/mybatis/PlanTaskPointInputItemBo.java

@@ -35,6 +35,12 @@ public class PlanTaskPointInputItemBo {
 	 * 编号
 	 */
 	private String pointNo;
+
+
+	/**
+	 * 地址
+	 */
+	private String address;
 	
 	/**
 	 * 巡检任务id
@@ -47,6 +53,11 @@ public class PlanTaskPointInputItemBo {
 	private String ownerId;
 
 	/**
+	 * 业主单位名称
+	 */
+	private String ownerName;
+
+	/**
 	 * 单位id
 	 */
 	private String companyId;
@@ -75,6 +86,12 @@ public class PlanTaskPointInputItemBo {
 	 * 巡检任务详情id
 	 */
 	private long planTaskDetailId;
+
+
+	/**
+	 * 风险辨识与管控措施
+	 */
+	private String riskAndManage;
 	
 	/**
 	 * 巡检路线

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

@@ -33,10 +33,7 @@ import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
 import com.yeejoin.amos.maintenance.business.util.ToolUtils;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;
-import com.yeejoin.amos.maintenance.common.enums.CheckStatusEnum;
-import com.yeejoin.amos.maintenance.common.enums.PlanTaskFinishStatusEnum;
-import com.yeejoin.amos.maintenance.common.enums.PointLevelEnum;
-import com.yeejoin.amos.maintenance.common.enums.PointStatusEnum;
+import com.yeejoin.amos.maintenance.common.enums.*;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.response.*;
 import com.yeejoin.amos.maintenance.core.enums.QueryOperatorEnum;
@@ -115,6 +112,9 @@ public class CheckServiceImpl implements ICheckService {
     @Value("${file.url}")
     private String fileUrl;
 
+    @Autowired
+    IRouteDao iRouteDao;
+
     final String CHECK_UPDATE_TOPIC = "maintenance/date/update";
 
 
@@ -141,6 +141,7 @@ public class CheckServiceImpl implements ICheckService {
         //1.前置校验
         this.checkCanFinishTask(mtUserSeq, planTask, recordParam.getPointId());
         Point point = iPointService.queryPointById(recordParam.getPointId());
+        Route route = iRouteDao.findById(planTask.getRouteId()).orElseThrow(() -> new RuntimeException("路线不存在"));
         Check check = new Check();
         if (ObjectUtils.isEmpty(point) || ObjectUtils.isEmpty(detail)) {
             throw new Exception("前置校验不通过");
@@ -156,13 +157,18 @@ public class CheckServiceImpl implements ICheckService {
             check.setPointName(point.getName());
             check.setPointId(point.getId());
             check.setPointNo(point.getPointNo());
+            check.setRiskAndManage(point.getRemark());
             check.setRemark(recordParam.getRemark());
             check.setCheckTime(new Date());
+            check.setBeginTime(planTask.getBeginTime());
+            check.setEndTime(planTask.getEndTime());
             check.setUploadTime(new Date());
             check.setOrgCode(recordParam.getOrgCode());
             check.setUserId(mtUserSeq);
-            check.setOwnerId(point.getOwnerId());
+            check.setOwnerId(route.getOwnerId());
+            check.setOwnerName(route.getOwnerName());
             check.setBuildingName(point.getBuildingName());
+            check.setAddress(point.getAddress());
             check.setEquipmentName(point.getEquipmentName());
             check.setPlanType(detail.get("planType").toString());
             check.setUserName(personIdentity.getPersonName());
@@ -268,8 +274,8 @@ public class CheckServiceImpl implements ICheckService {
             //7.返回不合格记录
             return new CheckDto(check.getId(), unqualifiedCheckItemList);
         } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            throw new Exception(e.getMessage(),e);
+            log.error(e.getMessage(), e);
+            throw new Exception(e.getMessage(), e);
         }
     }
 
@@ -445,10 +451,10 @@ public class CheckServiceImpl implements ICheckService {
 
     @Override
     public List<CheckInputDto> getInputDetail(String checkId) {
-        List<CheckInputDto> list = this.checkMapper.queryCheckInputDetail(checkId,fileUrl);
-        list.forEach(input->{
+        List<CheckInputDto> list = this.checkMapper.queryCheckInputDetail(checkId, fileUrl);
+        list.forEach(input -> {
             CheckStatusEnum statusEnum = CheckStatusEnum.getEnum(input.getIsOk());
-            if(statusEnum != null){
+            if (statusEnum != null) {
                 input.setIsOkDesc(statusEnum.getName());
             }
         });
@@ -1090,8 +1096,8 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public Page<HashMap<String, Object>> getCheckPage(HashMap<String, Object> params, CommonPageable page) {
-        List<HashMap<String, Object>> content = Lists.newArrayList();
+    public Page<Map<String, Object>> getCheckPage(HashMap<String, Object> params, CommonPageable page) {
+        List<Map<String, Object>> content = Lists.newArrayList();
         long total = checkMapper.getCheckCount(params);
         if (total == 0) {
             return new PageImpl<>(content, page, total);
@@ -1100,7 +1106,7 @@ public class CheckServiceImpl implements ICheckService {
         params.put("pageSize", page.getPageSize());
         content = checkMapper.getChecks(params);
         if (0 < content.size()) {
-            for (HashMap<String, Object> map : content) {
+            for (Map<String, Object> map : content) {
                 if (map.containsKey("isOk")) {
                     map.put("status", CheckStatusEnum.getEnum(String.valueOf(map.get("isOk"))).getName());
                 }
@@ -1110,15 +1116,23 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public Map<String, Object> getCheckDetail(String id) {
-        Map<String, Object> map = checkMapper.getCheckDetail(id);
-        if (map.containsKey("isOk")) {
-            map.put("status", CheckStatusEnum.getEnum(String.valueOf(map.get("isOk"))).getName());
+    public Map<String, Object> getCheckDetail(String checkId) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("facility", this.buildCheckMainInfo(checkId));
+        result.put("itemList", this.getInputDetail(checkId));
+        return result;
+    }
+
+    private Map<String, Object> buildCheckMainInfo(String checkId) {
+        Map<String, Object> facility = checkMapper.getCheckDetail(checkId);
+        if (facility.containsKey("isOk")) {
+            facility.put("isOkDesc", CheckStatusEnum.getEnum(String.valueOf(facility.get("isOk"))).getName());
         }
-        if (map.containsKey("picture")) {
-            map.put("picture", fileUrl + map.get("picture"));
+        if (facility.containsKey("planType")) {
+            PlanTypeEnum planType = PlanTypeEnum.getEnumByCode(String.valueOf(facility.get("planType")));
+            facility.put("planTypeDesc", planType != null ? planType.getName() : "其他");
         }
-        return map;
+        return facility;
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java

@@ -8,10 +8,8 @@ import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskDetailMapper;
 import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.maintenance.business.dao.repository.*;
 import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckChkExListBo;
-import com.yeejoin.amos.maintenance.business.feign.EquipFeignClient;
 import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
-import com.yeejoin.amos.maintenance.business.service.intfc.ICheckService;
 import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil;
 import com.yeejoin.amos.maintenance.business.vo.CalDateVo;
@@ -57,29 +55,17 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     @Autowired
     IPlanDao iplanDao;
     @Autowired
-    private ICheckDao checkDao;
-    @Autowired
     private RemoteSecurityService remoteSecurityService;
     @Autowired
     private IPlanTaskDetailDao planTaskDetail;
     @Autowired
     IRoutePointDao iRoutePointDao;
-
     @Autowired
     IJobService jobService;
-
-    @Autowired
-    private ICheckService checkService;
-
-    @Autowired
-    private EquipFeignClient equipFeign;
-
     @Autowired
     IPointDao iPointDao;
-
     @Autowired
     IPlanTaskDetailDao iPlanTaskDetailDao;
-
     @Autowired
     InputItemMapper inputItemMapper;
 
@@ -301,10 +287,11 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             }
 
             //2.4.删除今天可能重做生成的数据（计划重做后进行了计划的编辑）
-            if (iplanTaskDao.findById(plan.getPlanTaskId()) != null && plan.getFirstFlag() == XJConstant.PLAN_FIRST_STATUS_YES)
+            if (iplanTaskDao.findById(plan.getPlanTaskId()).isPresent() && plan.getFirstFlag() == XJConstant.PLAN_FIRST_STATUS_YES) {
                 if (iplanTaskDao.existsById(plan.getPlanTaskId())) {
                     iplanTaskDao.deleteById(plan.getPlanTaskId());
                 }
+            }
 
             //2.5.插入planTask及planTaskDetail
             insertPlanTaskAndDet(list, plan, XJConstant.SCHED_FLAG, now);
@@ -515,12 +502,12 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     }
 
     @Override
-    public List<Map<String,Object>> getPlanTaskPoints(Map<String, Object> param) {
-        List<Map<String,Object>> result = planTaskMapper.getPlanTaskPoints(param);
-        result.forEach(r->{
-            if(r.containsKey("isFinish")){
+    public List<Map<String, Object>> getPlanTaskPoints(Map<String, Object> param) {
+        List<Map<String, Object>> result = planTaskMapper.getPlanTaskPoints(param);
+        result.forEach(r -> {
+            if (r.containsKey("isFinish")) {
                 String isFinishDesc = PlanTaskDetailIsFinishEnum.getName(Integer.parseInt(r.get("isFinish").toString()));
-                r.put("isFinishDesc",isFinishDesc);
+                r.put("isFinishDesc", isFinishDesc);
             }
         });
         return result;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PointServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dao.mapper.InputItemMapper;
@@ -35,11 +36,11 @@ import org.springframework.data.domain.*;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import javax.annotation.Resource;
@@ -273,7 +274,7 @@ public class PointServiceImpl implements IPointService {
     public Point updatePoint(PointParam pointParam) {
         //1.更新点
         long pointId = pointParam.getPoint().getId();
-        Point newPoint = iPointDao.findById(pointId).orElseThrow(()->new RuntimeException("找不到原始数据"));
+        Point newPoint = iPointDao.findById(pointId).orElseThrow(() -> new RuntimeException("找不到原始数据"));
         Bean.copyExistPropertis(pointParam.getPoint(), newPoint);
         newPoint.setLastUpdateTime(new Date());
         iPointDao.save(newPoint);
@@ -1087,25 +1088,10 @@ public class PointServiceImpl implements IPointService {
 
 
     @Override
-    @Async
-    public void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId) {
+    public void syncSavePoint(List<MaintenanceResourceData> list, ReginParams reginParams) {
         List<Point> points = new ArrayList<>();
         List<PointInputItem> inputItems = new ArrayList<>();
-        List<Long> ids = new ArrayList<>();
-        //1.删除已有数据
-        for (MaintenanceResourceData x : list) {
-            String pointNo = x.getFireFacilityCode();
-            String originalId = String.valueOf(x.getFireFacilityId());
-            Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, originalId);
-            if (null != id) {
-                ids.add(id);
-            }
-        }
-        if (!ids.isEmpty()) {
-            Long[] idsArray = ids.toArray(new Long[0]);
-            delPointById(idsArray);
-        }
-        //2.创建
+        //1.创建
         for (MaintenanceResourceData x : list) {
             Point point = new Point();
             String pointNo = StringUtil.isNotEmpty(x.getFireFacilityCode()) ? x.getFireFacilityCode() : String.valueOf(sequence.nextId());
@@ -1123,11 +1109,14 @@ public class PointServiceImpl implements IPointService {
             point.setBuildingName(x.getBuildingName());
             point.setAddress(x.getArea());
             point.setLevel("");
-            point.setCreatorId(userId);
-            point.setOrgCode(orgCode);
+            point.setCreatorId(RequestContext.getExeUserId());
+            //TODO BUG orgCode 取值 没值来源
+            point.setOrgCode(reginParams.getCompany().getOrgCode());
+            point.setCompanyId(String.valueOf(x.getMaintenanceCompanyId()));
+            point.setCompanyName(x.getMaintenanceCompanyName());
             points.add(point);
             iPointDao.save(point);
-            List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(x.getClassifyName(), orgCode);
+            List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(x.getClassifyName(), null);
             if (0 < inputItemVos.size()) {
                 inputItemVos.forEach(y -> {
                     PointInputItem inputItem = new PointInputItem();

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

@@ -76,30 +76,37 @@ public class RouteServiceImpl implements IRouteService {
 
     @Override
     @Transactional
-    public Route  addRoute(Route route) {
+    public Route addRoute(Route route) {
         String creatorId = route.getCreatorId();
         String orgCode = route.getOrgCode();
+        //1.保存主表
         route = iRouteDao.saveAndFlush(route);
         Long rId = route.getId();
         List<RoutePoint> routePoints = route.getRoutePointList();
+        //2.保存子表
         routePoints.forEach(rp -> {
             rp.setOrgCode(orgCode);
             rp.setRouteId(rId);
             rp.setCreatorId(creatorId);
             List<RoutePointItem> routePointItems = rp.getRoutePointItem();
+            //2.1保存点路线关系表
             rp = iRoutePointDao.saveAndFlush(rp);
             Long rpId = rp.getId();
+            routePointItems = routePointItems.stream().filter(RoutePointItem::getIsBound).collect(Collectors.toList());
             routePointItems.forEach(rpi -> {
                 rpi.setRoutePointId(rpId);
                 rpi.setCreatorId(creatorId);
-                iRoutePointItemDao.saveAndFlush(rpi);
             });
+            //2.2保存点项关系表
+            if (!routePointItems.isEmpty()) {
+                iRoutePointItemDao.saveAll(routePointItems);
+            }
         });
         return route;
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void delRouteById(Long[] ids) {
         //0.删除路线
         iRouteDao.delRouteById(Arrays.asList(ids));
@@ -126,7 +133,7 @@ public class RouteServiceImpl implements IRouteService {
                 iRoutePointItemDao.delRoutePointItem(rp.getId());
                 iRoutePointDao.deleteById(rp.getId());
                 //删除p_plan_task_detail 对应点、更新p_plan_task点数量、完成数量
-                this.updatePlanTask(rp.getPointId(),finalRoute.getId());
+                this.updatePlanTask(rp.getPointId(), finalRoute.getId());
             } else {
                 List<RoutePointItem> routePointItems = rp.getRoutePointItem();
                 iRoutePointDao.saveAndFlush(rp);
@@ -156,9 +163,15 @@ public class RouteServiceImpl implements IRouteService {
     }
 
     private void updatePlanTask(long pointId, long routeId) {
+        //1.查询指定路线的任务
         List<PlanTask> planTaskList = planTaskDao.findByRouteId(routeId);
+        Map<Long, PlanTask> planTaskMap = planTaskList.stream().collect(Collectors.toMap(BasicEntity::getId, Function.identity()));
+        //2.查询指定的点
         List<PlanTaskDetail> planTaskDetailList = iPlanTaskDetailDao.findByPointId(pointId);
-        Map<Long,PlanTask> planTaskMap = planTaskList.stream().collect(Collectors.toMap(BasicEntity::getId, Function.identity()));
+        //3.过滤指定父任务id的执行数据
+        planTaskDetailList = planTaskDetailList.stream().filter(e ->
+                planTaskList.stream().map(BasicEntity::getId).collect(Collectors.toList()).contains(e.getTaskNo())).collect(Collectors.toList());
+        //4.更新任务主表点的数量及完成数量
         for (PlanTaskDetail planTaskDetail : planTaskDetailList) {
             PlanTask planTask = planTaskMap.get(planTaskDetail.getTaskNo());
             if (1 == planTaskDetail.getIsFinish()) {
@@ -168,9 +181,9 @@ public class RouteServiceImpl implements IRouteService {
                 planTask.setPointNum(planTask.getPointNum() - 1);
             }
         }
-        //更新主表完成数量，点数量
+        //5.更新主表完成数量，点数量
         planTaskDao.saveAll(planTaskList);
-        //删除路线下的维保点
+        //6.删除路线下的维保点
         planTaskDetailMapper.deleteByPointIdAndRouteId(pointId, routeId);
     }
 

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

@@ -258,7 +258,7 @@ public interface ICheckService {
      */
     Map<String,CheckRecordDto> obtainLastCheckRecord(String[] relationId);
 
-    Page<HashMap<String, Object>> getCheckPage(HashMap<String, Object> map, CommonPageable pageable);
+    Page<Map<String, Object>> getCheckPage(HashMap<String, Object> map, CommonPageable pageable);
 
     Map<String, Object> getCheckDetail(String id);
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/IPointService.java

 package com.yeejoin.amos.maintenance.business.service.intfc;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.maintenance.business.dto.PointDto;
 import com.yeejoin.amos.maintenance.business.param.*;
 import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
@@ -299,7 +300,6 @@ public interface IPointService {
 
     LinkedHashMap<String,Object> getRegionTress();
 
-    void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId);
     /**
      * 查询巡检点及点及点的项
      * @param queryRequests 请求参数
@@ -309,4 +309,5 @@ public interface IPointService {
      */
     Page<PointDto> queryPointInfoWithItem(List<DaoCriteria> queryRequests, CommonPageable commonPageable, Long ownerId);
 
+    void syncSavePoint(List<MaintenanceResourceData> list, ReginParams reginParams);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ISynDataService.java

 package com.yeejoin.amos.maintenance.business.service.intfc;
 
-import com.yeejoin.amos.maintenance.business.param.SynInputItemParam;
-import com.yeejoin.amos.maintenance.business.util.CommonResponse;
-import com.yeejoin.amos.maintenance.business.util.Toke;
-import com.yeejoin.amos.maintenance.business.param.SynPlanParam;
-import com.yeejoin.amos.maintenance.business.param.SynPointParam;
-import com.yeejoin.amos.maintenance.business.param.SynRouteParam;
+import java.util.List;
 
 public interface ISynDataService {
 
-    CommonResponse saveInputItem(SynInputItemParam synInputItemParam, String userId, String orgCode);
-
-    CommonResponse updateInputItem(SynInputItemParam synInputItemParam);
-
-    CommonResponse deleteInputItem(SynInputItemParam synInputItemParam);
-
-    CommonResponse saveSinglePoint(SynPointParam synPointParam, String userId, String orgCode);
-
-    CommonResponse updateSinglePoint(SynPointParam synPointParam);
-
-    CommonResponse deleteSinglePoint(SynPointParam synPointParam);
-
-    CommonResponse synPointItemRelation(SynPointParam synPointParam, Boolean isSave, String userId);
-
-    CommonResponse saveRoute(SynRouteParam synRouteParam, String userId, String orgCode);
-
-    CommonResponse updateRoute(SynRouteParam synRouteParam, String userId, String orgCode);
-
-    CommonResponse savePlan(SynPlanParam synPlanParam, String userId, String orgCode, Toke toke);
-
-    CommonResponse updatePlan(SynPlanParam synPlanParam, String userId, String orgCode);
-
-    CommonResponse stopPlan(String originalId);
-
-    CommonResponse getPlanFinishTimes(String originalIds);
-
+    /**
+     * 删除维保项(原巡检点)
+     * @param ids 原ids
+     * @return Boolean
+     */
+    List<Long> pointDelete(String ids);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PersonIdentifyAspect.java

@@ -47,7 +47,7 @@ public class PersonIdentifyAspect {
             if (ObjectUtils.isEmpty(responseModel.getResult()) || responseModel.getStatus() != HTTP_OK_STATUS) {
                 throw new RuntimeException(responseModel.getDevMessage());
             }
-            ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(),ReginParams.PersonIdentity.class);
+            ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
             reginParam.setPersonIdentity(personIdentity);
             redisUtils.set(buildKey(RequestContext.getToken()), JSONObject.toJSONString(reginParam));
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/jpush/AppMessagePushService.java

 package com.yeejoin.amos.maintenance.jpush;
 
+import cn.jpush.api.JPushClient;
+import cn.jpush.api.push.model.PushPayload;
+import com.yeejoin.amos.maintenance.business.constants.XJConstant;
+import com.yeejoin.amos.maintenance.business.param.PushMsgParam;
 import com.yeejoin.amos.maintenance.business.util.CommonResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,23 +11,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import com.yeejoin.amos.maintenance.business.constants.XJConstant;
-import com.yeejoin.amos.maintenance.business.param.PushMsgParam;
-
-import cn.jpush.api.JPushClient;
-import cn.jpush.api.push.model.PushPayload;
-
 
 @Service
 public class AppMessagePushService {
 
-	
-	protected static final Logger log = LoggerFactory
-			.getLogger(AppMessagePushService.class);
 
-	
-	    @Autowired
-	    private com.yeejoin.amos.maintenance.feign.PushFeign PushFeign;
+    protected static final Logger log = LoggerFactory
+            .getLogger(AppMessagePushService.class);
+
+
+    @Autowired
+    private com.yeejoin.amos.maintenance.feign.PushFeign PushFeign;
 //	private static String APP_KEY;
 //	    
 //    private static String MASTER_SECRET;
@@ -36,20 +34,21 @@ public class AppMessagePushService {
 //    public void setMasterSecret(String masterSecret) {
 //        this.MASTER_SECRET = masterSecret;
 //    }
-	
-	@Value("${params.isPush}")
-	private String isPush;
-
-	protected static final String APP_KEY = "1b3f7b961200f4b236811dfe";
-	protected static final String MASTER_SECRET = "8b650e645fb3a43c96be02b2";
-	//
-
-	private static JPushClient jpushClient = new JPushClient(MASTER_SECRET,
-			APP_KEY);
-	 public static String buildJpushUserKey(String userId) {
-	        return XJConstant.JPUSH_USER_KEY + "_" + userId;
-	    }
-	    
+
+    @Value("${params.isPush}")
+    private String isPush;
+
+    protected static final String APP_KEY = "1b3f7b961200f4b236811dfe";
+    protected static final String MASTER_SECRET = "8b650e645fb3a43c96be02b2";
+    //
+
+    private static JPushClient jpushClient = new JPushClient(MASTER_SECRET,
+            APP_KEY);
+
+    public static String buildJpushUserKey(String userId) {
+        return XJConstant.JPUSH_USER_KEY + "_" + userId;
+    }
+
 //	private static JPushClient jpushClient = null;
 //
 //	public static JPushClient getJPushClient(String APP_KEY, String MASTER_SECRET) {
@@ -61,29 +60,29 @@ public class AppMessagePushService {
 //	}
 
 
-	/*public void sendMessage(List<PushMsgParam> responses)
-	{
-		PushFeign.sendMessage(responses);
-		try
-		{
-			if(responses!=null && "true".equals(isPush))
-			{
-				for(PushMsgParam response:responses)
-				{
-					PushPayload payload = buildPushPayload(response);
-					jpushClient.sendPush(payload);
-				}
-			}
-		}
-		catch (Exception e){
-			log.error(e.getMessage(),e);
-			e.printStackTrace();
-		}
-	}
+    /*public void sendMessage(List<PushMsgParam> responses)
+    {
+        PushFeign.sendMessage(responses);
+        try
+        {
+            if(responses!=null && "true".equals(isPush))
+            {
+                for(PushMsgParam response:responses)
+                {
+                    PushPayload payload = buildPushPayload(response);
+                    jpushClient.sendPush(payload);
+                }
+            }
+        }
+        catch (Exception e){
+            log.error(e.getMessage(),e);
+            e.printStackTrace();
+        }
+    }
 */
-	private PushPayload buildPushPayload(PushMsgParam response) {
-		CommonResponse commonResponse = PushFeign.buildPushPayload(response);
-    	return (PushPayload)commonResponse.getDataList();
+    private PushPayload buildPushPayload(PushMsgParam response) {
+        CommonResponse commonResponse = PushFeign.buildPushPayload(response);
+        return (PushPayload) commonResponse.getDataList();
 		/*if(JPushTypeEnum.ALL.getCode().equals(response.getType())){
 			return PushPayload.newBuilder()
 					.setPlatform(Platform.android())
@@ -102,19 +101,19 @@ public class AppMessagePushService {
 					.build();
 		}*/
 
-	}
-
-	public void sendMessage(PushMsgParam response){
-		
-		try {
-			if(null!=response && "true".equals(isPush)){
-				CommonResponse  commonResponse = PushFeign.sendMessageone(response);
-			}
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			e.printStackTrace();
-		
-		}
-	}
+    }
+
+    public void sendMessage(PushMsgParam response) {
+
+        try {
+            if (null != response && "true".equals(isPush)) {
+                CommonResponse commonResponse = PushFeign.sendMessageone(response);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            e.printStackTrace();
+
+        }
+    }
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/quartz/JobService.java

@@ -198,7 +198,11 @@ public class JobService implements IJobService {
                 check.setPointName(arg.getPointName());
                 check.setPointId(arg.getPointId());
                 check.setPointNo(arg.getPointNo());
+                check.setRiskAndManage(arg.getRiskAndManage());
+                check.setBeginTime(planTask.getBeginTime());
+                check.setEndTime(planTask.getEndTime());
                 check.setBuildingName(arg.getBuildingName());
+                check.setAddress(arg.getAddress());
                 check.setUploadTime(new Date());
                 check.setPlanId(arg.getPlanId());
                 check.setPlanName(arg.getPlanName());
@@ -209,6 +213,7 @@ public class JobService implements IJobService {
                 check.setRouteName(arg.getRouteName());
                 check.setCheckTime(arg.getEndTime());
                 check.setOwnerId(arg.getOwnerId());
+                check.setOwnerName(arg.getOwnerName());
                 check.setCompanyId(arg.getCompanyId());
                 check.setCompanyName(arg.getCompanyName());
                 check.setEquipmentName(arg.getEquipmentName());
@@ -320,8 +325,7 @@ public class JobService implements IJobService {
                 updatePlanTaskStatus(planTask, PlanTaskFinishStatusEnum.OVERTIME.getValue());
             }
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            e.printStackTrace();
+            log.error("任务加到定时任务或者更新失败", e);
         }
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/task/PlanTaskJob.java

+package com.yeejoin.amos.maintenance.task;
+
+import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author DELL
+ */
+@Component
+@EnableScheduling
+public class PlanTaskJob {
+
+
+    @Autowired
+    private IPlanTaskService planTaskService;
+
+    /**
+     * 定时查询任务状态
+     */
+    @Scheduled(cron = "${jobs.cron}")
+    public void scheduleJob() {
+        planTaskService.taskExecution(null);
+    }
+}

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

@@ -423,14 +423,12 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "获取巡检日历数据<font color='blue'>手机app</font>", notes = "获取巡检日历数据<font color='blue'>手机app</font>")
     @PostMapping(value = "/checkCalendar", produces = "application/json;charset=UTF-8")
     public CommonResponse checkCalendar(
-            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
+            @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
             List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName);
-
-
             Map<String, Object> map = checkService.checkCalendar(CheckParamUtil.checkCalendar(daoCriterias));
             return CommonResponseUtil.success(map);
         } catch (Exception e) {
@@ -618,9 +616,9 @@ public class CheckController extends AbstractBaseController {
     public ResponseModel getPlanExecuteInfo(
             @ApiParam(value = "计划id") @RequestParam(value = "planId") Long planId,
             @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) Long pointId,
-            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) String executeState,
-            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) String status,
-            @ApiParam(value = "点id") @RequestParam(value = "pointId", required = false) String teamId,
+            @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<>();
@@ -628,7 +626,7 @@ public class CheckController extends AbstractBaseController {
         map.put("pointId", pointId);
         map.put("executeState", executeState);
         map.put("status", status);
-        map.put("teamId", teamId);
+        map.put("companyName", companyName);
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         return ResponseHelper.buildResponse(checkService.getPlanExecuteInfo(map, pageable));
     }

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

@@ -36,4 +36,6 @@ public interface InputItemMapper {
     List<InputItemVo> getInputItemParent(@Param("id") String id);
 
     void updatePointById(Map<String, Object> param);
+
+    List<Long> getIds();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPointDao.java

@@ -27,8 +27,8 @@ public interface IPointDao extends BaseDao<Point, Long> {
     
     Optional<Point> findById(Long id);
 
-    @Query(value = "SELECT id FROM p_point p WHERE p.point_no = (?1) AND p.original_id = (?2)", nativeQuery = true)
-    Long findPointByEquipmentIdAndFireFacilityId(String equipmentId, String specificId);
+    @Query(value = "SELECT id FROM p_point p WHERE p.point_no = (?1) and is_delete =0 limit 1", nativeQuery = true)
+    Long findPointByPointNoId(String id);
 
     @Modifying
     @Transactional
@@ -39,7 +39,7 @@ public interface IPointDao extends BaseDao<Point, Long> {
 
     @Modifying
     @Transactional
-    @Query(value = "UPDATE p_point SET is_delete = 1 WHERE point_no IN (?1)", nativeQuery = true)
+    @Query(value = "UPDATE p_point SET is_delete = 1 WHERE point_no = (?1)", nativeQuery = true)
     void delPointByPointNo(Long id);
 
     @Query(value = "SELECT id FROM p_point p WHERE is_delete = 0 AND p.point_no = (?1)", nativeQuery = true)

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

@@ -1156,6 +1156,7 @@ public class CheckServiceImpl implements ICheckService {
         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);

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

@@ -1134,6 +1134,11 @@ public class PointServiceImpl implements IPointService {
         List<Long> ids = new ArrayList<Long>();
         Point point = new Point();
         String id = StringUtil.isNotEmpty(orgUsrFormDto.getSequenceNbr()) ? String.valueOf(orgUsrFormDto.getSequenceNbr()) : String.valueOf(sequence.nextId());
+        point.setPointNo(id);
+        point.setShotMinNumber(0);
+        point.setShotMaxNumber(0);
+        point.setFixedShot(0);
+        point.setLevel("");
         point.setName(orgUsrFormDto.getBizOrgName());
         point.setOrgCode(orgUsrFormDto.getBizOrgCode());
         point.setBuildingId(orgUsrFormDto.getBuildId());
@@ -1156,27 +1161,28 @@ public class PointServiceImpl implements IPointService {
                 }
             }
         }
-        point.setOrgCode(orgUsrFormDto.getAmosOrgCode());
-        Long pointId = iPointDao.findPointByEquipmentIdAndFireFacilityId(id, point.getOriginalId());
+        point.setOrgCode(StringUtil.isNotEmpty(orgUsrFormDto.getAmosOrgCode()) ? orgUsrFormDto.getAmosOrgCode() : "");
+        Long pointId = iPointDao.findPointByPointNoId(point.getPointNo());
         if (null != pointId) {
             ids.add(pointId);
             iPointDao.delPointBIds(pointId);
         }
         iPointDao.save(point);
-        List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(point.getName());
-        if (0 < inputItemVos.size()) {
-            inputItemVos.forEach(y -> {
+        List<Long> itemIds = inputItemMapper.getIds();
+        if (0 < itemIds.size()) {
+            itemIds.forEach(y -> {
                 PointInputItem inputItem = new PointInputItem();
                 inputItem.setPointId(point.getId());
-                inputItem.setOrderNo(y.getOrderNo());
-                inputItem.setInputItemId(y.getId());
+                inputItem.setInputItemId(y);
                 inputItems.add(inputItem);
             });
         }
         if (0 < ids.size()) {
             iPointInputItemDao.deleteByPointId(ids);
         }
-        iPointInputItemDao.saveAll(inputItems);
+        if (0 < inputItems.size()) {
+            iPointInputItemDao.saveAll(inputItems);
+        }
     }
 
     @Override

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

 package com.yeejoin.amos.supervision.business.util;
 
+import java.sql.PreparedStatement;
 import java.util.HashMap;
 import java.util.List;
 
@@ -62,6 +63,7 @@ public class InputItemParamUtil {
         }
         param.setOrgCode(perMap.get("orgCode").toString());
         if (commonPageable != null) {
+            param.setOffset(Integer.parseInt(String.valueOf(commonPageable.getOffset())));
             param.setPageNumber(commonPageable.getPageNumber());
             param.setPageSize(commonPageable.getPageSize());
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/mqtt/AmosMqttListener.java

 package com.yeejoin.amos.supervision.mqtt;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.supervision.business.dto.OrgUsrFormDto;
 import com.yeejoin.amos.supervision.business.service.intfc.IPointService;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.component.emq.EmqxListener;
 
+import java.nio.charset.Charset;
+
 /**
  * @author keyong
  * @title: AmosMqttListener
@@ -27,12 +29,13 @@ public class AmosMqttListener extends EmqxListener {
 
     @Override
     public void processMessage(String topic, MqttMessage message) {
-        String msg = String.valueOf(message);
+        byte[] payload = message.getPayload();
+        String str = new String(payload, Charset.forName("GBK"));
         if ("jcs/company/topic/add".equals(topic)) {
-            OrgUsrFormDto usrFormDto = JSON.parseObject(msg, OrgUsrFormDto.class);
+            OrgUsrFormDto usrFormDto = JSON.parseObject(str, OrgUsrFormDto.class);
             iPointService.syncSavePoint(usrFormDto);
         } else {
-            iPointService.delPointByPointNo(Long.valueOf(msg));
+            iPointService.delPointByPointNo(Long.valueOf(str));
         }
         try {
         } catch (Exception e) {

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,7 +3,6 @@ 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;
@@ -17,13 +16,9 @@ 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;
@@ -41,7 +36,6 @@ 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;
@@ -53,7 +47,6 @@ 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;
@@ -277,33 +270,87 @@ public class AlertCalledController extends BaseController {
 
 		queryWrapper.orderByDesc("call_time");
 
-		queryWrapper.between("call_time", DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN),
-				DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
+		if(!ValidationUtil.isEmpty(alertCalled.getIsAuxiliaryScreen())) {
+			if(!ValidationUtil.isEmpty(alertCalled.getCallTimeStart()) && !ValidationUtil.isEmpty(alertCalled.getCallTimeEnd())) {
+				queryWrapper.between("call_time", alertCalled.getCallTimeStart(),
+						alertCalled.getCallTimeEnd().getTime());
+			}
+		} else {
+			queryWrapper.between("call_time", DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN),
+					DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
+		}
 
 		if (alertCalled.getIsFatherAlert()) { // 0：接警；1：处警
 			queryWrapper.isNull("father_alert");
 		}
 
+		if(!ValidationUtil.isEmpty(alertCalled.getType())) {
+			queryWrapper.eq("type",alertCalled.getType());
+		}
+
+		if(!ValidationUtil.isEmpty(alertCalled.getAlarmType())) {
+			queryWrapper.eq("alarm_type",alertCalled.getAlarmType());
+		}
+
+		if(!ValidationUtil.isEmpty(alertCalled.getAlertSource())) {
+			queryWrapper.eq("alert_source",alertCalled.getAlertSource());
+		}
 		return queryWrapper;
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询警情事件记录", notes = "查询警情事件记录")
-	@PostMapping("/selectRecord")
-	public ResponseModel<Page<AlertCalledQueryDto>> queryAlertCalledByPager(@RequestBody AlertCalledQueryDto alertCalledQueryDto) {
-		List<AlertCalledQueryDto> list = iAlertCalledService.queryAlertListByQueryDto(alertCalledQueryDto);
+	@GetMapping("/selectRecord")
+	public ResponseModel<Page<AlertCalledQueryDto>> queryAlertCalledByPager(AlertCalledQueryDto alertCalledQueryDto,
+																			@RequestParam(value = "pageNum") int pageNum,
+																			@RequestParam(value = "pageSize") int pageSize) {
+		Page<AlertCalledQueryDto> page = new Page<AlertCalledQueryDto>();
+		page.setCurrent(pageNum);
+		page.setSize(pageSize);
+
+		Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(
+																						page,
+																						alertCalledQueryDto.getWorkOrderNumber(),
+																						alertCalledQueryDto.getCreator(),
+																						alertCalledQueryDto.getEmergency(),
+																						alertCalledQueryDto.getEmergencyTimeStart() == null ? null :	DateUtils.date2LongStr(alertCalledQueryDto.getEmergencyTimeStart()),
+																					    alertCalledQueryDto.getEmergencyTimeEnd() == null ? null :	DateUtils.date2LongStr(alertCalledQueryDto.getEmergencyTimeEnd()),
+																						alertCalledQueryDto.getEmergencyCall(),
+																						alertCalledQueryDto.getDeviceId(),
+																						alertCalledQueryDto.getElevatorAddress(),
+																						alertCalledQueryDto.getAlertType(),
+																						alertCalledQueryDto.getAlertSource(),
+																						alertCalledQueryDto.getAlertStage(),
+																						alertCalledQueryDto.getAlertStatus());
 		Page<AlertCalledQueryDto> result = new Page<AlertCalledQueryDto>(alertCalledQueryDto.getPageNum(), alertCalledQueryDto.getPageSize());
-		long totle = list.size();
-		result.setRecords(list);
+		long totle = pageBean.getTotal();
+		result.setRecords(pageBean.getRecords());
 		result.setTotal(totle);
 		return ResponseHelper.buildResponse(result);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "导出警情事件记录", notes = "导出警情事件记录")
-	@PostMapping("/exportSelectRecord")
-	public void exportAlertCalled(@RequestBody AlertCalledQueryDto alertCalledQueryDto, HttpServletResponse response) {
-		List<AlertCalledQueryDto> list = iAlertCalledService.queryAlertListByQueryDto(alertCalledQueryDto);
+	@GetMapping("/exportSelectRecord")
+	public void exportAlertCalled(AlertCalledQueryDto alertCalledQueryDto, HttpServletResponse response) {
+		Page<AlertCalledQueryDto> page = new Page<AlertCalledQueryDto>();
+
+		Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(
+																						page,
+																						alertCalledQueryDto.getWorkOrderNumber(),
+																						alertCalledQueryDto.getCreator(),
+																						alertCalledQueryDto.getEmergency(),
+																						alertCalledQueryDto.getEmergencyTimeStart() == null ? null :	DateUtils.date2LongStr(alertCalledQueryDto.getEmergencyTimeStart()),
+																						alertCalledQueryDto.getEmergencyTimeEnd() == null ? null :	DateUtils.date2LongStr(alertCalledQueryDto.getEmergencyTimeEnd()),
+																						alertCalledQueryDto.getEmergencyCall(),
+																						alertCalledQueryDto.getDeviceId(),
+																						alertCalledQueryDto.getElevatorAddress(),
+																						alertCalledQueryDto.getAlertType(),
+																						alertCalledQueryDto.getAlertSource(),
+																						alertCalledQueryDto.getAlertStage(),
+																						alertCalledQueryDto.getAlertStatus());
+		List<AlertCalledQueryDto> list = pageBean.getRecords();
+
 		String fileName = "警情事件记录" + System.currentTimeMillis();
 		ExcelUtil.createTemplate(response, fileName, "警情事件记录", list,
 				AlertCalledQueryDto.class, null, false);

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

@@ -81,10 +81,13 @@ public class CtiController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/info/{connectId}")
+	@GetMapping(value = "/info/{serviceconnectionid}")
 	@ApiOperation(httpMethod = "GET", value = "获取通话话单详情", notes = "获取通话话单详情")
-	public ResponseModel<JSONObject> getCallInfo(@PathVariable String connectId) {
-		JSONArray recordInfos = ctiService.getCallInfo(connectId);
+	public ResponseModel<JSONObject> getCallInfo(@PathVariable String serviceconnectionid) {
+		JSONArray recordInfos = ctiService.getCallInfo(serviceconnectionid);
+		if(recordInfos.size() == 0) {
+			throw new BadRequest("未找到相关通话信息");
+		}
 		JSONObject recordInfo = recordInfos.getJSONObject(0);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
 		return ResponseHelper.buildResponse(recordInfo);

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

@@ -116,7 +116,7 @@ public class VoiceRecordFileController extends BaseController {
 
 
 	/**
-	 * 新增通话记录
+	 * 新增-通话记录
 	 *
 	 * @return
 	 */
@@ -135,13 +135,13 @@ public class VoiceRecordFileController extends BaseController {
 		}
 		JSONObject recordInfo = recordInfos.getJSONObject(0);
 		model.setTel(recordInfo.getString("telephone"));
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+
 		Date telStartTime = null;
 		Date telEndTime = null;
 		try {
-			telStartTime = sdf.parse(recordInfo.getString("connectTime"));
-			telEndTime = sdf.parse(recordInfo.getString("hangupTime"));
-		} catch (ParseException e) {
+			telStartTime = DateUtils.longStr2Date(recordInfo.getString("connectTime"));
+			telEndTime = DateUtils.longStr2Date(recordInfo.getString("hangupTime"));
+		} catch (Exception e) {
 			throw new BadRequest("日期转换错误");
 		}
 		model.setTelStartTime(telStartTime);
@@ -152,8 +152,13 @@ public class VoiceRecordFileController extends BaseController {
 			model.setFileType("坐席呼出");
 		}
 
-		// 获取附件
-		Map<String, String> downloadFile = ctiService.downLoadRecordFile(model.getConnectId());
+		// 获取附件 需要延时5S
+		try {
+			Thread.sleep(5000);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		Map<String, String> downloadFile = ctiService.downLoadRecordFile(recordInfo.getString("connectionid"));
 		if(downloadFile.isEmpty()) {
 			throw new BadRequest("未找到附件文件");
 		}

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

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -27,6 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
@@ -148,9 +153,32 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     }
 
     @Override
-    public List<AlertCalledQueryDto> queryAlertListByQueryDto(AlertCalledQueryDto alertCalledQueryDto) {
-        List<AlertCalledQueryDto> list = alertCalledMapper.queryAlertListByQueryDto(alertCalledQueryDto);
-        return list;
+    public Page<AlertCalledQueryDto> queryAlertListByQueryDto(IPage<AlertCalledQueryDto> page,
+                                                              @Condition(Operator.like) String workOrderNumber,
+                                                              @Condition(Operator.like) String creator,
+                                                              @Condition(Operator.like) String emergency,
+                                                              @Condition(Operator.gt) String emergencyTimeStart,
+                                                              @Condition(Operator.lt) String emergencyTimeEnd,
+                                                              @Condition(Operator.like) String emergencyCall,
+                                                              @Condition(Operator.like) String deviceId,
+                                                              @Condition(Operator.like) String elevatorAddress,
+                                                              @Condition(Operator.eq) String alertType,
+                                                              @Condition(Operator.eq) String alertSource,
+                                                              @Condition(Operator.eq) String alertStage,
+                                                              @Condition(Operator.eq) String alertStatus
+                                                              ) {
+
+        Page<List<AlertCalledQueryDto>>list = alertCalledMapper.queryAlertListByQueryDto(
+                page,workOrderNumber,creator,emergency,emergencyTimeStart,
+                emergencyTimeEnd,emergencyCall,deviceId,elevatorAddress,alertType,
+                alertSource,alertStage,alertStatus,null);
+        Page<AlertCalledQueryDto> page1 = new Page<>();
+        List<AlertCalledQueryDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(list.getRecords()),AlertCalledQueryDto.class);
+        page1.setCurrent(page.getCurrent());
+        page1.setSize(page.getSize());
+        page1.setTotal(list.getTotal());
+        page1.setRecords(resultDtoList);
+        return page1;
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/CtiServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
-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.FormValue;
-import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
-import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
-import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
-import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ICtiService;
-import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.HttpUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.security.MessageDigest;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -70,11 +36,14 @@ public class CtiServiceImpl implements ICtiService {
      */
     private long time = 6000l;
 
-    private final String APP_KEY = "4e805006-3fef-ae43-3915-a153731007c4";
+    @Value("${tzs.cti.appkey}")
+    private String APP_KEY;
 
-    private final String SECRET_KEY = "7bd29115-99ee-4f7d-1fb1-7c4719d5f43a";
+    @Value("${tzs.cti.secretkey}")
+    private String SECRET_KEY;
 
-    private String ctiUrl = "http://36.46.151.113:8000";
+    @Value("${tzs.cti.url}")
+    private String ctiUrl;
 
     @Override
     public String getAccessToken() {
@@ -144,11 +113,11 @@ public class CtiServiceImpl implements ICtiService {
     }
 
     @Override
-    public JSONArray getCallInfo(String connectionid) {
+    public JSONArray getCallInfo(String serviceconnectionid) {
         String token = this.getAccessToken();
-        String url = ctiUrl + "/onOpenAuth/cti/openApi/querycalllist1";
+        String url = ctiUrl + "/onOpenAuth/cti/openApi/queryservicelist1";
         JSONObject params = new JSONObject();
-        params.put("connectionid",connectionid);
+        params.put("serviceconnectionid",serviceconnectionid);
         Map<String,String> header = new HashMap<>();
         header.put("accessToken",token);
         String responseStr = HttpUtils.doPostWithHeader(url,params.toJSONString(),header);

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,62 @@
 			ADD COLUMN maintenance_period VARCHAR ( 10 ) COMMENT '维保周期';
 		</sql>
 	</changeSet>
-	
+
+	<changeSet author="chenhao" id="2021-08-26-chenhao-1">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<columnExists tableName="cb_firefighters_contract" columnName="start_time"/>
+			</not>
+	</preConditions>
+		<comment>modify table cb_firefighters_contract add one columns</comment>
+		<sql>
+			ALTER TABLE `cb_firefighters_contract` ADD start_time date 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-maintenance/src/main/java/com/yeejoin/amos/MaintenanceApplication.java

 package com.yeejoin.amos;
 
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,13 +13,20 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.client.RestTemplate;
+import org.typroject.tyboot.core.restful.config.JsonSerializerManage;
 import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+
 /**
  * <pre>
  * 服务启动类
@@ -42,8 +44,9 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 @EnableFeignClients
 @EnableAsync
 @EnableEurekaClient
-@ComponentScan({"org.typroject", "com.yeejoin.amos"})
-@MapperScan(basePackages = {"com.yeejoin.amos.maintenance.business.dao.mapper", "org.typroject.tyboot.core.auth.face.orm.dao","com.yeejoin.amos.boot.biz.common.dao.mapper"})
+@ComponentScan(value = {"org.typroject", "com.yeejoin.amos"}, excludeFilters = {
+        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {JsonSerializerManage.class})})
+@MapperScan(basePackages = {"com.yeejoin.amos.maintenance.business.dao.mapper", "org.typroject.tyboot.core.auth.face.orm.dao", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
 public class MaintenanceApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(MaintenanceApplication.class);
@@ -61,9 +64,9 @@ public class MaintenanceApplication {
      * @throws IOException
      * @throws URISyntaxException
      */
-    public static void main(String[] args)  throws UnknownHostException{
-	    logger.info("start Service..........");
-		ConfigurableApplicationContext context = SpringApplication.run(MaintenanceApplication.class, args);
+    public static void main(String[] args) throws UnknownHostException {
+        logger.info("start Service..........");
+        ConfigurableApplicationContext context = SpringApplication.run(MaintenanceApplication.class, args);
         GlobalExceptionHandler.setAlwaysOk(true);
         Environment env = context.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();

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

@@ -190,4 +190,48 @@
             ALTER TABLE p_plan_task add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
         </sql>
     </changeSet>
+    <changeSet author="suhuiguang" id="1630291249911-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="risk_and_manage"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN risk_and_manage '风险辨识与管控措施'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `risk_and_manage` varchar(255) DEFAULT NULL COMMENT '风险辨识与管控措施' after `point_no`;
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1630291249911-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="begin_time"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN begin_time '开始时间'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `begin_time` datetime DEFAULT NULL COMMENT '开始时间' after `plan_task_detail_id`;
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1630291249911-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="end_time"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN end_time '结束时间'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `end_time` datetime DEFAULT NULL COMMENT '结束时间' after `begin_time`;
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1630291249911-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="owner_name"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN owner_name '业主单位名称'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `owner_name` varchar(255) DEFAULT NULL COMMENT '业主单位名称' after `owner_id`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

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

@@ -266,7 +266,7 @@
         ELSE
         0
         END
-        ),0) AS "qualified",
+        ),0) AS '合格',
         COALESCE(SUM(
         CASE
         WHEN is_ok = '2' THEN
@@ -274,7 +274,7 @@
         ELSE
         0
         END
-        ),0) AS "unqualified",
+        ),0) AS '不合格',
         COALESCE(SUM(
         CASE
         WHEN is_ok = '3' THEN
@@ -282,8 +282,7 @@
         ELSE
         0
         END
-        ),0) AS "omission",
-        COUNT(id) count
+        ),0) AS '漏检'
         FROM
         p_check
         <include refid="calendar-where"/>
@@ -1913,12 +1912,13 @@
                 pp.belong_system_name systemName,
                 pp.address address,
                 pp.original_id equipId,
-                CONCAT(pp.address, pp.building_name) buildingName,
+                CONCAT_WS('',pp.building_name,pp.address) buildingName,
                 pc.org_code AS orgCode
             FROM p_check pc
             LEFT JOIN p_point pp ON pp.id = pc.point_id
         ) a
         <include refid="mobile-check-record-where" />
+        order by checkDate
         limit #{offset},#{pageSize}
     </select>
 
@@ -1948,30 +1948,30 @@
             <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''  ">
                 AND (
                 (
-                a.beginTime <![CDATA[>=]]>  #{beginTime}
-                AND a.endTime <![CDATA[<=]]> #{endTime}
+                a.checkDate <![CDATA[>=]]>  #{beginTime}
+                AND a.checkDate <![CDATA[<=]]> #{endTime}
                 )
                 OR (
-                a.beginTime <![CDATA[<=]]> #{endTime}
-                AND a.endTime <![CDATA[>=]]> #{endTime}
+                a.checkDate <![CDATA[<=]]> #{endTime}
+                AND a.checkDate <![CDATA[>=]]> #{endTime}
                 )
                 OR (
-                a.beginTime <![CDATA[<=]]> #{beginTime}
-                AND a.endTime <![CDATA[>]]> #{beginTime}
+                a.checkDate <![CDATA[<=]]> #{beginTime}
+                AND a.checkDate <![CDATA[>]]> #{beginTime}
                 )
                 OR (
-                a.beginTime <![CDATA[<=]]> #{beginTime}
-                AND a.endTime <![CDATA[>=]]> #{endTime}
+                a.checkDate <![CDATA[<=]]> #{beginTime}
+                AND a.checkDate <![CDATA[>=]]> #{endTime}
                 )
                 )
             </if>
             <choose>
                 <when test="identityType==1">
                     And (a.orgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.orgCode= #{orgCode} )
-                    <if test="companyId != null"> and a.ownerId = #{teamId}</if>
+                    <if test="companyId != null and companyId != ''"> and a.ownerId = #{companyId}</if>
                 </when>
                 <when test="identityType==2">
-                    And a.ownerId = #{teamId}
+                    And a.ownerId = #{companyId}
                 </when>
             </choose>
         </where>
@@ -2014,52 +2014,40 @@
         pp.belong_system_id systemId,
         pp.belong_system_name systemName,
         pp.address address,
-        CONCAT(pp.address, pp.building_name) buildingName,
+        CONCAT_WS('',pp.building_name,pp.address) buildingName,
         pc.org_code AS orgCode
         FROM p_check pc
         LEFT JOIN p_point pp ON pp.id = pc.point_id
         ) a
         <include refid="mobile-check-record-where" />
     </select>
-
     <select id="getCheckDetail" resultType="Map">
         SELECT
-            pc.id checkId,
-            pci.is_ok isOk,
+            pc.id,
+            pc.point_name as pointName,
+            pc.point_no as pointNo,
+            pc.is_ok isOk,
+            CONCAT_WS(',',pc.building_name,pc.address) address,
+            pc.user_name as userName,
+            pc.plan_id as planId,
+            pc.plan_name as planName,
+            pc.plan_type as planType,
+            pc.owner_name as ownerName,
             date_format(
-                pc.check_time,
-                '%Y-%m-%d %H:%i:%s'
-            ) maintenanceDate,
-            pp.id pointId,
-            pp.equipment_id equipmentId,
-            pp.remark remark,
-            pp.owner_name ownerName,
-            pp.equipment_name equipmentName,
-            pp.belong_system_id systemId,
-            pp.belong_system_name systemName,
-            CONCAT_WS(',',pp.building_name,pp.address) address,
-            CONCAT(date_format(
-                ppl.plan_begin,
-                '%Y-%m-%d %H:%i:%s'
-            ), '-', date_format(
-                ppl.plan_end,
-                '%Y-%m-%d %H:%i:%s'
-            )) planDate,
-            ppl.name planName,
-            pp.plan_type planType,
-            ppt.user_name planUser,
-            pci.input_name itemName,
-            pii.maintenance_content itemContent,
-            pcs.photo_data picture,
-            pcs.point_name pointName,
-            pcs.shot_type shotType
+            pc.begin_time,
+            '%Y-%m-%d %H:%i:%s'
+            ) as beginTime,
+            date_format(
+            pc.end_time,
+            '%Y-%m-%d %H:%i:%s'
+            ) as endTime,
+            date_format(
+            pc.check_time,
+            '%Y-%m-%d %H:%i:%s'
+            ) as checkTime,
+            pc.risk_and_manage as riskAndManage,
+            pc.remark
         FROM p_check pc
-        LEFT JOIN p_point pp ON pp.id = pc.point_id
-        LEFT JOIN p_plan ppl ON ppl.id = pc.plan_id
-        LEFT JOIN p_check_input pci ON pci.check_id = pc.id
-        LEFT JOIN p_input_item pii ON pii.id = pci.input_id
-        LEFT JOIN p_check_shot pcs ON pcs.check_id = pc.id
-        LEFT JOIN p_plan_task ppt ON ppt.id = pc.plan_task_id
         WHERE
             pc.id = #{id}
     </select>

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -392,6 +392,9 @@
 			temp1.pointNo,
 			temp1.buildingName,
 			temp1.equipmentName,
+			temp1.remark as riskAndManage,
+			temp1.address,
+			temp1.ownerName,
 			pii.`name` inputName,
 			temp2.*
 		FROM
@@ -410,9 +413,12 @@
 				    r.name as routeName,
 					p.name as pointName,
 				    p.owner_id as ownerId,
+				    p.owner_name as ownerName,
 				    p.point_no as pointNo,
 				    p.building_name as buildingName,
-					p.equipment_name as equipmentName
+					p.equipment_name as equipmentName,
+					p.remark,
+					p.address
 				FROM
 					p_route_point_item prpi
 					LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id
@@ -430,7 +436,7 @@
 					ptd.plan_id planId,
 					ptd.user_id AS userId,
 					ptd.org_code AS orgCode,
-					ptd.end_time AS endTime,
+					ptd.begin_time AS beginTime,
 					ptd.end_time AS endTime,
 					ptd.company_id as companyId,
 					ptd.company_name as companyName,

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/mapper/dbTemplate_check.xml

@@ -1894,7 +1894,7 @@
         d.date
     </select>
 
-    <select id="getItemCount" resultType="Map">
+    <select id="getItemCount" resultType="long">
         SELECT
             count(1)
         FROM
@@ -1934,19 +1934,19 @@
             pc.id = pci.check_id
             AND pc.plan_task_detail_id = pptd.id
             AND pc.plan_id = #{planId}
-            <if test="pointId != null and pointId != ''">
+            <if test="pointId != null and pointId != '' and pointId != -1">
                 AND pc.point_id = #{pointId}
             </if>
-            <if test="executeState != null and executeState != ''">
-                AND pptd.is_finish = #{executeState}
+            <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="teamId != null and teamId != ''">
-                AND pc.company_id = #{teamId}
+            <if test="companyName != null and companyName != ''">
+                AND pc.company_name = #{company_name}
             </if>
-        LIMIT limit #{offset},#{pageSize}
+        limit #{offset},#{pageSize}
     </select>
 
     <select id="getPlanExecuteTeams" resultType="Map">

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

@@ -119,13 +119,13 @@
 		<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>
-	     <when test="pageSize==-1"></when>
-	     <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
-	    </choose>
+			<when test="pageSize==-1"></when>
+			<when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
+		</choose>
 	</select>
 
 	<select id="getInputItemListByNames" resultMap="inputItemMap" parameterType="String">
@@ -296,4 +296,13 @@
 	<update id="updatePointById" parameterType="map">
 		update p_input_item SET item_start = #{itemStart} WHERE id = #{id}
 	</update>
+
+	<select id="getIds" resultType="long">
+		SELECT
+			id
+		FROM
+			p_input_item
+		WHERE
+			is_delete = 0
+	</select>
 </mapper>
\ No newline at end of file

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

@@ -40,4 +40,8 @@ emqx.password=a123456
 ## redisʱʱ
 redis.cache.failure.time=10800
 
-failure.work.flow.processDefinitionKey=malfunction_repair
+failure.work.flow.processDefinitionKey=malfunction_repair
\ No newline at end of file
+
+tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
+tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
+tzs.cti.url=http://36.46.151.113:8000
\ No newline at end of file

pom.xml

@@ -26,7 +26,7 @@
 		<springboot.version>2.3.11.RELEASE</springboot.version>
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<tyboot-version>1.1.20Ty-SNAPSHOT</tyboot-version>
+		<tyboot-version>1.1.20</tyboot-version>
 		<amos.version>1.6.0</amos.version>
 		<itext.version>7.1.1</itext.version>
 	</properties>