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

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

@@ -255,17 +255,27 @@ public class ConfigureController extends AbstractBaseController {
         String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
         Page<Map<String, Object>> waterInfo = fireFightingSystemMapper.getWaterInfo(page, bizOrgCode, null);
-        Map<String, Object> unit = fireFightingSystemMapper.getWaterlevelUnit();
-        if ("CM".equals(unit.get("unit")) || "cm".equals(unit.get("unit")) || "厘米".equals(unit.get("unit"))){
-            for (Map<String, Object> record : waterInfo.getRecords()) {
+        for (Map<String, Object> record : waterInfo.getRecords()) {
+            Map<String, Object> unit = null;
+            String deviceId = String.valueOf(record.get("level_device_id"));
+            String[] split = deviceId.split(",");
+            if (!ObjectUtils.isEmpty(split) && !ObjectUtils.isEmpty(split[0])) {
+                String  s = split[0];
+                if ("pool".equals(record.get("resource_type"))) {
+                    unit = fireFightingSystemMapper.getWaterlevelUnit(s, "FHS_FirePoolDevice_WaterLevel");
+                } else {
+                    unit = fireFightingSystemMapper.getWaterlevelUnit(s, "FHS_WirelessliquidDetector_WaterLevel");
+                }
+            }
+            if (!ObjectUtils.isEmpty(unit) && "CM".equals(unit.get("unit")) || "cm".equals(unit.get("unit")) || "厘米".equals(unit.get("unit"))){
                 BigDecimal divide = new BigDecimal(100);
                 if (!ObjectUtils.isEmpty(record.get("nowLevel")) && !"--".equals(record.get("nowLevel"))){
                     BigDecimal nowLevel = new BigDecimal(String.valueOf(record.get("nowLevel")));
-                    record.put("nowLevel",nowLevel.divide(divide,2,BigDecimal.ROUND_HALF_UP));
+                    record.put("nowLevel", nowLevel.divide(divide, 2, BigDecimal.ROUND_HALF_UP));
                 }
                 if (!ObjectUtils.isEmpty(record.get("levelAbs")) && !"--".equals(record.get("nowLevel"))){
                     BigDecimal levelAbs = new BigDecimal(String.valueOf(record.get("levelAbs")));
-                    record.put("levelAbs",levelAbs.divide(divide,2,BigDecimal.ROUND_HALF_UP));
+                    record.put("levelAbs", levelAbs.divide(divide, 2, BigDecimal.ROUND_HALF_UP));
                 }
             }
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -632,7 +632,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
 
     String selectEquipSystemType(String code);
 
-    Map<String, Object> getWaterlevelUnit();
+    Map<String, Object> getWaterlevelUnit(@Param("equipmentSpecificId") String equipmentSpecificId, @Param("equipmentIndexKey") String equipmentIndexKey);
 
     Map<String, Object> getStationConnectStatus();
 

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

@@ -2381,7 +2381,7 @@
         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
         '--' ELSE IFNULL((
-        FORMAT(
+
         abs(
         IFNULL(
         max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel'  THEN ei.`value` END ),
@@ -2390,9 +2390,7 @@
         (
         IFNULL( rp.max_water_level, 0 ) = 0,
         1,
-        IFNULL( rp.max_water_level, 0 ))) * 100,
-        2
-        )
+        IFNULL( rp.max_water_level, 0 ))) * 100
         ),
         0
         )
@@ -2415,6 +2413,7 @@
         ec.image,
         r.resource_type,
         r.sequence_nbr,
+        rp.level_device_id,
         fs.`code` AS systemCode
         FROM
         cb_water_resource r
@@ -2453,7 +2452,7 @@
         WHEN IFNULL( a.minLevel, 0 ) > a.nowLevel
         AND a.maxLevel IS NULL THEN
         '--' ELSE IFNULL((
-        FORMAT(
+
         abs(
         IFNULL(
         a.nowLevel,
@@ -2462,9 +2461,7 @@
         (
         IFNULL( a.maxLevel, 0 ) = 0,
         1,
-        IFNULL( a.maxLevel, 0 ))) * 100,
-        2
-        )
+        IFNULL( a.maxLevel, 0 ))) * 100
         ),
         0
         )
@@ -2487,6 +2484,7 @@
         a.image,
         a.resource_type,
         a.sequence_nbr,
+        a.level_device_id,
         a.`code` AS systemCode
         FROM
         (
@@ -2496,7 +2494,7 @@
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
         (select
-        FORMAT(avg(IFNULL(ei.`value`,0)), 2)
+        avg(IFNULL(ei.`value`,0))
         from
         wl_equipment_specific_index ei
         where
@@ -5390,7 +5388,14 @@
 
 
     <select id="getWaterlevelUnit" resultType="java.util.Map">
-        SELECT unit FROM `wl_equipment_index`   WHERE  name_key = 'FHS_FirePoolDevice_WaterLevel'
+        SELECT
+            wes.unit
+        FROM
+            wl_equipment_specific_index wes
+        WHERE
+            wes.equipment_index_key = #{equipmentIndexKey}
+          AND wes.equipment_specific_id = #{equipmentSpecificId}
+            LIMIT 1
     </select>
 
     <select id="getStationConnectStatus" resultType="java.util.Map">