refactor(amos-boot):调整隐患问题相关字段和逻辑

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

@@ -54,7 +54,7 @@ public class SafetyProblemTracing extends BaseEntity {
     private String problemDesc;
 
     /**
-     * 问题产生时间
+     * 问题超期时间
      */
 	@TableField("problem_time")
     private Date problemTime;

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

@@ -129,7 +129,7 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                 safetyProblemTracing.setSourceType(SafetyProblemSourceTypeEnum.EQUIP.getName());
                 safetyProblemTracing.setSourceTypeCode(SafetyProblemSourceTypeEnum.EQUIP.getCode());
                 safetyProblemTracing.setSourceId(json.getOrDefault("RECORD", "").toString());
-                safetyProblemTracing.setProblemTime(new Date());
+                safetyProblemTracing.setProblemTime(ValidationUtil.isEmpty(json.getString("expiryDate")) ? new Date() : json.getDate("expiryDate"));
                 safetyProblemTracing.setEquipSuperviseCode(json.getOrDefault("SUPERVISORY_CODE", "").toString());
                 safetyProblemTracing.setEquipList(json.getOrDefault("equList", "").toString());
                 safetyProblemTracing.setEquipListCode(json.getOrDefault("EQU_LIST", "").toString());
@@ -178,13 +178,14 @@ public class SafetyProblemTopicMessage extends EmqxListener {
                 safetyProblemTracing.setSourceType(json.getString("sourceType"));
                 safetyProblemTracing.setSourceTypeCode(json.getString("sourceTypeCode"));
                 safetyProblemTracing.setSourceId(json.getString("problemSourceId"));
-                safetyProblemTracing.setProblemTime(new Date());
+                safetyProblemTracing.setProblemTime(ValidationUtil.isEmpty(json.getString("expiryDate")) ? new Date() : json.getDate("expiryDate"));
                 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("superviseCode", "").toString());
                 safetyProblemTracing.setGoverningBodyOrgCode(json.getOrDefault("superviseOrgCode", "").toString());
+                safetyProblemTracing.setUserName(ValidationUtil.isEmpty(json.getString("userName")) ? null : json.getString("userName"));
                 safetyProblemTracing.setCreateDate(new Date());
                 safetyProblemTracing.setProblemStatus(SafetyProblemStatusEnum.UNHANDLED.getName());
                 safetyProblemTracing.setProblemStatusCode(SafetyProblemStatusEnum.UNHANDLED.getCode());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem.json

@@ -96,7 +96,6 @@
         { "key": "principalUnit", "label": "主体单位" },
         { "key": "principalUnitType", "label": "单位类型" },
         { "key": "governingBody", "label": "管辖机构" },
-        { "key": "governingBodyCode", "label": "所属区域" },
         { "key": "problemStatus", "label": "隐患状态" },
         { "key": "equipSuperviseCode", "label": "监管码" },
         { "key": "equipList", "label": "设备种类" }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem_9.json

@@ -97,7 +97,6 @@
         { "key": "principalUnit", "label": "主体单位" },
         { "key": "principalUnitType", "label": "单位类型" },
         { "key": "governingBody", "label": "管辖机构" },
-        { "key": "governingBodyCode", "label": "所属区域" },
         { "key": "problemStatus", "label": "隐患状态" },
         { "key": "equipSuperviseCode", "label": "监管码" },
         { "key": "equipList", "label": "设备种类" }