修改bug

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

@@ -147,7 +147,9 @@
 				concat( wesi.equipment_index_name, '(是)' )
 				WHEN 'false' THEN
 				concat( wesi.equipment_index_name, '(否)' )
-		END) ELSE wesi.value_label END FROM  wl_equipment_specific_index wesi  WHERE wesi.equipment_specific_id = temp.id  AND wesi.is_alarm = 1
+		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
 	        ORDER BY wesi.update_date desc LIMIT 1),'--') AS status,
 	        '--' AS flow
         FROM(
@@ -174,9 +176,13 @@
         CASE
         WHEN ( temp.nowLevel = '--' ) THEN
         '--'
-        WHEN ( temp.nowLevel < temp.minLevel ) THEN
+        WHEN ( temp.maxLevel = 0 ) THEN
+            '--'
+        WHEN ( temp.minLevel = 0 ) THEN
+            '--'
+        WHEN ( temp.minLevel - temp.nowLevel > 0 ) THEN
         '液位低'
-        WHEN ( temp.nowLevel > temp.maxLevel ) THEN
+        WHEN ( temp.nowLevel - temp.maxLevel > 0) THEN
         '液位高' ELSE '正常'
         END AS status,
         CASE
@@ -324,9 +330,17 @@
         CASE
         WHEN temp.nowPressure = '--' THEN
         '--'
-        WHEN temp.nowPressure > temp.maxPressure THEN
+        WHEN temp.maxPressure = '' THEN
+            '--'
+        WHEN temp.minPressure = '' THEN
+            '--'
+        WHEN ( temp.maxLevel = 0 ) THEN
+            '--'
+        WHEN ( temp.minLevel = 0 ) THEN
+            '--'
+        WHEN temp.nowPressure - temp.maxPressure > 0 THEN
         '压力高'
-        WHEN temp.nowPressure < temp.minPressure THEN
+        WHEN temp.minPressure - temp.nowPressure > 0 THEN
         '压力低' ELSE '正常'
         END AS status,
         1 AS type
@@ -357,9 +371,17 @@
         CASE
         WHEN temp.nowFlow = '--' THEN
         '--'
-        WHEN temp.nowFlow > temp.maxFlow THEN
+        WHEN temp.maxFlow = '' THEN
+            '--'
+        WHEN temp.minFlow = '' THEN
+            '--'
+        WHEN ( temp.maxLevel = 0 ) THEN
+            '--'
+        WHEN ( temp.minLevel = 0 ) THEN
+            '--'
+        WHEN temp.nowFlow - temp.maxFlow > 0 THEN
         '流量高'
-        WHEN temp.nowFlow < temp.minFlow THEN
+        WHEN temp.minFlow - temp.nowFlow > 0  THEN
         '流量低' ELSE '正常'
         END AS status,
         2 AS type