fix(物联报表): 隐藏告警数为0的设备/指标

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -1649,6 +1649,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             alarmMap.put("fault_equip_num", ObjectUtils.isEmpty(alarm.get("fault_equip_num")) ? "" : String.valueOf(alarm.get("fault_equip_num")));
                             // 故障信息条数
                             alarmMap.put("alarm_info_num", ObjectUtils.isEmpty(alarm.get("fault_info_num")) ? "" : String.valueOf(alarm.get("fault_info_num")));
+                            if (Integer.parseInt(alarmMap.get("alarm_info_num").toString()) == 0) {
+                                continue;
+                            }
                             // 设备故障率
                             alarmMap.put("faultEquipPercent", ObjectUtils.isEmpty(alarm.get("faultEquipPercent")) ? "" : String.valueOf(alarm.get("faultEquipPercent")));
                             // 报警设备总数
@@ -1860,6 +1863,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             } else {
                                 listItem.put("alarmEquipNum", String.valueOf(0));
                             }
+                            if (Integer.parseInt(listItem.get("alarmEquipNum").toString()) == 0) {
+                                continue;
+                            }
                            // listItem.put("alarmEquipNum", ObjectUtils.isEmpty(weekItem.get("alarmEquipNum")) ? "" : String.valueOf(weekItem.get("alarmEquipNum")));
                             // 7日告警条数
                             if (!ObjectUtils.isEmpty(weekItem.get("type_code")) && !ObjectUtils.isEmpty(weekItem.get("code"))) {
@@ -2068,6 +2074,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             } else {
                                 listItem.put("trueNum", String.valueOf(0));
                             }
+                            if (Integer.parseInt(listItem.get("trueNum").toString()) == 0) {
+                                continue;
+                            }
                             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")))){
                                     int newValue = Integer.parseInt(String.valueOf(listItem.get("alarmEquipNum")));