Skip to content

A
amos-boot-biz
Commit ef54bdd2 authored by 李秀明's avatar 李秀明
Browse files
Options

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

parents 772d0082 f8fa905c
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ ef54bdd2
...@@ -1694,24 +1694,24 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1694,24 +1694,24 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
alarmMap.put("alarmEquipPercent", ObjectUtils.isEmpty(alarm.get("alarmEquipPercent")) ? "" : String.valueOf(alarm.get("alarmEquipPercent"))); alarmMap.put("alarmEquipPercent", ObjectUtils.isEmpty(alarm.get("alarmEquipPercent")) ? "" : String.valueOf(alarm.get("alarmEquipPercent")));
// 信息总数 // 信息总数
alarmMap.put("total_info_num", ObjectUtils.isEmpty(alarm.get("total_info_num")) ? "" : String.valueOf(alarm.get("total_info_num"))); alarmMap.put("total_info_num", ObjectUtils.isEmpty(alarm.get("total_info_num")) ? "" : String.valueOf(alarm.get("total_info_num")));
if (Integer.parseInt(alarmMap.get("total_info_num").toString()) == 0) { // if (Integer.parseInt(alarmMap.get("total_info_num").toString()) == 0) {
continue; // continue;
} // }
maps.add(alarmMap); maps.add(alarmMap);
} }
} else { } else {
HashMap<String, Object> alarmMap = new HashMap<>(); HashMap<String, Object> alarmMap = new HashMap<>();
alarmMap.put("equipment_name", ""); alarmMap.put("equipment_name", "无");
alarmMap.put("num", ""); alarmMap.put("num", "无");
alarmMap.put("normalEquipNum", ""); alarmMap.put("normalEquipNum", "无");
alarmMap.put("normalEquipPercent", ""); alarmMap.put("normalEquipPercent", "无");
alarmMap.put("fault_equip_num", ""); alarmMap.put("fault_equip_num", "无");
alarmMap.put("alarm_info_num", ""); alarmMap.put("alarm_info_num", "无");
alarmMap.put("faultEquipPercent", ""); alarmMap.put("faultEquipPercent", "无");
alarmMap.put("alarm_equip_num", ""); alarmMap.put("alarm_equip_num", "无");
alarmMap.put("alarmEquipPercent", ""); alarmMap.put("alarmEquipPercent", "无");
alarmMap.put("total_info_num", ""); alarmMap.put("total_info_num", "无");
maps.add(alarmMap); maps.add(alarmMap);
} }
systemData.put("list", maps); systemData.put("list", maps);
...@@ -1906,9 +1906,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -1906,9 +1906,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} else { } else {
listItem.put("trueNum", String.valueOf(0)); listItem.put("trueNum", String.valueOf(0));
} }
if (Integer.parseInt(listItem.get("trueNum").toString()) == 0) { // if (Integer.parseInt(listItem.get("trueNum").toString()) == 0) {
continue; // continue;
} // }
list.add(listItem); list.add(listItem);
} }
} else { } else {
...@@ -2107,9 +2107,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -2107,9 +2107,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} else { } else {
listItem.put("trueNum", String.valueOf(0)); listItem.put("trueNum", String.valueOf(0));
} }
if (Integer.parseInt(listItem.get("trueNum").toString()) == 0) { // if (Integer.parseInt(listItem.get("trueNum").toString()) == 0) {
continue; // continue;
} // }
if (!ObjectUtils.isEmpty(weekItem.get("type_code")) && String.valueOf(weekItem.get("type_code")).endsWith("Fault")){ if (!ObjectUtils.isEmpty(weekItem.get("type_code")) && String.valueOf(weekItem.get("type_code")).endsWith("Fault")){
if (!ObjectUtils.isEmpty(binMap) && !ObjectUtils.isEmpty(listItem.get("name")) && binMap.containsKey(String.valueOf(listItem.get("name")))){ if (!ObjectUtils.isEmpty(binMap) && !ObjectUtils.isEmpty(listItem.get("name")) && binMap.containsKey(String.valueOf(listItem.get("name")))){
int newValue = Integer.parseInt(String.valueOf(listItem.get("alarmEquipNum"))); int newValue = Integer.parseInt(String.valueOf(listItem.get("alarmEquipNum")));
......
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