Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 4907e949 authored by maoying's avatar maoying
Browse files
Options

合并解决冲突

parents b2908f6a e08511b6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @ 4907e949
...@@ -1422,7 +1422,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService { ...@@ -1422,7 +1422,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
} }
Object value = redisTemplate.opsForValue().get("WaterLevel:Value:" + iotCode); Object value = redisTemplate.opsForValue().get("WaterLevel:Value:" + iotCode);
if (StringUtil.isNotEmpty(value)) { if (StringUtil.isNotEmpty(value)) {
maxlevel = map.getMaxLevel() != null ? map.getMaxLevel() : value.toString(); maxlevel = value.toString();
volume = map.getVolume() != null && StringUtil.isNumeric(map.getVolume()) ? String.format("%.2f", (Double.valueOf(map.getVolume()))) : String.format("%.2f", Double.valueOf(value.toString()) * area); volume = map.getVolume() != null && StringUtil.isNumeric(map.getVolume()) ? String.format("%.2f", (Double.valueOf(map.getVolume()))) : String.format("%.2f", Double.valueOf(value.toString()) * area);
} else { } else {
maxlevel = map.getMaxLevel() != null ? map.getMaxLevel() : "0.0"; maxlevel = map.getMaxLevel() != null ? map.getMaxLevel() : "0.0";
......
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