Merge branch 'develop_tzs_register_to_0715' of…

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

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public enum DPStatusEnum {
+
+    EQUIP_STATUS_USE("equipUse", "在用","在用", "", "success"),
+    EQUIP_STATUS_STOP("equipStop", "停用","停用", "", "error"),
+    EQUIP_STATUS_LOGOUT("equipLogout", "注销","注销", "", "error"),
+    EQUIP_STATUS_SCRAP("equipScrap", "报废","报废", "", "error"),
+    EQUIP_EMPHASIS_MONITOR("equipEmphasis", "重点监控设备","重点监控设备", "", "success"),
+    USE_YEAR_GT_15("gt15", ">15年","使用年限大于15年", "", "error"),
+    COMPANY_TYPE("companyType", "单位类型","单位类型", "", "success"),
+    MANAGE_STATUS_USE("manageUse", "在业","在业", "", "success"),
+    MANAGE_STATUS_OPEN("manageOpen", "在业","开业", "", "success"),
+    MANAGE_STATUS_STOP("manageStop", "停业","停业", "", "error"),
+    COMPANY_EMPHASIS_MONITOR("emphasisMonitorCompany", "重点监控企业","重点监控企业", "", "success"),
+    COMPANY_HIGH_RISK("highRisk", "高风险企业","高风险企业", "", "stop");
+
+    private String key;
+    private String label;
+    private String status;
+    private String icon;
+    private String value;
+
+    public static DPStatusEnum getEnumByStatus(String status) {
+        for (DPStatusEnum c : DPStatusEnum.values()) {
+            if (c.getStatus().equals(status)){
+                return c;
+            }
+        }
+        return null;
+    }
+
+    public static Map toMap(DPStatusEnum dpStatusEnum) {
+        Map map = new HashMap<>();
+        map.put("key", dpStatusEnum.getKey());
+        map.put("label", dpStatusEnum.getLabel());
+        map.put("status", dpStatusEnum.getStatus());
+        map.put("icon", dpStatusEnum.getIcon());
+        map.put("value", dpStatusEnum.getValue());
+        return map;
+    }
+}

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

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.utils.JsonValueUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RestTemplateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.StringUtils;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.DpSubUtils;
+import com.yeejoin.amos.boot.module.statistics.api.enums.DPStatusEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.*;
 import com.yeejoin.amos.feign.morphic.Morphic;
 import com.yeejoin.amos.feign.morphic.model.FormSceneModel;
@@ -105,6 +106,11 @@ public class DPSubServiceImpl {
             log.info("{}tab页获取详情接口，共耗时：{} 毫秒", tab.get("displayName"), (e - s));
         }
 
+        if (tab.getString("template").contains("emergency")){
+            content.put(tab.getString("key"), JSONObject.parseObject(apiResult.toString()));
+            return;
+        }
+
         if (!ValidationUtil.isEmpty(formSeq)) {
             long s = System.currentTimeMillis();
             FormSceneModel formPage = Morphic.formSceneClient.seleteOne(formSeq).getResult();
@@ -165,10 +171,6 @@ public class DPSubServiceImpl {
 
     public JSONObject buildContentKeyinfoData(JSONObject tab, JSONObject content, Object apiResult){
         JSONObject result = JSONObject.parseObject(apiResult.toString());
-        if (tab.getString("template").contains("emergency")){
-            content.put("keyinfo", result);
-            return content;
-        }
         JSONObject param = tab.getJSONObject("param");
         Object keyParams = JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.keyParams");
         if (ValidationUtil.isEmpty(keyParams)){
@@ -197,27 +199,57 @@ public class DPSubServiceImpl {
             xobj.put("value", "param".equals(xobj.getString("source")) ? param.get(xobj.getString("key")) : result.get(xobj.getString("key")));
         });
         this.processQRCodeWidget(content.getJSONObject("keyinfo").getJSONObject("qrcode"), result);
-        this.processQRCodeWidget(content.getJSONObject("keyinfo").getJSONObject("qrcode"), result);
 
         if (tab.getString("template").contains("equip")){
+            // 处理图片
+            JSONArray jsonArray = result.getJSONArray("PRODUCT_PHOTO");
+            if (!ValidationUtil.isEmpty(jsonArray)){
+                content.getJSONObject("keyinfo").put("photo", jsonArray.getJSONObject(0).getString("url"));
+            }
+            // 处理标签
+            // 处理标签
+            JSONArray status = (JSONArray)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.status");
+            this.processLabel(status, param.getString("EQU_STATE"));
+
             // 处理问题列表
             List<Map<String, String>> problem = dpSubBizService.queryProblemListByEquipId(param.getString("record"));
             if (!ValidationUtil.isEmpty(problem)){
-                Object qrcode = JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.qrcode");
-                ((JSONObject)qrcode).put("problem", problem);
+                JSONObject qrcode = (JSONObject)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.qrcode");
+                qrcode.put("problem", problem);
             }
 
             // 处理监管履历
             List<Map<String, String>> datas = dpSubBizService.equOnJgServiceOperationRecords(param.getString("record"));
             if (!ValidationUtil.isEmpty(datas)){
-                Object infoRecords = JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.infoRecords");
-                ((JSONObject)infoRecords).put("datas", datas);
+                JSONObject infoRecords = (JSONObject)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.infoRecords");
+                infoRecords.put("datas", datas);
                 param.put("reghistory", datas);
             }
+        } else if(tab.getString("template").contains("company")){
+            // 处理标签
+            JSONArray status = (JSONArray)JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.status");
+            this.processLabel(status, result.getString("unitType"));
+            this.processLabel(status, result.getString("operatingStatus"));
+
+            // 处理图片
+            JSONArray jsonArray = result.getJSONArray("unitBusinessLicense");
+            if (!ValidationUtil.isEmpty(jsonArray)){
+                content.getJSONObject("keyinfo").put("photo", jsonArray.getJSONObject(0).getString("url"));
+            }
         }
         return content;
     }
 
+    private JSONArray processLabel(JSONArray status, String value){
+        if (!ValidationUtil.isEmpty(value)){
+            DPStatusEnum enumByStatus = DPStatusEnum.getEnumByStatus(value);
+            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());
         if (!ValidationUtil.isEmpty(showHideRules)) {

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

@@ -74,12 +74,7 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [
-        { "key": "unitType", "label": "", "icon": "", "value": "success" },
-        { "key": "2", "label": "", "icon": "", "value": "success" },
-        { "key": "3", "label": "否", "icon": "", "value": "error" },
-        { "key": "4", "label": "否", "icon": "", "value": "stop" }
-      ],
+      "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []