增加人员资质超期生成问题清单

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

@@ -17,7 +17,8 @@ public enum SafetyProblemTypeEnum {
     JYBJ("21", "检验报检", "设备报检", "safetyProblemTracing/jy/bj", null),
     WBCQ("1", "维保超期", "设备维保超期", "safetyProblemTracing/wb/cq", "outOfMaintenanceRecords"),
     WBBA("11", "维保合同备案", "设备维保合同备案", "safetyProblemTracing/wb/ba", null),
-    XKCQ("3", "许可超期", "企业许可超期", "safetyProblemTracing/xk/cq", null);
+    XKCQ("3", "许可超期", "企业许可超期", "safetyProblemTracing/xk/cq", null),
+    ZZCQ("4", "人员资质超期", "人员资质超期", "safetyProblemTracing/zz/cq", null);
 
     private final String code;
 

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

@@ -146,7 +146,10 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      * 查询许可超期的企业
      * */
     List<Map<String, Object>> queryOutOfQualificationRecord();
-
+    /**
+     * 查询资质超期的证书
+     **/
+    List<Map<String, Object>> queryOutOfCertificationRecord();
     /**
      * 大屏业务全过程统计已经完成的单据
      *
@@ -233,5 +236,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     void updateEnterpriseSafetyStatus(@Param("useUnitCodeList") Set<String> useUnitCodeList);
 
     List<EquipmentClassifyDto> getEquClassifyByCode(@Param("parentCode") String parentCode);
+
+
 }
 

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

@@ -2618,4 +2618,23 @@
         )
         SELECT * FROM category_tree ORDER BY level;
     </select>
+    <select id="queryOutOfCertificationRecord" resultType="java.util.Map">
+        SELECT
+            ei.use_unit_code useUnitCode,
+            ei.use_unit useUnit,
+            ei.unit_type unitType,
+            ei.supervise_org_code superviseOrgCode,
+            ei.supervise_org_name superviseOrgName,
+            tup.sequence_nbr permissionSeq,
+            tup.cert_no certNo,
+            tup.expiry_date expiryDate,
+            tui.name  userName
+        FROM
+        tzs_user_permission tup
+        LEFT JOIN tzs_user_info tui ON tup.user_seq = tui.sequence_nbr
+        LEFT JOIN tz_base_enterprise_info ei ON ei.use_unit_code = tui.unit_code
+        WHERE
+        tup.expiry_date <![CDATA[<]]>  CURRENT_DATE AND tup.permission_post IN ('permissionData66151', 'permissionData66152', 'permissionData6552');
+
+    </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/handler/SafetyProblemEventHandlerFactory.java

@@ -30,6 +30,8 @@ public class SafetyProblemEventHandlerFactory {
             return new JYBJEventHandler(safetyProblemTracingService, idxBizJgOtherInfoService, esEquipmentCategory);
         } else if (topic.startsWith(SafetyProblemTypeEnum.XKCQ.getTopic())) {
             return new XKCQEventHandler(safetyProblemTracingService);
+        }else if (topic.startsWith(SafetyProblemTypeEnum.ZZCQ.getTopic())) {
+            return new ZZCQEventHandler(safetyProblemTracingService);
         } else {
             // 其他策略类的创建
             throw new IllegalArgumentException("Unsupported topic: " + topic);

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

+package com.yeejoin.amos.boot.module.jg.biz.handler;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.event.SafetyProblemEvent;
+import com.yeejoin.amos.boot.module.jg.api.event.handler.SafetyProblemEventHandler;
+import com.yeejoin.amos.boot.module.jg.biz.listener.SafetyProblemTopicMessage;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.SafetyProblemTracingServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * ZZCQEventHandler 类实现了 SafetyProblemEventHandler 接口，
+ * 用于处理人员资质超期安全问题事件。
+ */
+@Component
+public class ZZCQEventHandler implements SafetyProblemEventHandler {
+
+    SafetyProblemTracingServiceImpl safetyProblemTracingService;
+
+    @Autowired
+    public ZZCQEventHandler(SafetyProblemTracingServiceImpl safetyProblemTracingService) {
+        this.safetyProblemTracingService = safetyProblemTracingService;
+    }
+
+    /**
+     * 处理安全问题事件。
+     *
+     * @param event 安全问题事件对象，包含事件的详细信息。
+     *              该参数用于描述发生的安全问题事件。
+     */
+    @Override
+    public void handle(SafetyProblemEvent event) {
+        // 此处为处理安全问题事件的逻辑代码
+        JSONArray jsonArray = JSONObject.parseArray(event.getMessage().toString());
+        generateProblem(jsonArray);
+    }
+
+    private void generateProblem(JSONArray jsonArray) {
+        SafetyProblemTopicMessage.generatePersonnelProblem(jsonArray, SafetyProblemTypeEnum.ZZCQ, safetyProblemTracingService);
+    }
+}
+

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

@@ -186,6 +186,42 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                             .eq("problem_status_code", SafetyProblemStatusEnum.UNHANDLED.getCode()));}
     }
 
+    public static void generatePersonnelProblem(JSONArray jsonArray, SafetyProblemTypeEnum problemTypeEnum, SafetyProblemTracingServiceImpl safetyProblemTracingService) {
+        if (jsonArray == null || problemTypeEnum == null) {
+            throw new IllegalArgumentException("jsonObject and problemTypeEnum must not be null.");
+        }
+        if (!ValidationUtil.isEmpty(jsonArray)) {
+            List<SafetyProblemTracing> safetyProblemTracingList = jsonArray.stream().map(item -> {
+                if (!(item instanceof JSONObject)) {
+                    throw new IllegalArgumentException("item is not a JSONObject.");
+                }
+                JSONObject json = (JSONObject) item;
+                SafetyProblemTracing safetyProblemTracing = new SafetyProblemTracing();
+                safetyProblemTracing.setProblemType(problemTypeEnum.getName());
+                safetyProblemTracing.setProblemTypeCode(problemTypeEnum.getCode());
+                safetyProblemTracing.setProblemDesc(problemTypeEnum.getDesc() + "-" + json.getOrDefault("userName", "") + "-" + json.getOrDefault("certNo", ""));
+                safetyProblemTracing.setSourceType(SafetyProblemSourceTypeEnum.PERSONNEL.getName());
+                safetyProblemTracing.setSourceTypeCode(SafetyProblemSourceTypeEnum.PERSONNEL.getCode());
+                safetyProblemTracing.setSourceId(json.getOrDefault("permissionSeq", "").toString());
+                safetyProblemTracing.setProblemTime(new Date());
+                safetyProblemTracing.setPrincipalUnit(json.getOrDefault("useUnit", "").toString());
+                safetyProblemTracing.setPrincipalUnitCode(json.getOrDefault("useUnitCode", "").toString());
+                safetyProblemTracing.setPrincipalUnitType(json.getOrDefault("unitType", "").toString());
+                safetyProblemTracing.setGoverningBody(json.getOrDefault("superviseOrgName", "").toString());
+                safetyProblemTracing.setGoverningBodyCode(json.getOrDefault("useUnitCode", "").toString());
+                safetyProblemTracing.setGoverningBodyOrgCode(json.getOrDefault("superviseOrgCode", "").toString());
+                safetyProblemTracing.setCreateDate(new Date());
+                safetyProblemTracing.setProblemStatus(SafetyProblemStatusEnum.UNHANDLED.getName());
+                safetyProblemTracing.setProblemStatusCode(SafetyProblemStatusEnum.UNHANDLED.getCode());
+                return safetyProblemTracing;
+            }).collect(Collectors.toList());
+            safetyProblemTracingService.saveOrUpdateBatchByColumns(safetyProblemTracingList,
+                    safetyProblemTracing -> new QueryWrapper<>()
+                            .eq("problem_type_code", safetyProblemTracing.getProblemTypeCode())
+                            .eq("source_id", safetyProblemTracing.getSourceId())
+                            .eq("problem_status_code", SafetyProblemStatusEnum.UNHANDLED.getCode()));}
+    }
+
     public String buildTopic(String topic) {
         String topicPrefix = "$share/" + applicationName;
         return String.format("%s/%s", topicPrefix, topic);

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

@@ -60,9 +60,17 @@ public class SafetyProblemTracingGenServiceImpl{
     public void executeSafetyProblemCheck() {
         executeMaintenanceCheck();
         executeInspectionCheck();
+        executePersonnalCertificationCheck();
         executeEnterpriseQualificationCheck();
     }
 
+    private void executePersonnalCertificationCheck() {
+        logger.info("开始人员资质超期检查");
+        List<Map<String, Object>> certificationRecords = commonMapper.queryOutOfCertificationRecord();
+        sendSafetyProblemMessage(certificationRecords, SafetyProblemTypeEnum.ZZCQ);
+        logger.info("人员资质超期检查结束");
+    }
+
     public void executeInspectionCheck() {
         logger.info("开始检验检测超期检查");
         // 查询当天检验超期的设备