Commit b302eb44 authored by zhangsen's avatar zhangsen

23659关键数据----液位数值根据现场采集的单位设置灵活转换

parent fa58127e
...@@ -149,6 +149,7 @@ public class UnitTransformUtil { ...@@ -149,6 +149,7 @@ public class UnitTransformUtil {
map.put("abs", "--"); map.put("abs", "--");
} }
} }
map.put("unit", "M");
return map; return map;
} }
} }
...@@ -149,7 +149,9 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -149,7 +149,9 @@ public class SupervisionConfigureController extends AbstractBaseController {
m.put("levelStatus", "--"); m.put("levelStatus", "--");
} }
m.put("levelAbs", transResult.get("abs")); m.put("levelAbs", transResult.get("abs"));
if (transResult.containsKey("unit")) {
m.put("unit", transResult.get("unit"));
}
// 计算可使用时间:储水量(L) / 出口流量(L/s), 单位为小时 // 计算可使用时间:储水量(L) / 出口流量(L/s), 单位为小时
BigDecimal levelAbsLiter = new BigDecimal(0); // 储水量(升) BigDecimal levelAbsLiter = new BigDecimal(0); // 储水量(升)
BigDecimal volume = new BigDecimal(0); BigDecimal volume = new BigDecimal(0);
......
...@@ -5067,7 +5067,7 @@ ...@@ -5067,7 +5067,7 @@
a.id, a.id,
a.name, a.name,
IFNULL( a.image, '' ) AS image, IFNULL( a.image, '' ) AS image,
'M' AS unit, a.unit AS unit,
IFNULL( a.nowLevel, '--' ) AS nowLevel, IFNULL( a.nowLevel, '--' ) AS nowLevel,
a.minLevel AS minLevel, a.minLevel AS minLevel,
a.maxLevel AS maxLevel, a.maxLevel AS maxLevel,
......
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