直流中心bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -349,7 +349,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 } else {
                     item.put("equipment_index_name", "无信号");
                 }
-                if ("启动".equals(stateMap.get("equipment_index_name"))) {
+                if ("启动".equals(item.get("equipment_index_name"))) {
                     long update_time = 0L;
                     try {
                         update_time = sdf.parse(String.valueOf(stateMap.get("update_date")).replaceAll("T", " ")).getTime();
@@ -388,11 +388,11 @@ public class SupervisionConfigureController extends AbstractBaseController {
         pressurePumpInfo.getRecords().stream(
         ).map(item -> {
             item.put("startAndStopInterval", finalDiffMinute);
-            if (finalDiffMinute > 5) {
-                item.put("stateDesc", "异常");
-            } else {
-                item.put("stateDesc", "正常");
-            }
+//            if (finalDiffMinute > 5) {
+//                item.put("stateDesc", "异常");
+//            } else {
+//                item.put("stateDesc", "正常");
+//            }
             item.put("nameKey", pressurePumpStart);
             return item;
         }).collect(Collectors.toList());

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

@@ -1380,7 +1380,7 @@
         LEFT JOIN `wl_equipment_specific_alarm` wesa ON wesa.id = wlesal.equipment_specific_alarm_id
         LEFT JOIN `wl_equipment_specific` `wles` ON `wlesal`.`equipment_specific_id` = `wles`.`id`
         <where>
-            wesa.`status` = 1 AND wesa.`equipment_specific_index_value` = 'true'
+            wesa.`status` = 1
             <if test="param.system != null and param.system != ''">
                 AND find_in_set( #{param.system}, `wlesal`.`system_codes` )
             </if>

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

@@ -2041,28 +2041,19 @@
             s.id,
             s.`name`,
             IFNULL(s.alarmEquipTotal, 0) AS alarmEquipTotal,
-            IF(s.alarmEquipTotal > 0,1,0) AS `status`
+            IF(s.countAlarmEquipTotal > 0,1,0) AS `status`
         FROM
             (SELECT
             fs.id,
             fs.`name`,
-            <choose>
-                <when test="date != null">
-                    SUM(IF(TO_DAYS(esi.update_date) = TO_DAYS(#{date}),1,0)) AS alarmEquipTotal
-                </when>
-                <otherwise>
-                    COUNT( 1 ) AS alarmEquipTotal
-                </otherwise>
-            </choose>
+            SUM(IF(TO_DAYS(wesi.update_date) = TO_DAYS(#{date}),1,0)) AS alarmEquipTotal,
+            COUNT( 1 ) AS countAlarmEquipTotal
             FROM
             f_fire_fighting_system fs
             LEFT JOIN `wl_equipment_specific` `wes` ON find_in_set( `fs`.`id`, `wes`.`system_id` )
-            LEFT JOIN wl_equipment_specific_index esi ON esi.equipment_specific_id = wes.id
+            LEFT JOIN wl_equipment_specific_alarm wesi ON wesi.equipment_specific_id = wes.id
             <where>
-                (
-                ( esi.is_alarm = 1 AND esi.`value` = 'true' )
-                OR ( esi.is_alarm = 0 AND esi.`value` = 'false' )
-                )
+                wesi.`status` = '1'
                 <if test="bizOrgCode!=null and bizOrgCode!=''">
                     AND fs.biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>

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

@@ -5297,7 +5297,7 @@
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireWaterSys'
-                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' )
+                  AND wesi.`status` = 1
             ) fireWaterSys,
             (
                 SELECT
@@ -5309,7 +5309,7 @@
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireCAFSSys'
-                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' )
+                  AND wesi.`status` = 1
             ) fireCAFSSys,
             (
                 SELECT
@@ -5321,7 +5321,7 @@
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireAlarmSys'
-                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true'  )
+                  AND wesi.`status` = 1
             ) fireAlarmSys,
             (
                 SELECT
@@ -5333,7 +5333,7 @@
                 WHERE
                     fs.system_type_code IS NOT NULL
                   AND fs.system_type_code = 'fireONLSys'
-                  AND ( wesi.`status` = 1 AND wesi.`equipment_specific_index_value` = 'true' )
+                  AND wesi.`status` = 1
             ) fireONLSys
     </select>