修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -565,6 +565,13 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
                          @Param("startDate") String startDate,
                          @Param("endDate") String endDate,
                          @Param("indicator") List<String> indicator);
+
+    Integer selectWeekAlarmsEquip(@Param("systemId") String systemId,
+                         @Param("indexType") String indexType,
+                         @Param("equipmentCode") String equipmentCode,
+                         @Param("startDate") String startDate,
+                         @Param("endDate") String endDate,
+                         @Param("typeCode") String typeCode);
     Map<String, Object> selectWeekSummarize(@Param("systemId") String systemId,
                                             @Param("startDate") String startDate,
                                             @Param("endDate") String endDate,

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

@@ -36,6 +36,7 @@ import com.yeejoin.equipmanage.fegin.JcsFeign;
 import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
+import liquibase.pro.packaged.S;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.io.IOUtils;
@@ -1805,7 +1806,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             // 正常标准
                             listItem.put("normal", ObjectUtils.isEmpty(weekItem.get("normal")) ? "" : String.valueOf(weekItem.get("normal")));
                             // 7日告警设备数
-                            listItem.put("alarmEquipNum", ObjectUtils.isEmpty(weekItem.get("alarmEquipNum")) ? "" : String.valueOf(weekItem.get("alarmEquipNum")));
+                            if (!ObjectUtils.isEmpty(weekItem.get("type_code")) && !ObjectUtils.isEmpty(weekItem.get("code"))) {
+                                Integer integer = fireFightingSystemMapper.selectWeekAlarmsEquip(valueOf(system.get("id")), valueOf(weekItem.get("type_code")), valueOf(weekItem.get("code")), startDate, endDate, String.valueOf(weekItem.get("type_code")));
+                                listItem.put("alarmEquipNum", String.valueOf(integer));
+                            } else {
+                                listItem.put("alarmEquipNum", String.valueOf(0));
+                            }
+                           // 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"))) {
                                 Integer integer = fireFightingSystemMapper.selectAlarms(valueOf(system.get("id")), valueOf(weekItem.get("type_code")), valueOf(weekItem.get("code")), startDate, endDate, indicatorList);
@@ -1979,7 +1986,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                     List<Map<String, Object>> weekReportList = fireFightingSystemMapper.selectWeekReportList(String.valueOf(system.get("id")), startDate, endDate);
                     ArrayList<Map<String, Object>> list = new ArrayList<>();
                     ArrayList<Map<String, Object>> alarmMapList = new ArrayList<>();
-
+                    Map<String, Object> binMap = new HashMap<>();
                     if (!CollectionUtils.isEmpty(weekReportList)) {
                         for (Map<String, Object> weekItem : weekReportList) {
                             HashMap<String, Object> listItem = new HashMap<>();
@@ -2006,12 +2013,23 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                             } else {
                                 listItem.put("trueNum", String.valueOf(0));
                             }
-                            Map<String, Object> alarmMap = new HashMap<>();
-                            alarmMap.put("type",listItem.get("name"));
-                            alarmMap.put("value",listItem.get("alarmEquipNum"));
-                            alarmMapList.add(alarmMap);
+                            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);
                         }
+                        ArrayList<String> strings = new ArrayList<>(binMap.keySet());
+                        for (String string : strings) {
+                            HashMap<String, Object> hashMap = new HashMap<>();
+                            hashMap.put("type", string);
+                            hashMap.put("value", binMap.get(string));
+                            alarmMapList.add(hashMap);
+                        }
+
                     } else {
                         HashMap<String, Object> listItem = new HashMap<>();
                         listItem.put("name", "");

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

@@ -4129,7 +4129,7 @@
     </select>
     <select id="selectAlarms" resultType="java.lang.Integer">
         SELECT
-            SUM(index_true_num)
+            ifnull(SUM(index_true_num), 0)
         FROM
         wl_equipment_alarm_report_day report
         LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids )
@@ -5724,5 +5724,18 @@
     <select id="selectEquipmentSpecificById" resultType="java.util.Map">
         select * from wl_equipment_specific where  id = #{id}
     </select>
+    <select id="selectWeekAlarmsEquip" resultType="java.lang.Integer">
+
+        SELECT
+        COUNT(DISTINCT(1))
+        FROM
+        wl_equipment_alarm_report_day e
+        WHERE
+        FIND_IN_SET( #{systemId},e.system_ids)
+        AND e.equipment_code = #{equipmentCode}
+        AND e.index_type = #{typeCode}
+        AND e.report_date >= DATE_FORMAT(#{startDate},'%y-%m-%d')
+        AND e.report_date &lt;= DATE_FORMAT(#{endDate},'%y-%m-%d')
+    </select>
 
 </mapper>