Commit 825b6c21 authored by 张森's avatar 张森

31185 站端设备平台v5>运行趋势>运行监视>水箱液位趋势,液位值查询错误

parent a41fb46f
...@@ -2569,15 +2569,19 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -2569,15 +2569,19 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
for (Map<String, String> mapList : listObject) { for (Map<String, String> mapList : listObject) {
String time = change(mapList.get("time")); String time = change(mapList.get("time"));
String dateX = roundToNextFiveMinutes(time); String dateX = roundToNextFiveMinutes(time);
if (stringIntegerHashMap.containsKey(dateX)){
for (String key : equipIndexKeyNew) { for (String key : equipIndexKeyNew) {
if (mapList.containsKey(key) && !ObjectUtils.isEmpty(mapList.get(key))) { if (mapList.containsKey(key) && !ObjectUtils.isEmpty(mapList.get(key))) {
if (stringIntegerHashMap.containsKey(dateX)) {
stringIntegerHashMap.get(dateX).add(new BigDecimal(mapList.get(key))); stringIntegerHashMap.get(dateX).add(new BigDecimal(mapList.get(key)));
} else {
List<BigDecimal> bigDecimals = new ArrayList<>();
bigDecimals.add(new BigDecimal(mapList.get(key)));
stringIntegerHashMap.put(dateX, bigDecimals);
} }
} }
} else {
stringIntegerHashMap.put(dateX, new ArrayList<>());
} }
} }
} }
} }
......
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