Commit bca8898f authored by 张森's avatar 张森

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

parent 229fbc39
...@@ -195,6 +195,10 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -195,6 +195,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
for (Map<String, Object> m : res) { for (Map<String, Object> m : res) {
Map<String, Object> transResult = UnitTransformUtil.transformValues(String.valueOf(m.get("nowLevel")), 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"))); 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")); m.put("nowLevel", transResult.get("nowValue"));
if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) { if (StringUtil.isNotEmpty(IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))))) {
m.put("levelStatus", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1()); m.put("levelStatus", IndexStatusEnum.getEnumByKey(String.valueOf(transResult.get("status"))).getDescribe1());
...@@ -226,6 +230,10 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -226,6 +230,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
} else { } else {
m.put("availableTime", "--"); m.put("availableTime", "--");
} }
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); return CommonResponseUtil.success(page1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment