Jelajahi Sumber

Merge branch 'fu-dev' of uskycloud/usky-modules into master

fuyuchuan 1 hari lalu
induk
melakukan
2c3c9df4f9

+ 8 - 3
service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/impl/IotDataTransferService.java

@@ -1017,7 +1017,12 @@ public class IotDataTransferService {
                     result = sendPersonPresence(transferVO);
                     break;
                 case 704:
-                    if (tenantId == 1205) break;
+                    if (tenantId == 1205) {
+                        // 设置默认值,避免空指针
+                        result.put("successCount", 0);
+                        result.put("failureCount", 0);
+                        break;
+                    }
                     result = sendElectricityLoad(transferVO);
                     break;
                 // case 712:
@@ -1036,8 +1041,8 @@ public class IotDataTransferService {
             }
 
             // 累加成功数和失败数
-            totalSuccessCount += result.get("successCount");
-            totalFailureCount += result.get("failureCount");
+            totalSuccessCount += result.getOrDefault("successCount", 0);
+            totalFailureCount += result.getOrDefault("failureCount", 0);
         }
 
         // 任务完成总结