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

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/DPStatusEnum.java

@@ -31,7 +31,11 @@ public enum DPStatusEnum {
     MANAGE_STATUS_OPEN("manageOpen", "在业","开业", "", "success"),
     MANAGE_STATUS_STOP("manageStop", "停业","停业", "", "error"),
     COMPANY_EMPHASIS_MONITOR("emphasisMonitorCompany", "重点监控企业","重点监控企业", "", "success"),
-    COMPANY_HIGH_RISK("highRisk", "高风险企业","高风险企业", "", "stop");
+    COMPANY_HIGH_RISK("highRisk", "高风险企业","高风险企业", "", "stop"),
+
+    EQUIP_DATA_QUALITY_SCORE_1("1", "一类","一类", "", "success"),
+    EQUIP_DATA_QUALITY_SCORE_2("2", "二类","二类", "", "success"),
+    EQUIP_DATA_QUALITY_SCORE_3("3", "三类","三类", "", "success");
 
     private String key;
     private String label;
@@ -48,6 +52,15 @@ public enum DPStatusEnum {
         return null;
     }
 
+    public static DPStatusEnum getEnumByKey(String key) {
+        for (DPStatusEnum c : DPStatusEnum.values()) {
+            if (c.getKey().equals(key)){
+                return c;
+            }
+        }
+        return null;
+    }
+
     public static Map toMap(DPStatusEnum dpStatusEnum) {
         Map map = new HashMap<>();
         map.put("key", dpStatusEnum.getKey());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java

@@ -266,6 +266,7 @@ public class DPSubServiceImpl {
             // 处理标签
             JSONArray status = (JSONArray)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.status");
             this.processLabel(status, param.getString("EQU_STATE"));
+            this.processLabelByKey(status, param.getString("DATA_QUALITY_SCORE"));
 
             // 处理问题列表
             List<Map<String, String>> problem = dpSubBizService.queryProblemListBySourceId(param.getString("record"));
@@ -306,6 +307,7 @@ public class DPSubServiceImpl {
             JSONArray status = (JSONArray)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.status");
             this.processLabel(status, result.getString("unitType"));
             this.processLabel(status, result.getString("operatingStatus"));
+            this.processRegulatoryLabels(status, result.getString("regulatoryLabels"));
             // 处理问题列表
             List<Map<String, String>> problem = dpSubBizService.queryProblemListBySourceId(param.getString("sequenceNbr"));
             if (!ValidationUtil.isEmpty(problem)){
@@ -344,6 +346,34 @@ public class DPSubServiceImpl {
         return status;
     }
 
+
+    private JSONArray processRegulatoryLabels(JSONArray status, String labels){
+        if (!ValidationUtil.isEmpty(labels)){
+            int i = 0;
+            for(String label : labels.split(",")){
+                i++;
+                Map map = new HashMap<>();
+                map.put("key", i);
+                map.put("label", label);
+                map.put("status", label);
+                map.put("icon", "");
+                map.put("value", "success");
+                status.add(map);
+            }
+        }
+        return status;
+    }
+
+    private JSONArray processLabelByKey(JSONArray status, String key){
+        if (!ValidationUtil.isEmpty(key)){
+            DPStatusEnum enumByStatus = DPStatusEnum.getEnumByKey(key);
+            if (!ValidationUtil.isEmpty(enumByStatus)){
+                status.add(DPStatusEnum.toMap(enumByStatus));
+            }
+        }
+        return status;
+    }
+
     private JSONArray processShowHideRules(JSONArray children, Object showHideRules, Object apiResult) {
         JSONObject result = JSONObject.parseObject(apiResult.toString());
         Map<String,String> relationMap = new HashMap<>();

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -380,6 +380,9 @@ public class JGDPStatisticsServiceImpl {
         long cylinderNum = stCommonService.staticsCenterMapCountDataForCylinder(result, orgCode, true, false, false);
         //1.8大类设备数量统计,压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
         stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode, true, false, false);
+        // 单独计算已纳管设备（台套）数量总数
+        long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
+        result.put("total", hasSupervisoryCodeEquipCount);
         //2.压力管道长度统计
         stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
         //3.单位数量统计

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -303,7 +303,7 @@ public class StCommonServiceImpl {
             });
             // 注意，求总数时：countMap不包括气瓶数量、压力管道数量（20240819修改）
             // 总数为已赋码设备数量，需要单独统计
-            result.put(DPMapStatisticsItemEnum.TOTAL.getCode(), queryHasSupervisoryCodeEquipCount(orgCode, isOrgBranchCodeExactMatch, cylinderNum));
+            result.put(DPMapStatisticsItemEnum.TOTAL.getCode(), countMap.values().stream().mapToLong(e -> e).sum());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -315,10 +315,9 @@ public class StCommonServiceImpl {
      * 统计已赋码设备数量
      * @param orgCode
      * @param isOrgBranchCodeExactMatch
-     * @param cylinderNum
      * @return
      */
-    public long queryHasSupervisoryCodeEquipCount(String orgCode, Boolean isOrgBranchCodeExactMatch, long cylinderNum) {
+    public long queryHasSupervisoryCodeEquipCount(String orgCode, Boolean isOrgBranchCodeExactMatch) {
         CountRequest request = new CountRequest();
         request.indices("idx_biz_view_jg_all");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();