Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/BaseEnterpriseVideoServiceImpl.java

@@ -113,6 +113,7 @@ public class BaseEnterpriseVideoServiceImpl extends BaseService<BaseEnterpriseVi
                 if (result.get("data") instanceof JSONObject) {
                     JSONObject dataObj = (JSONObject) result.get("data");
                     String cameraUrl = dataObj.getString("url");
+                    video.setType(param.getString("protocol"));
                     video.setUrl(cameraUrl);
                     video.setType(param.getString("protocol"));
                 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/BizRelationDataDto.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import lombok.Data;
 
+import java.util.Set;
+
 @Data
 public class BizRelationDataDto {
 
@@ -30,4 +32,9 @@ public class BizRelationDataDto {
      * 附件
      */
     private String changeAttachment;
+
+    /**
+     * 变更的设备
+     */
+    private Set<String> records;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgBizChangeLogDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2025-04-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgBizChangeLogDto", description="")
-public class JgBizChangeLogDto  extends BaseDto {
+@ApiModel(value = "JgBizChangeLogDto", description = "")
+public class JgBizChangeLogDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "业务唯一标识")
@@ -36,4 +33,8 @@ public class JgBizChangeLogDto  extends BaseDto {
     @ApiModelProperty(value = "变更附件")
     private String changeAttachment;
 
+
+    @ApiModelProperty(value = "触发的id(列入使用登记变化后，安装告知数据也变化，则记录两条：使用登记的oid为空，按照告知的为使用登记的id)")
+    private String oId;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgBizChangeLog.java

@@ -52,4 +52,10 @@ public class JgBizChangeLog extends BaseEntity {
 	@TableField("change_attachment")
     private String changeAttachment;
 
+    /**
+     * 触发的id(列入使用登记变化后，安装告知数据也变化，则记录两条：使用登记的oid为空，按照告知的为使用登记的id)
+     */
+    @TableField("o_id")
+    private String oId;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/EquipSourceEnum.java

@@ -10,14 +10,16 @@ import java.util.Map;
 @Getter
 @AllArgsConstructor
 public enum EquipSourceEnum {
-    jg_his("历史设备", "jg_his"),
-    jg_his_black("历史设备(无登记证)", "jg_his_black"),
-    jg("新设备", "jg");
+    jg_his("历史设备", "jg_his", "his"),
+    jg_his_black("历史设备(无登记证)", "jg_his_black", "black"),
+    jg("新设备", "jg", "new");
 
     private final String name;
 
     private final String code;
 
+    private final String type;
+
 
     public static String getMessage(String code) {
         for (EquipSourceEnum constants : values()) {
@@ -30,6 +32,7 @@ public enum EquipSourceEnum {
 
     public static Map<Integer,String> getName=new HashMap<>();
     public static Map<String,Integer> getCode=new HashMap<>();
+    public static Map<String,Integer> getType=new HashMap<>();
 
     static {
         for (ConstructionEnum e : ConstructionEnum.values()){
@@ -39,14 +42,6 @@ public enum EquipSourceEnum {
 
     }
 
-    public String getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
     public static String getDataSourceName(String dataSource) {
         if(StringUtils.isEmpty(dataSource)){
             return EquipSourceEnum.jg_his.getName();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgInstallationNoticeMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Mapper 接口
@@ -66,4 +67,6 @@ public interface JgInstallationNoticeMapper extends CustomBaseMapper<JgInstallat
      * @return 已完成但是未生成装置的施工信息的安装告知单据列表
      */
     List<JgInstallationNotice> selectNotInsertProjectConstructionInstallNoticeList();
+
+    Set<Long> queryListByEqsAndStatus(@Param("records") Set<String> records, @Param("noticeStatus") String noticeStatus);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgMaintenanceContractMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Mapper 接口
@@ -38,4 +39,6 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
     List<MaintenanceVo> queryMaintenanceInIds(@Param("ids") List<String> ids);
 
     String getNameByEquDefine(String equDefine);
+
+    Set<Long> queryListByEqsAndStatus(@Param("records") Set<String> records, @Param("status") String status);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationEqMapper.java

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationEqDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,5 @@ public interface JgUseRegistrationEqMapper extends BaseMapper<JgUseRegistrationE
 
     void batchInsert(@Param("equipTransferId") String equipTransferId, @Param("jgRelationEquipList") List<JgUseRegistrationEq> jgRelationEquipList);
 
+    List<JgUseRegistrationEqDto> queryEqListByApplyNo(@Param("applyNo") String applyNo);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -2334,7 +2334,7 @@
         WHERE tjvi."USE_UNIT_CREDIT_CODE" = #{useCode}
           AND tjvi.is_delete = '0'
     </select>
-    <select id="countEquipInUseTimesWithOutZF" resultType="java.lang.Integer">
+    <select id="countEquipInUseTimesWithOutZF" resultType="java.lang.Integer" flushCache="true">
         select
             sum(inUseNumber)
         from (

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -360,4 +360,22 @@
             and n.project_contraption_id <![CDATA[ <> ]]> ''
             and not EXISTS (select 1 from idx_biz_jg_project_construction c where c.record=n.sequence_nbr)
     </select>
+    <select id="queryListByEqsAndStatus"
+            resultType="java.lang.Long">
+        SELECT
+            distinct n.sequence_nbr as sequence_nbr
+        FROM
+            "tzs_jg_installation_notice" n,
+            tzs_jg_installation_notice_eq ne
+        WHERE
+            n.notice_status =#{noticeStatus}
+            and n.is_delete=0
+            and ne.equip_transfer_id = n.sequence_nbr
+        <if test='records != null'>
+            and ne.equ_id in
+            <foreach collection="records" item="record" open="(" close=")" separator=",">
+                #{record}
+            </foreach>
+        </if>
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml

@@ -195,4 +195,21 @@
         ORDER BY
         tjmc.create_date DESC, tjmc.apply_no DESC
     </select>
-</mapper>
+    <select id="queryListByEqsAndStatus" resultType="java.lang.Long">
+        SELECT
+            distinct n.sequence_nbr as sequence_nbr
+        FROM
+            tzs_jg_maintenance_contract n,
+            tzs_jg_maintenance_contract_eq ne
+        WHERE
+            n.status = #{status}
+            and n.is_delete=0
+           and ne.equip_transfer_id = n.sequence_nbr
+        <if test='records != null'>
+            and ne.equ_id in
+            <foreach collection="records" item="record" open="(" close=")" separator=",">
+                #{record}
+            </foreach>
+        </if>
+    </select>
+</mapper>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationEqMapper.xml

@@ -9,4 +9,16 @@
             (#{item.sequenceNbr},#{equipTransferId}, #{item.equId})
         </foreach>
     </insert>
+    <select id="queryEqListByApplyNo"
+            resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationEqDto">
+        SELECT
+            eq.equ_id,
+            eq.sequence_nbr
+        FROM
+            tzs_jg_use_registration_eq eq,
+            tzs_jg_use_registration u
+        where
+          u.sequence_nbr = eq.equip_transfer_id
+          and u.apply_no=#{applyNo}
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/context/FlowingEquipRedisContext.java

@@ -14,7 +14,7 @@ import java.util.List;
 public class FlowingEquipRedisContext {
 
 
-    private static ThreadLocal<List<FlowingEquipRedisKeyDTO>> threadLocal = new ThreadLocal<>();
+    private static final ThreadLocal<List<FlowingEquipRedisKeyDTO>> threadLocal = new ThreadLocal<>();
 
     public static List<FlowingEquipRedisKeyDTO> getContext() {
         if (threadLocal.get() == null) {
@@ -29,9 +29,7 @@ public class FlowingEquipRedisContext {
 
     public static void clean() {
         log.info("FlowingEquipRedisContext clean begin");
-        if (threadLocal != null) {
-            threadLocal.remove();
-        }
+        threadLocal.remove();
         log.info("FlowingEquipRedisContext clean end");
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -364,8 +364,8 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询监管业务名称列表", notes = "查询监管业务名称列表")
     @GetMapping(value = "/superviseBusinessCategory")
-    public ResponseModel<Object> equipTree(@RequestParam(value = "businessType") String businessType) {
-        return ResponseHelper.buildResponse(commonService.superviseBusinessCategory(businessType));
+    public ResponseModel<Object> equipTree(@RequestParam(value = "businessType") String businessType, String dataSource) {
+        return ResponseHelper.buildResponse(commonService.superviseBusinessCategory(businessType, dataSource));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/handler/IChangeUpdateHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.event.handler;
+
+import org.springframework.context.ApplicationEvent;
+
+public interface IChangeUpdateHandler<T extends ApplicationEvent> {
+    void handle(T event);
+
+    Boolean supports(T event);
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/handler/InstallNoticeUpdateUpdateHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.event.handler;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.dto.ESDataChangeLogDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgBizChangeLog;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgBizChangeLogService;
+import com.yeejoin.amos.boot.module.jg.biz.event.ChangeDataEvent;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgBizChangeLogServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.UseRegisterDataChangeHandleImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Set;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class InstallNoticeUpdateUpdateHandler implements IChangeUpdateHandler<ChangeDataEvent> {
+
+    private final JgInstallationNoticeServiceImpl jgInstallationNoticeService;
+
+    private final JgBizChangeLogServiceImpl jgBizChangeLogService;
+
+    @Override
+    @Async
+    public void handle(ChangeDataEvent event) {
+        log.info("开始更新安装告知json数据：{}", event);
+        // 查询关联的单据-未删除且已完成状态
+        Set<Long> installationNoticeIds = this.getRelationInstallNoticeList(event);
+        // 更新历史json
+        installationNoticeIds.forEach(seq -> {
+            // 更新json
+            JgInstallationNotice installationNotice = jgInstallationNoticeService.getById(seq);
+            // 查询之前数据json
+            JSONObject beforeData = jgInstallationNoticeService.getHisData(installationNotice);
+            jgInstallationNoticeService.saveHisDataBeforeUpdate(installationNotice);
+            // 查询之后数据json
+            JSONObject afterData = jgInstallationNoticeService.getHisData(installationNotice);
+            // es记录日志
+            this.log2es(beforeData, afterData, installationNotice, event);
+        });
+    }
+
+    private void log2es(JSONObject beforeData, JSONObject afterData, JgInstallationNotice installationNotice, ChangeDataEvent event) {
+        Date date = DateUtil.date();
+        JgBizChangeLog changeLog = new JgBizChangeLog();
+        BeanUtil.copyProperties(event.getBizRelationData(), changeLog);
+        changeLog.setBizTable("tzs_jg_installation_notice");
+        changeLog.setRecDate(date);
+        changeLog.setBizId(installationNotice.getApplyNo());
+        // todo 与原始编辑进行关联
+        changeLog.setOId(event.getRequestContext().getTraceId());
+        changeLog.setBizType("installationNotice");
+        changeLog.setRecUserId(event.getRequestContext().getExcutedUserId());
+        ESDataChangeLogDto changeLogDto = new ESDataChangeLogDto();
+        changeLogDto.setColumnKey("changeData");
+        changeLogDto.setColumnKeyLabel("历史json数据");
+        changeLogDto.setBeforeData(beforeData.toJSONString());
+        changeLogDto.setAfterData(afterData.toJSONString());
+        changeLogDto.setUserId(event.getRequestContext().getExcutedUserId());
+        changeLogDto.setCreateDate(date.getTime());
+        changeLogDto.setRequestDate(DateUtil.formatDateTime(date));
+        changeLogDto.setChangeId(installationNotice.getApplyNo());
+        changeLogDto.setColumnFamily("tzs_jg_installation_notice");
+        changeLogDto.setBizType(changeLog.getBizType());
+        changeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
+        jgBizChangeLogService.save2DbAndEs(changeLog, Collections.singletonList(changeLogDto));
+    }
+
+    private Set<Long> getRelationInstallNoticeList(ChangeDataEvent event) {
+        // 变化的设备
+        Set<String> records = event.getBizRelationData().getRecords();
+        // 查询关联的单据-已完成时更新其json
+        return jgInstallationNoticeService.getBaseMapper().queryListByEqsAndStatus(records, FlowStatusEnum.TO_BE_FINISHED.getCode() + "");
+    }
+
+    @Override
+    public Boolean supports(ChangeDataEvent event) {
+        return event.getBizRelationData().getBizType().equals(UseRegisterDataChangeHandleImpl.BIZ_TYPE);
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/handler/MaintenanceContractUpdateUpdateHandler.java

+package com.yeejoin.amos.boot.module.jg.biz.event.handler;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.dto.ESDataChangeLogDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgBizChangeLog;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
+import com.yeejoin.amos.boot.module.jg.biz.event.ChangeDataEvent;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgBizChangeLogServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintenanceContractServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.UseRegisterDataChangeHandleImpl;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.Set;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class MaintenanceContractUpdateUpdateHandler implements IChangeUpdateHandler<ChangeDataEvent> {
+
+    private final JgMaintenanceContractServiceImpl jgMaintenanceContractService;
+
+    private final JgBizChangeLogServiceImpl jgBizChangeLogService;
+
+
+    @Override
+    @Async
+    public void handle(ChangeDataEvent event) {
+        log.info("开始更新维保备案json数据：{}", event);
+        // 查询关联的单据-未删除且已完成状态
+        Set<Long> maintenanceContractList = this.getRelationMaintenanceContractList(event);
+        // 更新历史json
+        maintenanceContractList.forEach(seq -> {
+            // 更新json
+            JgMaintenanceContract maintenanceContract = jgMaintenanceContractService.getById(seq);
+            // 查询之前数据json
+            JSONArray beforeData = jgMaintenanceContractService.getHisData(maintenanceContract);
+            jgMaintenanceContractService.updateHisDataAfterEquipEdit(maintenanceContract);
+            // 查询之后数据json
+            JSONArray afterData = jgMaintenanceContractService.getHisData(maintenanceContract);
+            // es记录日志
+            this.log2es(beforeData, afterData, maintenanceContract, event);
+        });
+    }
+
+    private Set<Long> getRelationMaintenanceContractList(ChangeDataEvent event) {
+        // 变化的设备
+        Set<String> records = event.getBizRelationData().getRecords();
+        // 查询关联的单据-已完成时更新其json
+        return jgMaintenanceContractService.getBaseMapper().queryListByEqsAndStatus(records, FlowStatusEnum.TO_BE_FINISHED.getName());
+    }
+
+    @Override
+    public Boolean supports(ChangeDataEvent event) {
+        return event.getBizRelationData().getBizType().equals(UseRegisterDataChangeHandleImpl.BIZ_TYPE);
+    }
+
+    private void log2es(JSON beforeData, JSON afterData, JgMaintenanceContract maintenanceContract, ChangeDataEvent event) {
+        Date date = DateUtil.date();
+        JgBizChangeLog changeLog = new JgBizChangeLog();
+        BeanUtil.copyProperties(event.getBizRelationData(), changeLog);
+        changeLog.setBizTable("tzs_jg_maintenance_contract");
+        changeLog.setRecDate(date);
+        changeLog.setBizId(maintenanceContract.getApplyNo());
+        // todo 与原始编辑进行关联
+        changeLog.setOId(event.getRequestContext().getTraceId());
+        changeLog.setBizType("maintenanceContract");
+        changeLog.setRecUserId(event.getRequestContext().getExcutedUserId());
+        ESDataChangeLogDto changeLogDto = new ESDataChangeLogDto();
+        changeLogDto.setColumnKey("changeData");
+        changeLogDto.setColumnKeyLabel("历史json数据");
+        changeLogDto.setBeforeData(beforeData.toJSONString());
+        changeLogDto.setAfterData(afterData.toJSONString());
+        changeLogDto.setUserId(event.getRequestContext().getExcutedUserId());
+        changeLogDto.setCreateDate(date.getTime());
+        changeLogDto.setRequestDate(DateUtil.formatDateTime(date));
+        changeLogDto.setChangeId(maintenanceContract.getApplyNo());
+        changeLogDto.setColumnFamily("tzs_jg_maintenance_contract");
+        changeLogDto.setBizType(changeLog.getBizType());
+        changeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
+        jgBizChangeLogService.save2DbAndEs(changeLog, Collections.singletonList(changeLogDto));
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/CancellationEventListener.java

@@ -53,12 +53,17 @@ public class CancellationEventListener {
 
     @PostConstruct
     public void init() {
-        ExecutorService executorService = Executors.newFixedThreadPool(threadNumber);
+        ExecutorService executorService = Executors.newFixedThreadPool(threadNumber, r -> {
+            Thread t = new Thread(r);
+            t.setName("CancellationWorker-" + t.getId());
+            return t;
+        });
         for (int i = 0; i < threadNumber; i++) {
             executorService.execute(() -> {
                 while (true) {
                     try {
                         String record = queue.take();
+                        log.info("线程 {} 开始处理 record: {}", Thread.currentThread().getName(), record);
                         this.dealData(record);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
@@ -70,6 +75,7 @@ public class CancellationEventListener {
     }
 
     private void dealData(String record) {
+        log.info("开始检查设备的引用:{}", record);
         // 所有业务单据（除去作废、删除状态单据），有在引用设备的则不修改设备纳管状态
         Boolean inUsed = commonService.checkEquipIsUsed(record);
         // 无引用则进行修改纳管状态为未纳管

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/ChangeDataEventListener.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/ChangeLogInsertListener.java

@@ -12,8 +12,9 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgBizChangeLogServiceImp
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionalEventListener;
 import org.typroject.tyboot.core.foundation.context.RequestContextModel;
 
 import javax.annotation.PostConstruct;
@@ -26,6 +27,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * @author Administrator
@@ -33,7 +35,7 @@ import java.util.stream.Collectors;
 @Component
 @Slf4j
 @RequiredArgsConstructor
-public class ChangeDataEventListener {
+public class ChangeLogInsertListener {
 
     private static final Map<String, String> bizTypeTableMap = new HashMap<>();
 
@@ -42,17 +44,19 @@ public class ChangeDataEventListener {
         bizTypeTableMap.put("singleManageEquipEdit", "idx_biz_jg_use_info");
     }
 
-    @Value("${changeData.deal.thread.number:1}")
+    @Value("${change.data.deal.thread.number:1}")
     private int threadNumber;
 
     private final ESDataChangeLogDao esDataChangeLogDao;
 
-    private final JgBizChangeLogServiceImpl  bizChangeLogService;
+    private final JgBizChangeLogServiceImpl bizChangeLogService;
+
 
     private final BlockingQueue<ChangeDataEvent> queue = new LinkedBlockingQueue<>();
 
 
-    @EventListener(value = ChangeDataEvent.class)
+    @TransactionalEventListener(value = ChangeDataEvent.class)
+    @Async
     public void handleTransactionalEvent(ChangeDataEvent event) {
         log.info("收到用户变更业务数据消息:{}", JSONObject.toJSONString(event));
         queue.add(event);
@@ -61,27 +65,26 @@ public class ChangeDataEventListener {
     @PostConstruct
     public void init() {
         ExecutorService executorService = Executors.newFixedThreadPool(threadNumber);
-        for (int i = 0; i < threadNumber; i++) {
+        IntStream.range(0, threadNumber).forEach(i -> {
             executorService.execute(() -> {
                 while (true) {
                     try {
                         ChangeDataEvent event = queue.take();
-                        this.dealData(event);
+                        processEvent(event);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
                     }
                 }
             });
-
-        }
+        });
     }
 
-    private void dealData(ChangeDataEvent event) {
+    private void processEvent(ChangeDataEvent event) {
         List<ChangeDataDto> changeDataDtos = event.getData();
         RequestContextModel requestContextModel = event.getRequestContext();
         Date date = new Date();
         // 1.主表保存
-        JgBizChangeLog changeLog  = saveLog(event);
+        JgBizChangeLog changeLog = saveLog(event);
         // 2.子表字段保存
         List<ESDataChangeLogDto> logs = saveColumnsChange2Es(changeDataDtos, requestContextModel, date, changeLog);
         log.info("es 操作日志数据入库成功：{}条", logs.size());
@@ -103,7 +106,7 @@ public class ChangeDataEventListener {
             changeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
             return changeLogDto;
         }).collect(Collectors.toList());
-        if(!logs.isEmpty()){
+        if (!logs.isEmpty()) {
             esDataChangeLogDao.saveAll(logs);
         }
         return logs;
@@ -115,7 +118,9 @@ public class ChangeDataEventListener {
         changeLog.setBizTable(bizTypeTableMap.get(changeLog.getBizType()));
         changeLog.setRecDate(new Date());
         changeLog.setRecUserId(event.getRequestContext().getExcutedUserId());
-        bizChangeLogService.save(changeLog);
+        // todo 使用上下文这个作为id 便于其他业务和其进行关联
+        changeLog.setSequenceNbr(Long.parseLong(event.getRequestContext().getTraceId()));
+        bizChangeLogService.getBaseMapper().insert(changeLog);
         return changeLog;
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/listener/RelationBizApplyUpdateListener.java

+package com.yeejoin.amos.boot.module.jg.biz.event.listener;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.biz.event.ChangeDataEvent;
+import com.yeejoin.amos.boot.module.jg.biz.event.handler.IChangeUpdateHandler;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.stream.IntStream;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class RelationBizApplyUpdateListener {
+
+    @Value("${relation.data.deal.thread.number:1}")
+    private int threadNumber;
+
+    private final List<IChangeUpdateHandler<ApplicationEvent>> changeUpdateHandlers;
+
+    private final BlockingQueue<ChangeDataEvent> queue = new LinkedBlockingQueue<>();
+
+
+    @TransactionalEventListener(value = ChangeDataEvent.class)
+    @Async
+    public void handleTransactionalEvent(ChangeDataEvent event) {
+        log.info("收到用户变更业务数据消息:{}", JSONObject.toJSONString(event));
+        queue.add(event);
+    }
+
+    @PostConstruct
+    public void init() {
+        ExecutorService executorService = Executors.newFixedThreadPool(threadNumber);
+        IntStream.range(0, threadNumber).forEach(i -> {
+            executorService.execute(() -> {
+                while (true) {
+                    try {
+                        ChangeDataEvent event = queue.take();
+                        processEvent(event);
+                    } catch (Exception e) {
+                        log.error(e.getMessage(), e);
+                    }
+                }
+            });
+        });
+    }
+
+    private void processEvent(ChangeDataEvent event) {
+        changeUpdateHandlers.stream().filter(h -> h.supports(event)).forEach(h -> h.handle(event));
+    }
+}
+

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/event/publisher/EventPublisher.java

@@ -18,7 +18,6 @@ public class EventPublisher implements ApplicationEventPublisherAware {
         this.publisher = applicationEventPublisher;
     }
 
-    @Async
     public void publish(ApplicationEvent event) {
         publisher.publishEvent(event);
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -64,7 +64,7 @@ public interface ICommonService {
 
     List<LinkedHashMap> creatApproveTree();
 
-    List<Map<String, Object>> superviseBusinessCategory(String businessType);
+    List<Map<String, Object>> superviseBusinessCategory(String businessType, String dataSource);
 
     List<Map<String, Object>> businessScenarios(String type);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -85,6 +85,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -732,7 +733,7 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public List<Map<String, Object>> superviseBusinessCategory(String businessType) {
+    public List<Map<String, Object>> superviseBusinessCategory(String businessType, String dataSource) {
         ReginParams reginParams = getSelectedOrgInfo();
         Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(superviseBusinessCategory);
         if (XZSB.equals(businessType) && CompanyTypeEnum.CONSTRUCTION.getName().equals(reginParams.getCompany().getCompanyType())) {
@@ -745,6 +746,11 @@ public class CommonServiceImpl implements ICommonService {
             }
             return resourceJson.get(businessType);
         }
+        // 历史有证设备(气瓶、管道)只能通过导入进系统，不能按单位录入进系统
+        if (EquipSourceEnum.jg_his.getType().equals(dataSource)) {
+            resourceJson.get(businessType).removeIf(item -> item.get(CODE).equals(DW_LR));
+            return resourceJson.get(businessType);
+        }
         return resourceJson.get(businessType);
     }
 
@@ -2152,6 +2158,7 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public Boolean checkEquipIsUsed(String record) {
         Integer useTime = commonMapper.countEquipInUseTimesWithOutZF(record);
         log.info("检查设备是否被使用,设备:{},业务数:{}", record, useTime);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgBizChangeLogServiceImpl.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.ESDataChangeLogDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgBizChangeLogDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgBizChangeLog;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgBizChangeLogMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgBizChangeLogService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgBizChangeLogDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import com.yeejoin.amos.boot.module.jg.biz.dao.ESDataChangeLogDao;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +19,19 @@ import java.util.List;
  * @date 2025-04-14
  */
 @Service
-public class JgBizChangeLogServiceImpl extends BaseService<JgBizChangeLogDto,JgBizChangeLog,JgBizChangeLogMapper> implements IJgBizChangeLogService {
-    /**
-     * 分页查询
-     */
-    public Page<JgBizChangeLogDto> queryForJgBizChangeLogPage(Page<JgBizChangeLogDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+@RequiredArgsConstructor
+public class JgBizChangeLogServiceImpl extends BaseService<JgBizChangeLogDto, JgBizChangeLog, JgBizChangeLogMapper> implements IJgBizChangeLogService {
+
+
+    private final ESDataChangeLogDao esDataChangeLogDao;
 
-    /**
-     * 列表查询 示例
-     */
-    public List<JgBizChangeLogDto> queryForJgBizChangeLogList()   {
-        return this.queryForList("" , false);
+    public void save2DbAndEs(JgBizChangeLog changeLog, List<ESDataChangeLogDto> esDataChangeLogDtos) {
+        this.save(changeLog);
+        esDataChangeLogDtos.forEach(esDataChangeLogDto -> {
+            esDataChangeLogDto.setBatchId(changeLog.getSequenceNbr() + "");
+        });
+        if (!esDataChangeLogDtos.isEmpty()) {
+            esDataChangeLogDao.saveAll(esDataChangeLogDtos);
+        }
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -1568,6 +1568,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName(), new JSONObject(his), registerInfo.getRecord(), jgInstallationNotice.getSequenceNbr().toString());
     }
 
+    public JSONObject getHisData(JgInstallationNotice jgInstallationNotice){
+        return commonService.queryHistoryData(jgInstallationNotice.getSequenceNbr());
+    }
+
     private String getEquCode(IdxBizJgRegisterInfo registerInfo, String receiveCompanyCode) {
         ProduceInfo produceInfo = produceInfoMapper.selectOne(new LambdaQueryWrapper<ProduceInfo>().eq(AbstractEquipBaseEntity::getRecord, registerInfo.getRecord()));
         CodeGenerateDto codeGenerateDto = new CodeGenerateDto();
@@ -1604,11 +1608,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         idxBizJgUseInfoMapper.update(idxBizJgUseInfo, lambda);
     }
 
-    private void saveHisDataBeforeUpdate(JgInstallationNotice jgInstallationNotice) {
+    public void saveHisDataBeforeUpdate(JgInstallationNotice jgInstallationNotice) {
         LambdaQueryWrapper<JgInstallationNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgInstallationNoticeEq::getEquipTransferId, jgInstallationNotice.getSequenceNbr());
         List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(queryWrapper);
-        List<String> ids = jgInstallationNoticeEqs.stream().map(item -> item.getEquId()).collect(Collectors.toList());
+        List<String> ids = jgInstallationNoticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
         List<Map<String, Object>> equipListMaps;
         String equCategoryCode = jgInstallationNotice.getEquCategoryCode();
         Map<String, Object> installationInfo = BeanUtil.beanToMap(jgInstallationNotice, false, true);
@@ -1631,6 +1635,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName(), new JSONObject(installationInfo), null, jgInstallationNotice.getSequenceNbr().toString());
     }
 
+
     private void saveHisDataBeforeUpdate(JgInstallationNotice jgInstallationNotice, String equId) {
         Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equId);
         commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName(), new JSONObject(map), equId, jgInstallationNotice.getSequenceNbr().toString());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintenanceContractServiceImpl.java

@@ -917,6 +917,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName(), JSON.parseArray(JSON.toJSONString(equipmentLists)), null, maintenanceContract.getSequenceNbr().toString());
     }
 
+
+    public void updateHisDataAfterEquipEdit(JgMaintenanceContract maintenanceContract) {
+        List<Map<String, Object>> list = maintenanceContractMapper.selectEquipList(maintenanceContract.getSequenceNbr());
+        commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName(), JSON.parseArray(JSON.toJSONString(list)), null, maintenanceContract.getSequenceNbr().toString());
+    }
+
     @Override
     public boolean beforeCheck(JgMaintenanceContractDto jgMaintenanceContract) {
         return jgMaintenanceContract.getInstanceId() != null && !jgMaintenanceContract.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) &&!jgMaintenanceContract.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName());
@@ -928,4 +934,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         commonService.saveExecuteFlowData2Redis(jgMaintenanceContract.getInstanceId(), this.buildInstanceRuntimeData(jgMaintenanceContract));
     }
 
+
+    public JSONArray getHisData(JgMaintenanceContract maintenanceContract){
+        return commonService.queryHistoryDataObj(maintenanceContract.getSequenceNbr());
+    }
+
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationEqServiceImpl.java

@@ -32,6 +32,10 @@ public class JgUseRegistrationEqServiceImpl extends BaseService<JgUseRegistratio
         return this.queryForList("" , false);
     }
 
+    public List<JgUseRegistrationEqDto> queryForJgUseRegistrationEqList(String equipTransferId)   {
+        return this.queryForList("" , false, equipTransferId);
+    }
+
 
     public List<JgUseRegistrationEq> getListByEquIds(List<String> equIds) {
         QueryWrapper<JgUseRegistrationEq> queryWrapper = new QueryWrapper<>();

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/UseRegisterDataChangeHandleImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.jg.api.dto.BizRelationDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.ChangeDataDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationEqDto;
 import com.yeejoin.amos.boot.module.jg.api.service.IBizDataChangeHandleStrategy;
 import com.yeejoin.amos.boot.module.jg.biz.context.DataProcessStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.event.ChangeDataEvent;
@@ -13,6 +14,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class UseRegisterDataChangeHandleImpl implements IBizDataChangeHandleStrategy {
@@ -22,6 +24,8 @@ public class UseRegisterDataChangeHandleImpl implements IBizDataChangeHandleStra
 
     private final UseRegisterUpdateService useRegisterUpdateService;
 
+    public final static String  BIZ_TYPE = "useRegister";
+
 
     public UseRegisterDataChangeHandleImpl(EventPublisher publisher, UseRegisterUpdateService useRegisterUpdateService) {
         this.publisher = publisher;
@@ -31,7 +35,7 @@ public class UseRegisterDataChangeHandleImpl implements IBizDataChangeHandleStra
 
     @Override
     public String canHandleBizType() {
-        return "useRegister";
+        return BIZ_TYPE;
     }
 
 
@@ -57,9 +61,11 @@ public class UseRegisterDataChangeHandleImpl implements IBizDataChangeHandleStra
     }
 
     private void publishEvent2Logger(String applyNo, List<ChangeDataDto> allChangeColumns) {
+        List<JgUseRegistrationEqDto> eqDtos = useRegisterUpdateService.useRegistrationEqService.getBaseMapper().queryEqListByApplyNo(applyNo);
         BizRelationDataDto  bizRelationDataDto = new BizRelationDataDto();
         bizRelationDataDto.setBizId(applyNo);
         bizRelationDataDto.setBizType(canHandleBizType());
+        bizRelationDataDto.setRecords(eqDtos.stream().map(JgUseRegistrationEqDto::getEquId).collect(Collectors.toSet()));
         // 异步记录日志
         publisher.publish(new ChangeDataEvent(this, bizRelationDataDto, allChangeColumns, RequestContext.cloneRequestContext()));
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/UseRegisterUpdateService.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.InformationManageTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -24,23 +25,18 @@ import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toList;
 
 @Service
+@RequiredArgsConstructor
 public class UseRegisterUpdateService {
 
     private final IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
 
     private final JgUseRegistrationServiceImpl useRegistrationService;
 
-
     private final JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
 
     private final IdxBizJgProjectContraptionServiceImpl idxBizJgProjectContraptionService;
 
-    public UseRegisterUpdateService(IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, JgUseRegistrationServiceImpl useRegistrationService, JgRegistrationHistoryServiceImpl jgRegistrationHistoryService, IdxBizJgProjectContraptionServiceImpl idxBizJgProjectContraptionService) {
-        this.idxBizJgRegisterInfoMapper = idxBizJgRegisterInfoMapper;
-        this.useRegistrationService = useRegistrationService;
-        this.jgRegistrationHistoryService = jgRegistrationHistoryService;
-        this.idxBizJgProjectContraptionService = idxBizJgProjectContraptionService;
-    }
+    protected final JgUseRegistrationEqServiceImpl useRegistrationEqService;
 
     public void updateHisData(String applyNo) {
         JgUseRegistration jgUseRegistration = useRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>().eq(JgUseRegistration::getApplyNo, applyNo));

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/ESPlanTaskListDto.java

 package com.yeejoin.amos.patrol.dao.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -94,7 +91,7 @@ public class ESPlanTaskListDto {
     private String omission;
 
     @Field(type = FieldType.Object)
-    private List points;
+    private List<PlanTaskDetail> points;
 
 
 }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

@@ -113,7 +113,9 @@ public interface PlanTaskMapper extends BaseMapper {
 	 * @param planTaskId
 	 * @return
 	 */
-	List<PlanTaskPointInputItemBo> getPlanTaskPointInputItemByPlanTaskId(@Param(value = "planTaskId") Long planTaskId, @Param(value = "planTaskDetailStatus") String planTaskDetailStatus);
+	List<PlanTaskPointInputItemBo> getPlanTaskPointInputItemByPlanTaskId(@Param(value = "planTaskId") Long planTaskId,
+																		 @Param(value = "planTaskDetailStatus") String planTaskDetailStatus,
+																		 @Param(value = "planTaskDetailIsFinish") String planTaskDetailIsFinish);
 
 	/**
 	 * 条件查询数据

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/data/CheckRecordDataConsumer.java

@@ -3,19 +3,20 @@ package com.yeejoin.amos.patrol.business.data;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
-import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckInputMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskDetailMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.*;
+import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDetailDao;
 import com.yeejoin.amos.patrol.business.dto.CheckRecordDataDto;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PlanTaskPointInputItemBo;
 import com.yeejoin.amos.patrol.common.enums.CheckStatusEnum;
+import com.yeejoin.amos.patrol.common.enums.PlanTaskDetailIsFinishEnum;
 import com.yeejoin.amos.patrol.common.enums.PlanTaskDetailStatusEnum;
 import com.yeejoin.amos.patrol.dao.entity.*;
 import lombok.extern.slf4j.Slf4j;
@@ -125,7 +126,7 @@ public class CheckRecordDataConsumer implements Runnable {
         List<Check> checks = new ArrayList<>();
         List<CheckInput> checkInputs = new ArrayList<>();
         planTasks.forEach(planTask -> {
-            List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.QUALIFIED.getValue());
+            List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.QUALIFIED.getValue(), Objects.toString(PlanTaskDetailIsFinishEnum.UNFINISHED.getValue()));
             Map<Long, Check> checkMap = new HashMap<>();
             Map<String, String> deptMap = new HashMap<>();
             StringBuffer deptName = new StringBuffer();

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -599,7 +599,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
      */
     private void handleEsPlanTaskListPointsByIds(List<String> taskDetailIds, List<String> taskIds) {
         taskIds.forEach(taskId -> esPlanTaskList.findById(taskId).ifPresent(esPlanTaskListDto -> {
-            List<PlanTaskDetail> points = (List<PlanTaskDetail>) esPlanTaskListDto.getPoints();
+            List<PlanTaskDetail> points = esPlanTaskListDto.getPoints();
             List<PlanTaskDetail> filterPoints = points.stream().filter(point -> !taskDetailIds.contains(Objects.toString(point.getId()))).collect(Collectors.toList());
             esPlanTaskList.deleteById(taskId);
             if (!filterPoints.isEmpty()) {

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

@@ -404,7 +404,7 @@ public class JobService implements IJobService {
      * @param planTask
      */
     private void createOmissionCheckRecord(PlanTask planTask) {
-        List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.OMISSION.getValue());
+        List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.OMISSION.getValue(),Objects.toString(PlanTaskDetailIsFinishEnum.OVERTIME.getValue()));
         Map<Long, Check> checkMap = new HashMap<>();
         Set<Long> checkIds = new HashSet<Long>();
         Map<String, String> deptMap = new HashMap<>();
@@ -565,7 +565,7 @@ public class JobService implements IJobService {
      * @param planTask
      */
     public void createCheckRecord(PlanTask planTask, String userId) {
-        List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.QUALIFIED.getValue());
+        List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.QUALIFIED.getValue(),null);
         Map<Long, Check> checkMap = new HashMap<>();
         Map<String, String> deptMap = new HashMap<>();
         StringBuffer deptName = new StringBuffer();

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -534,6 +534,9 @@
 				WHERE
 					pptd.task_no = ptd.id
 				AND ptd.id = #{planTaskId} and pptd.status = #{planTaskDetailStatus}
+				<if test="planTaskDetailIsFinish != null and planTaskDetailIsFinish !=''" >
+					and pptd.is_finish = #{planTaskDetailIsFinish}
+				</if>
 			) temp2 on(temp1.point_id = temp2.pointId
 		AND temp1.route_id = temp2.routeId)