修改物联报表bug

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

@@ -1603,7 +1603,7 @@ 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("alarm_info_num")) ? "" : String.valueOf(alarm.get("alarm_info_num")));
+                            alarmMap.put("alarm_info_num", ObjectUtils.isEmpty(alarm.get("fault_info_num")) ? "" : String.valueOf(alarm.get("fault_info_num")));
                             // 设备故障率
                             alarmMap.put("faultEquipPercent", ObjectUtils.isEmpty(alarm.get("faultEquipPercent")) ? "" : String.valueOf(alarm.get("faultEquipPercent")));
                             // 报警设备总数
@@ -2013,12 +2013,15 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             } else {
                                 listItem.put("trueNum", String.valueOf(0));
                             }
-                            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 oldValue = Integer.parseInt(String.valueOf(binMap.get(String.valueOf(listItem.get("name")))));
-                                binMap.put(String.valueOf(listItem.get("name")),newValue + oldValue);
-                            }else {
-                                binMap.put(String.valueOf(listItem.get("name")),listItem.get("alarmEquipNum"));
+                            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")));
+                                    int oldValue = Integer.parseInt(String.valueOf(binMap.get(String.valueOf(listItem.get("name")))));
+                                    binMap.put(String.valueOf(listItem.get("name")),newValue + oldValue);
+                                }else {
+                                    binMap.put(String.valueOf(listItem.get("name")),listItem.get("alarmEquipNum"));
+                                }
+
                             }
                             list.add(listItem);
                         }

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -3919,13 +3919,14 @@
     <select id="selectMonthPieChartTwo" resultType="java.util.Map">
         	SELECT
         ss.alarm_type_name as type,
-        SUM(index_true_num) as value
+        	count(distinct(ss.equipment_specific_id)) as value
         from
         (
         SELECT
         rep.alarm_type,
         rep.alarm_type_name,
-        rep.index_true_num
+        rep.index_true_num,
+        rep.equipment_specific_id
         FROM
         wl_equipment_alarm_report_day rep,
         (