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

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

@@ -4,6 +4,7 @@ import lombok.Getter;
 
 /**
  * 业务类型枚举
+ * 枚举code需同字典表中问题类型（type=ISSUE_TYPE）code保持一致
  *
  * @author Administrator
  */
@@ -18,7 +19,7 @@ public enum SafetyProblemTypeEnum {
     WBCQ("1", "维保超期", "设备维保超期", "safetyProblemTracing/wb/cq", "outOfMaintenanceRecords"),
     WBBA("11", "维保合同备案", "设备维保合同备案", "safetyProblemTracing/wb/ba", null),
     XKCQ("3", "许可超期", "企业许可超期", "safetyProblemTracing/xk/cq", null),
-    ZZCQ("4", "人员资质超期", "人员资质超期", "safetyProblemTracing/zz/cq", null);
+    ZZCQ("9", "资质超期", "人员资质超期", "safetyProblemTracing/zz/cq", null);
 
     private final String code;
 

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

@@ -2561,7 +2561,7 @@
         ei.unit_type unitType,
         ei.supervise_org_code superviseOrgCode,
         ei.supervise_org_name superviseOrgName,
-        ul.sequence_nbr licenceSeq,
+        ul.sequence_nbr problemSourceId,
         ul.cert_no certNo,
         ul.expiry_date expiryDate,
         ul.item_code itemCode,
@@ -2625,7 +2625,7 @@
             ei.unit_type unitType,
             ei.supervise_org_code superviseOrgCode,
             ei.supervise_org_name superviseOrgName,
-            tup.sequence_nbr permissionSeq,
+            tup.sequence_nbr problemSourceId,
             tup.cert_no certNo,
             tup.expiry_date expiryDate,
             tui.name  userName,

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

@@ -258,7 +258,7 @@ public class SafetyProblemTracingController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "GET", value = "生成维保超期数据", notes = "生成维保超期数据")
+	@ApiOperation(httpMethod = "GET", value = "生成人员资质超期数据", notes = "生成人员资质超期数据")
 	@GetMapping(value = "/gen/test4")
 	public ResponseModel<String> test4() {
 		safetyProblemTracingGenService.executePersonnalCertificationCheck();

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

@@ -2,6 +2,7 @@ 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.SafetyProblemSourceTypeEnum;
 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;
@@ -38,6 +39,12 @@ public class XKCQEventHandler implements SafetyProblemEventHandler {
     }
 
     private void generateProblem(JSONArray jsonArray) {
+        jsonArray.forEach(item -> {
+            JSONObject problemObj = (JSONObject) item;
+            problemObj.put("sourceType", SafetyProblemSourceTypeEnum.UNIT.getName());
+            problemObj.put("sourceTypeCode", SafetyProblemSourceTypeEnum.UNIT.getCode());
+            problemObj.put("problemDesc", "证书编号：" + problemObj.get("certNo") + SafetyProblemTypeEnum.XKCQ.getName());
+        });
         SafetyProblemTopicMessage.generateUnitProblem(jsonArray, SafetyProblemTypeEnum.XKCQ, safetyProblemTracingService);
     }
 }

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

@@ -2,6 +2,7 @@ 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.SafetyProblemSourceTypeEnum;
 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;
@@ -38,6 +39,12 @@ public class ZZCQEventHandler implements SafetyProblemEventHandler {
     }
 
     private void generateProblem(JSONArray jsonArray) {
+        jsonArray.forEach(item -> {
+            JSONObject problemObj = (JSONObject) item;
+            problemObj.put("sourceType", SafetyProblemSourceTypeEnum.PERSONNEL.getName());
+            problemObj.put("sourceTypeCode", SafetyProblemSourceTypeEnum.PERSONNEL.getCode());
+            problemObj.put("problemDesc", "证书编号：" + problemObj.getOrDefault("certNo", "") + SafetyProblemTypeEnum.ZZCQ.getName());
+        });
         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

@@ -151,6 +151,10 @@ public class SafetyProblemTopicMessage extends EmqxListener {
     }
 
     public static void generateUnitProblem(JSONArray jsonArray, SafetyProblemTypeEnum problemTypeEnum, SafetyProblemTracingServiceImpl safetyProblemTracingService) {
+        generateProblem2(jsonArray, problemTypeEnum, safetyProblemTracingService);
+    }
+
+    private static void generateProblem2(JSONArray jsonArray, SafetyProblemTypeEnum problemTypeEnum, SafetyProblemTracingServiceImpl safetyProblemTracingService) {
         if (jsonArray == null || problemTypeEnum == null) {
             throw new IllegalArgumentException("jsonObject and problemTypeEnum must not be null.");
         }
@@ -163,10 +167,10 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                 SafetyProblemTracing safetyProblemTracing = new SafetyProblemTracing();
                 safetyProblemTracing.setProblemType(problemTypeEnum.getName());
                 safetyProblemTracing.setProblemTypeCode(problemTypeEnum.getCode());
-                safetyProblemTracing.setProblemDesc(problemTypeEnum.getDesc() + "-" + json.getOrDefault("itemName", "") + "-" + json.getOrDefault("subItemName", ""));
-                safetyProblemTracing.setSourceType(SafetyProblemSourceTypeEnum.UNIT.getName());
-                safetyProblemTracing.setSourceTypeCode(SafetyProblemSourceTypeEnum.UNIT.getCode());
-                safetyProblemTracing.setSourceId(json.getOrDefault("licenceSeq", "").toString());
+                safetyProblemTracing.setProblemDesc(json.getString("problemDesc"));
+                safetyProblemTracing.setSourceType(json.getString("sourceType"));
+                safetyProblemTracing.setSourceTypeCode(json.getString("sourceTypeCode"));
+                safetyProblemTracing.setSourceId(json.getString("problemSourceId"));
                 safetyProblemTracing.setProblemTime(new Date());
                 safetyProblemTracing.setPrincipalUnit(json.getOrDefault("useUnit", "").toString());
                 safetyProblemTracing.setPrincipalUnitCode(json.getOrDefault("useUnitCode", "").toString());
@@ -187,39 +191,7 @@ public class SafetyProblemTopicMessage extends EmqxListener {
     }
 
     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()));}
+        generateProblem2(jsonArray, problemTypeEnum, safetyProblemTracingService);
     }
 
     public String buildTopic(String topic) {

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

@@ -1344,7 +1344,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             String test = QueryParser.escape(map.getString("USE_INNER_CODE"));
             boolMust.must(QueryBuilders.matchPhraseQuery("USE_INNER_CODE", test));
         }
-        this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"));
+        this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"), map.getString("EQU_CATEGORY_CODE"));
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((pageNumber - 1) * size);
@@ -1382,14 +1382,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     /**
      * 过滤条件去掉流程中的设备,
      *
-     * @param boolMust 条件
+     * @param boolMust        条件
+     * @param equCategoryCode
      */
-    private void setFilterOfInFlowing(BoolQueryBuilder boolMust, String equListCode, String inspectionType) {
+    private void setFilterOfInFlowing(BoolQueryBuilder boolMust, String equListCode, String inspectionType, String equCategoryCode) {
         Set<String> records = this.getEquipInFlowing();
         if (records != null && !records.isEmpty()) {
             boolMust.mustNot(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", records));
         }
-        if ("5000".equals(equListCode) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) {
+        // 流动时起重机械及厂车可直接做首检
+        if (("5000".equals(equListCode) || "4400".equals(equCategoryCode)) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) {
             boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", false));
         } else {
             BoolQueryBuilder shouldBuilder = QueryBuilders.boolQuery();