Ver Fonte

运行记录1224-打印运行记录保存2

yuanchao há 5 dias atrás
pai
commit
de8c0b3edb

+ 11 - 13
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotopeationfill/IotOpeationFillController.java

@@ -442,19 +442,17 @@ public class IotOpeationFillController {
                 BigDecimal total = BigDecimal.ZERO;
                 for (IotOpeationFillSaveReqVO targetFill : targetFills) {
                     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());