Commit cb31e4db authored by suhuiguang's avatar suhuiguang

refact(大屏详情):企业详情设备详情调整

1.企业详情增加企业标签字段 2.设备详情调整增加设备数据质量登记字段
parent ad0f5d43
......@@ -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());
......
......@@ -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<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment