更新

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/UnitTransformUtil.java

@@ -113,7 +113,7 @@ public class UnitTransformUtil {
             BigDecimal nowVal = new BigDecimal(0);
             if (StringUtil.isNotEmpty(currentValue) && !"--".equals(currentValue)) {
                 nowVal = new BigDecimal(currentValue);
-                map.put("nowValue", nowVal);
+                map.put("nowValue", nowVal.setScale(2, BigDecimal.ROUND_HALF_UP));
             } else {
                 map.put("nowValue", "--");
             }

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

@@ -2411,6 +2411,7 @@
     </select>
 
     <select id="getWaterInfo" resultType="java.util.Map">
+
         select *  from (
         select * from (
         (SELECT
@@ -2418,7 +2419,31 @@
         ou.`code`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
+        IF((
+        CASE
+        WHEN max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) IS NULL THEN
+        '--'
+        WHEN max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) >= IFNULL( rp.min_water_level, 0 )
+        AND rp.max_water_level IS NULL THEN
+        '100'
+        WHEN max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) &lt; IFNULL( rp.min_water_level, 0 )
+        AND rp.max_water_level IS NULL THEN
+        '--' ELSE IFNULL((
+
+        abs(
+        IFNULL(
+        max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ),
+        IFNULL( rp.min_water_level, 0 )) /
+        IF
         (
+        IFNULL( rp.max_water_level, 0 ) = 0,
+        1,
+        IFNULL( rp.max_water_level, 0 ))) * 100
+        ),
+        0
+        )
+        END
+        ) = '--', '--', ROUND((
         CASE
 
         WHEN max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ) IS NULL THEN
@@ -2443,7 +2468,7 @@
         0
         )
         END
-        ) AS levelAbs,
+        ), 2)) AS levelAbs,
         IFNULL(max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ),'--')  AS nowLevel,
         (
         CASE
@@ -2489,7 +2514,33 @@
         a.`code`,
         a.minLevel,
         a.maxLevel,
+
+        IF((
+        CASE
+
+        WHEN a.nowLevel IS NULL THEN
+        '--'
+        WHEN a.nowLevel >= IFNULL( a.minLevel, 0 )
+        AND a.maxLevel IS NULL THEN
+        '100'
+        WHEN IFNULL( a.minLevel, 0 ) > a.nowLevel
+        AND a.maxLevel IS NULL THEN
+        '--' ELSE IFNULL((
+
+        abs(
+        IFNULL(
+        a.nowLevel,
+        IFNULL( a.minLevel, 0 )) /
+        IF
         (
+        IFNULL( a.maxLevel, 0 ) = 0,
+        1,
+        IFNULL( a.maxLevel, 0 ))) * 100
+        ),
+        0
+        )
+        END
+        ) = '--', '--', ROUND((
         CASE
 
         WHEN a.nowLevel IS NULL THEN
@@ -2514,7 +2565,7 @@
         0
         )
         END
-        ) AS levelAbs,
+        ), 2)) AS levelAbs,
         a.nowLevel,
         (
         CASE
@@ -4918,7 +4969,7 @@
             ELSE
             IFNULL(a.area, '--') END) AS area,
             a.id,
-            IFNULL(a.nowPressure, '--') AS nowPressure,
+            IFNULL(ROUND(a.nowPressure, 2 ), '--') AS nowPressure,
             a.nowPressureDate,
             (
                 CASE