修改消防炮状态和流量取值问题

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

@@ -246,38 +246,31 @@
             wel.warehouse_structure_id  ,wel.equipment_code
     </select>
     <select id="selectFireMonitor" resultType="java.util.Map">
-        SELECT temp.name, temp.alarm ,temp.id, temp.code,
-               IFNULL((SELECT wesi.value FROM  wl_equipment_specific_index wesi  WHERE wesi.equipment_specific_id = temp.id  AND wesi.equipment_index_key = 'CAFS_CAFSFireGun_FireGunPressure'
-                       ORDER BY wesi.update_date desc LIMIT 1),0)	 AS value,
-	        IFNULL((SELECT CASE WHEN wesi.value_label IS NULL OR trim( wesi.value_label ) = '' THEN (CASE
-				wesi.`value`
-				WHEN 'true' THEN
-				concat( wesi.equipment_index_name, '(是)' )
-				WHEN 'false' THEN
-				concat( wesi.equipment_index_name, '(否)' )
-				ELSE
-				wesi.equipment_index_name
-		END) ELSE wesi.value_label END FROM  wl_equipment_specific_index wesi
-		LEFT JOIN wl_equipment_index  wei on wesi.equipment_index_id = wei.id
-		 WHERE wesi.equipment_specific_id = temp.id  AND wei.is_trend = 0
-		 AND wesi.value is NOT NULL AND wesi.value <![CDATA[<>]]> ''
-	        ORDER BY wesi.update_date desc LIMIT 1),'--') AS status,
-	        '0' AS flow
-        FROM(
+        SELECT
+            temp.name,
+            temp.alarm,
+            temp.id,
+            temp.code,
+            IFNULL((SELECT wesi.value FROM wl_equipment_specific_index wesi  WHERE wesi.equipment_specific_id = temp.id  AND wesi.equipment_index_key = 'CAFS_CAFSFireGun_FireGunPressure'
+                ORDER BY wesi.update_date desc LIMIT 1), 0) AS value,
+            IFNULL((SELECT CASE WHEN wesi.`value` = 'true' THEN wesi.equipment_index_name ELSE '关到位' END FROM  wl_equipment_specific_index wesi
+                WHERE wesi.equipment_specific_id = temp.id  AND wesi.equipment_index_key = 'CAFS_GunValve_Open' ORDER BY wesi.update_date DESC LIMIT 1),'关到位') AS status,
+            IFNULL((SELECT wesi.`value` FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = temp.id  AND wesi.equipment_index_key = 'CAFS_GunValve_Flow' ORDER BY wesi.update_date DESC LIMIT 1), 0) AS flow
+        FROM
+            (
             SELECT wes.id,wes.name,wes.code,
-            CASE
-            WHEN ( SELECT is_alarm FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key ) = 1
-            AND wes.realtime_iot_index_value = 'true' THEN
-            1 ELSE 0
-            END AS alarm
+                CASE WHEN (SELECT is_alarm FROM wl_equipment_specific_index wesi WHERE wesi.equipment_specific_id = wes.id AND wesi.equipment_index_key = wes.realtime_iot_index_key ) = 1
+                AND wes.realtime_iot_index_value = 'true' THEN
+                1 ELSE 0
+                END AS alarm
             FROM  wl_equipment_specific wes
             JOIN f_equipment_fire_equipment fire ON wes.id = fire.fire_equipment_id
             WHERE
-            wes.equipment_code LIKE concat( '920322', '%' )
-            <if test="code != null and  code!='' ">
-                AND fire.equipment_id = (SELECT id  FROM f_equipment WHERE `code` = #{code})
-            </if>
-            AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
+                wes.equipment_code LIKE concat( '920322', '%' )
+                <if test="code != null and  code!='' ">
+                    AND fire.equipment_id = (SELECT id  FROM f_equipment WHERE `code` = #{code})
+                </if>
+                AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
             ) temp
     </select>
     <select id="selectFoamTank" resultType="java.util.Map">