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

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

@@ -1226,13 +1226,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
                         .eq(EquipmentSpecific::getSingle, true)
         );
         // 未复归设备
-        List<EquipmentSpecificAlarmLog> equipSpecIds = equipmentSpecificAlarmLogMapper.selectList(
-                Wrappers.<EquipmentSpecificAlarmLog>lambdaQuery()
-                        .select(EquipmentSpecificAlarmLog::getEquipmentSpecificId)
-                        .like(EquipmentSpecificAlarmLog::getSystemIds, id)
-                        .eq(EquipmentSpecificAlarmLog::getStatus, "1")
+        List<EquipmentSpecificAlarm> equipSpecIds = equipmentSpecificAlarmMapper.selectList(
+                Wrappers.<EquipmentSpecificAlarm>lambdaQuery()
+                        .select(EquipmentSpecificAlarm::getEquipmentSpecificId)
+                        .like(EquipmentSpecificAlarm::getSystemIds, id)
+                        .eq(EquipmentSpecificAlarm::getStatus, "1")
         );
-        int count = (int) equipSpecIds.stream().map(EquipmentSpecificAlarmLog::getEquipmentSpecificId).distinct().count();
+        int count = (int) equipSpecIds.stream().map(EquipmentSpecificAlarm::getEquipmentSpecificId).distinct().count();
         list.add(new AlarmDataVO("部件总数", equipmentCount + " 个", false));
         list.add(new AlarmDataVO("未复归设备", count + " 个", false));
         return list;

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

@@ -6443,10 +6443,10 @@
         SELECT
         IFNULL(SUM(IF(r.`status` = 0, 1, 0)), 0) AS normalNum,
         IFNULL(SUM(IF((r.type = 'BREAKDOWN' AND r.`status` = 1), 1, 0)), 0) AS faultNum,
-        IFNULL(SUM(IF((r.type = 'FIREALARM' AND r.`status` = 1), 1, 0)), 0) AS alarmNum,
+        IFNULL(SUM(IF((r.type != 'BREAKDOWN' AND r.`status` = 1), 1, 0)), 0) AS alarmNum,
         DATE_FORMAT( r.update_date, '%Y-%m-%d') AS date
         FROM
-        wl_equipment_specific_alarm_log r
+        wl_equipment_specific_alarm r
         LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, r.system_ids )
         <where>
             r.update_date BETWEEN date_sub( now(), INTERVAL 6 MONTH ) AND now()
@@ -6455,6 +6455,7 @@
             </if>
         </where>
         GROUP BY
+        r.equipment_specific_id,
         LEFT ( r.update_date, 10 )
         ORDER BY
         r.update_date
@@ -6491,10 +6492,10 @@
         SELECT
         IFNULL(SUM(IF(r.`status` = 0, 1, 0)), 0) AS normalNum,
         IFNULL(SUM(IF((r.type = 'BREAKDOWN' AND r.`status` = 1), 1, 0)), 0) AS faultNum,
-        IFNULL(SUM(IF((r.type = 'FIREALARM' AND r.`status` = 1), 1, 0)), 0) AS alarmNum,
+        IFNULL(SUM(IF((r.type != 'BREAKDOWN' AND r.`status` = 1), 1, 0)), 0) AS alarmNum,
         DATE_FORMAT( r.update_date, '%Y-%m-%d') AS date
         FROM
-        wl_equipment_specific_alarm_log r
+        wl_equipment_specific_alarm r
         LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, r.system_ids )
         <where>
             r.update_date BETWEEN date_sub( now(), INTERVAL 15 MONTH ) AND now()
@@ -6503,6 +6504,7 @@
             </if>
         </where>
         GROUP BY
+        r.equipment_specific_id,
         LEFT ( r.update_date, 10 )
         ORDER BY
         r.update_date