Commit ba25aa32 authored by 李秀明's avatar 李秀明

fix: 水池液位趋势、CAFS水箱液位趋势-时间点未上报数据时则取上次上报的数据

parent 335fcc8c
...@@ -2583,6 +2583,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -2583,6 +2583,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
} }
List<Object> values = new ArrayList<>(); List<Object> values = new ArrayList<>();
BigDecimal lastNum = BigDecimal.ZERO;
for (int i = 0; i < allTimeList.size(); i++) { for (int i = 0; i < allTimeList.size(); i++) {
List<BigDecimal> orDefault = stringIntegerHashMap.getOrDefault(allTimeList.get(i), new ArrayList<>()); List<BigDecimal> orDefault = stringIntegerHashMap.getOrDefault(allTimeList.get(i), new ArrayList<>());
// 计算非空值的总和 // 计算非空值的总和
...@@ -2597,12 +2598,13 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -2597,12 +2598,13 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
BigDecimal divide; BigDecimal divide;
if (count == 0) { if (count == 0) {
// 如果非空值数量为0,可以选择返回0或其他默认值 // 如果非空值数量为0,可以选择返回0或其他默认值
divide = BigDecimal.ZERO; divide = lastNum;
} else { } else {
// 否则,进行除法运算 // 否则,进行除法运算
divide = sum.divide(new BigDecimal(count), 2, RoundingMode.HALF_UP); divide = sum.divide(new BigDecimal(count), 2, RoundingMode.HALF_UP);
} }
values.add(divide); values.add(divide);
lastNum = divide.compareTo(BigDecimal.ZERO) == 0 ? lastNum : divide;
} }
yaxisList.add(values); yaxisList.add(values);
} }
......
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