29937 关键数据卡片接口开发

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java

@@ -6,10 +6,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
-import com.yeejoin.equipmanage.common.enums.EmergencyEquipTypeEnum;
-import com.yeejoin.equipmanage.common.enums.IndexStatusEnum;
-import com.yeejoin.equipmanage.common.enums.PressurePumpAnalysisEnum;
-import com.yeejoin.equipmanage.common.enums.PressurePumpRelateEnum;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.utils.UnitTransformUtil;
 import com.yeejoin.equipmanage.common.vo.IotDataVO;
@@ -116,6 +113,10 @@ public class EmergencyServiceImpl implements IEmergencyService {
             for (Map<String, Object> m : list) {
                 Map<String, Object> transResult = UnitTransformUtil.transformValues(String.valueOf(m.get("value")),
                         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("value")),
+                            String.valueOf(m.get("unit")), String.valueOf(m.get("volume")));
+                }
                 m.put("value", transResult.get("nowValue"));
                 if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
                     m.put("statusDesc", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
@@ -129,6 +130,11 @@ public class EmergencyServiceImpl implements IEmergencyService {
                 } else {
                     m.put("sxyl", 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 Optional.ofNullable(list).orElse(Lists.newArrayList());
@@ -158,6 +164,12 @@ public class EmergencyServiceImpl implements IEmergencyService {
                 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")));
 //                m.put("nowLevel", transResult.get("nowValue"));
+
+                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("volume")));
+                }
+
                 if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
                     m.put("status", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
                 } else {
@@ -170,6 +182,12 @@ public class EmergencyServiceImpl implements IEmergencyService {
                 } else {
                     m.put("abs", 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());
+                m.put("nowLevel", transResult.get("nowValue").toString());
+
             }
         }
         return page1;