cafs水箱 泡沫罐相关问题修改

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

@@ -10,6 +10,7 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.FormInstanceEquip;
 import com.yeejoin.equipmanage.common.entity.vo.EquipTrendResultVo;
 import com.yeejoin.equipmanage.common.enums.IndexStatusEnum;
+import com.yeejoin.equipmanage.common.enums.UnitEnum;
 import com.yeejoin.equipmanage.common.utils.*;
 import com.yeejoin.equipmanage.config.PersonIdentify;
 import com.yeejoin.equipmanage.fegin.IotFeign;
@@ -249,6 +250,12 @@ public class SupervisionConfigureController extends AbstractBaseController {
             for (Map<String, Object> m : res) {
                 Map<String, Object> transResult = UnitTransformUtil.transformValues(String.valueOf(m.get("nowLevel")),
                         String.valueOf(m.get("unit")), String.valueOf(m.get("minLevel")), String.valueOf(m.get("maxLevel")));
+
+                if (UnitEnum.LFM.getKey().equalsIgnoreCase(String.valueOf(m.get("unit"))) || UnitEnum.LFM.getName().equals(String.valueOf(m.get("unit")))) {
+                    transResult = UnitTransformUtil.transformValuesLFM(String.valueOf(m.get("nowLevel")),
+                            String.valueOf(m.get("unit")), String.valueOf(m.get("minLevel")), String.valueOf(m.get("maxLevel")));
+                }
+
                 m.put("nowLevel", transResult.get("nowValue"));
                 if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
                     m.put("levelStatus", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
@@ -256,6 +263,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
                     m.put("levelStatus", "--");
                 }
                 m.put("levelAbs", transResult.get("abs"));
+                if (UnitEnum.LFM.getKey().equalsIgnoreCase(String.valueOf(m.get("unit"))) || UnitEnum.LFM.getName().equals(String.valueOf(m.get("unit")))) {
+                    m.put("abs", transResult.get("abs") + "%");
+                }
+                m.put("unit", transResult.get("unit").toString());
             }
         }
         return CommonResponseUtil.success(page1);

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

@@ -3029,20 +3029,18 @@
             <if test="code == '92011000'">
                 max( CASE WHEN b.field_name = 'maxPressure' THEN b.field_value END ) AS maxNum,
                 max( CASE WHEN b.field_name = 'minPressure' THEN b.field_value END ) AS minNum,
-                concat('压力(', ifnull(c.unit, 'Mpa'), ')') as unit
+                ifnull(c.unit, 'Mpa') as unit
             </if>
             <if test="(code == '92032000' and indexKey == 'CAFS_WaterTank_WaterTankLevel') or (code == '92031900')">
                 max( CASE WHEN b.field_name = 'maxLevel' THEN b.field_value END ) AS maxNum,
                 max( CASE WHEN b.field_name = 'minLevel' THEN b.field_value END ) AS minNum,
-                concat('液位(', ifnull(c.unit, 'M'), ')') as unit
+                ifnull(c.unit, 'M') as unit
             </if>
             <if test="code == '92032000' and indexKey == 'CAFS_WaterTank_EffluentFlow'">
-                max( CASE WHEN b.field_name = 'maxLevel' THEN b.field_value END ) AS maxNum,
-                max( CASE WHEN b.field_name = 'minLevel' THEN b.field_value END ) AS minNum,
-                concat('出口流量(', ifnull(c.unit, 'L/S'), ')') as unit
+                ifnull(c.unit, 'L/S') as unit
             </if>
             <if test="code == '92010800'">
-                '频次(次/小时)' as unit
+                '次/小时' as unit
             </if>
         FROM
             `wl_equipment_specific` AS a
@@ -3066,7 +3064,7 @@
         GROUP_CONCAT( c.iot_code ) AS iotCode,
         b.min_water_level AS minNum,
         b.max_water_level AS maxNum,
-        '液位(M)' AS unit
+        'M' AS unit
         FROM
         `cb_water_resource` AS a
         LEFT JOIN cb_water_resource_pool b ON a.sequence_nbr = b.resource_id