运行记录

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

@@ -93,7 +93,7 @@ public class IotOpeationFillController {
             }
         }
         for (IotOpeationFillSaveReqVO totalRun:fillList) {
-            if(totalRun.getPointName().equals("累计运转时间")||totalRun.getPointName().equals("累计运行时间")){
+            if((totalRun.getPointName().equals("累计运转时间")||totalRun.getPointName().equals("累计运行时间"))&&totalRun.getIsCollection()==0){
                 double total = Double.parseDouble(fillContent);
                 totalRun.setTotalRunTime(BigDecimal.valueOf(total).add(totalRun.getTotalRunTime()));
                 break;
@@ -114,6 +114,36 @@ public class IotOpeationFillController {
             }
         }
 
+        fillContent = null;
+        for (IotOpeationFillSaveReqVO dayilyKm:fillList) {
+            if(dayilyKm.getPointName().equals("当日公里数")){
+                fillContent = dayilyKm.getFillContent();
+                break;
+            }
+        }
+        for (IotOpeationFillSaveReqVO totalKm:fillList) {
+            if(totalKm.getPointName().equals("累计公里数")&&totalKm.getIsCollection()==0){
+                double total = Double.parseDouble(fillContent);
+                totalKm.setTotalRunTime(BigDecimal.valueOf(total).add(totalKm.getTotalRunTime()));
+                break;
+            }
+        }
+
+        fillContent = null;
+        for (IotOpeationFillSaveReqVO dayilyDl:fillList) {
+            if(dayilyDl.getPointName().equals("当日用电量")){
+                fillContent = dayilyDl.getFillContent();
+                break;
+            }
+        }
+        for (IotOpeationFillSaveReqVO totalDl:fillList) {
+            if(totalDl.getPointName().equals("累计用电量")&&totalDl.getIsCollection()==0){
+                double total = Double.parseDouble(fillContent);
+                totalDl.setTotalRunTime(BigDecimal.valueOf(total).add(totalDl.getTotalRunTime()));
+                break;
+            }
+        }
+
         List< IotDeviceRunLogDO > logDO = new ArrayList<>();
 
         for (IotOpeationFillSaveReqVO fill:fillList) {