Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

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

@@ -1253,61 +1253,119 @@
     </select>
     <select id="fireWaterSysHydrant" resultType="java.util.Map">
         SELECT
-        xhsanhj,
-        xhsangz,
-        xhsanpb,
-        ABS(xhsan - xhsanhj- xhsangz-xhsanpb) as xhszc,
-        xhsan
-        from
-        (select
-        (SELECT
-        count(1)
-        FROM `wl_equipment_specific_index` s
-        where s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
-        and s.`value` = 'true') as xhsanhj,
-        (SELECT
-        count(1)
-        FROM `wl_equipment_specific_index` s
-        where s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
-        and s.`value` = 'true') as xhsangz,
-        (SELECT
-        count(1)
-        FROM `wl_equipment_specific_index` s
-        where s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
-        and s.`value` = 'true') as xhsanpb,
-        (SELECT
-            count(1)
-        from
-        `wl_equipment_specific_index` si
-        where
-        si.equipment_index_key  = 'FAS_FireHydrantButton_FireAlarm') as xhsan
-        ) as hydrant
+			xhsanhj,
+			xhsangz,
+			xhsanpb,
+			xhszc,
+			xhsan
+		FROM
+			(
+				SELECT
+					(
+						SELECT
+							count(1)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
+						AND s.`value` = 'true'
+					) AS xhsanhj,
+					(
+						SELECT
+							count(1)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
+						AND s.`value` = 'true'
+					) AS xhsangz,
+					(
+						SELECT
+							count(1)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
+						AND s.`value` = 'true'
+					) AS xhsanpb,
+					(
+						SELECT
+							count(1)
+						FROM
+							`wl_equipment_specific_index` si
+						WHERE
+							si.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
+					) AS xhsan,
+					(
+						SELECT
+							count(
+								DISTINCT equipment_specific_id
+							)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							(
+								s.`value` = 'false'
+								OR s.`value` IS NULL
+							)
+						AND (
+							s.equipment_index_key = 'FAS_FireHydrantButton_FireAlarm'
+							OR s.equipment_index_key = 'FAS_FireHydrantButton_Fault'
+							OR s.equipment_index_key = 'FAS_FireHydrantButton_Shield'
+						)
+					) AS xhszc
+			) AS hydrant
     </select>
     <select id="fireWaterSysCollectingDevice" resultType="java.util.Map">
         SELECT
-            sbfcjzzyc,
-            sbfcjzzbs,
-            (sbfcjzz-sbfcjzzyc-sbfcjzzbs) as sbfcjzzzc,
-            sbfcjzz
-            from
-            (select
-            (SELECT
-            count(1)
-            FROM `wl_equipment_specific_index` s
-            where s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
-            and s.`value` = 'true') as sbfcjzzyc,
-            (SELECT
-            count(1)
-            FROM `wl_equipment_specific_index` s
-            where s.equipment_index_key = 'FHS_CollectingDevice_DeviceLock'
-            and s.`value` = 'true') as sbfcjzzbs,
-            (SELECT
-                count(1)
-            from
-            `wl_equipment_specific_index` si
-            where
-            si.equipment_index_key  = 'FHS_CollectingDevice_DeviceAbnormal') as sbfcjzz
-    ) as collectingDevice
+			sbfcjzzyc,
+			sbfcjzzbs,
+			sbfcjzzzc,
+			sbfcjzz
+		FROM
+			(
+				SELECT
+					(
+						SELECT
+							count(1)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
+						AND s.`value` = 'true'
+					) AS sbfcjzzyc,
+					(
+						SELECT
+							count(1)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							s.equipment_index_key = 'FHS_CollectingDevice_DeviceLock'
+						AND s.`value` = 'true'
+					) AS sbfcjzzbs,
+					(
+						SELECT
+							count(1)
+						FROM
+							`wl_equipment_specific_index` si
+						WHERE
+							si.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
+					) AS sbfcjzz,
+					(
+						SELECT
+							count(
+								DISTINCT equipment_specific_id
+							)
+						FROM
+							`wl_equipment_specific_index` s
+						WHERE
+							(
+								s.`value` = 'false'
+								OR s.`value` IS NULL
+							)
+						AND s.equipment_index_key = 'FHS_CollectingDevice_DeviceAbnormal'
+					) AS sbfcjzzzc
+			) AS collectingDevice
     </select>
     <select id="fireWaterSysWaterPump" resultType="java.util.Map">
          select