|
@@ -442,19 +442,17 @@ public class IotOpeationFillController {
|
|
|
BigDecimal total = BigDecimal.ZERO;
|
|
BigDecimal total = BigDecimal.ZERO;
|
|
|
for (IotOpeationFillSaveReqVO targetFill : targetFills) {
|
|
for (IotOpeationFillSaveReqVO targetFill : targetFills) {
|
|
|
BigDecimal currentValue = new BigDecimal(targetFill.getFillContent());
|
|
BigDecimal currentValue = new BigDecimal(targetFill.getFillContent());
|
|
|
- if (fill.getSumId() == 1) {
|
|
|
|
|
- // 累加:从缓存获取历史最大值
|
|
|
|
|
- String key = fill.getDeviceId() + "_" + fill.getPointName();
|
|
|
|
|
- System.out.println("设备信息:-------"+key);
|
|
|
|
|
- BigDecimal maxHistory = maxDataMap.getOrDefault(key, BigDecimal.ZERO);
|
|
|
|
|
- System.out.println("maxHistory:-------"+maxHistory.toString());
|
|
|
|
|
- if(maxHistory!=null) {
|
|
|
|
|
- total = maxHistory.add(currentValue);
|
|
|
|
|
- System.out.println("total:-------"+total.toString());
|
|
|
|
|
- }else{
|
|
|
|
|
- total = fill.getTotalRunTime().add(new BigDecimal(fill.getFillContent()));
|
|
|
|
|
- System.out.println("total1:-------"+total.toString());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // 累加:从缓存获取历史最大值
|
|
|
|
|
+ String key = fill.getDeviceId() + "_" + fill.getPointName();
|
|
|
|
|
+ System.out.println("设备信息:-------"+key);
|
|
|
|
|
+ BigDecimal maxHistory = maxDataMap.getOrDefault(key, BigDecimal.ZERO);
|
|
|
|
|
+ System.out.println("maxHistory:-------"+maxHistory.toString());
|
|
|
|
|
+ if(maxHistory!=null) {
|
|
|
|
|
+ total = maxHistory.add(currentValue);
|
|
|
|
|
+ System.out.println("total:-------"+total.toString());
|
|
|
|
|
+ }else{
|
|
|
|
|
+ total = fill.getTotalRunTime().add(new BigDecimal(fill.getFillContent()));
|
|
|
|
|
+ System.out.println("total1:-------"+total.toString());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
System.out.println("finalTotal:-------"+total.toString());
|
|
System.out.println("finalTotal:-------"+total.toString());
|