Browse Source

1.拆分basic定时任务

WoNiu 4 years ago
parent
commit
a9c24b0e55

+ 1 - 0
src/main/java/com/galaxis/manatee/task/ChuanyunProjectScheduledTask.java

@@ -266,6 +266,7 @@ public class ChuanyunProjectScheduledTask {
                 e.printStackTrace();
             }
         });
+        log.info("项目工时汇总更新完成"+list1.size());
     }
 
     /**

+ 6 - 2
src/main/java/com/galaxis/manatee/task/EquipmentInfoTask.java

@@ -54,6 +54,7 @@ public class EquipmentInfoTask {
      */
     private void saveDeviceInfo(){
         var objectMapper=new ObjectMapper();
+        var totalCount=0L;
         var page = 1;
         var size = 20;
         var flag=true;
@@ -62,6 +63,7 @@ public class EquipmentInfoTask {
             map.put("page",String.valueOf(page));
             map.put("size",String.valueOf(size));
             PageDTO<ChuanyunDeviceDTO> pageInfo=clawFeign.findChuanyunDevice(map);
+            totalCount=pageInfo.getTotalElements();
             if (page<=pageInfo.getTotalPages()){
                 page += 1;
             }else {
@@ -115,8 +117,8 @@ public class EquipmentInfoTask {
                     e.printStackTrace();
                 }
             });
-            log.info("设备信息完成更新"+pageInfo.getTotalElements());
         }
+        log.info("设备信息完成更更新"+totalCount);
     }
 
     /**
@@ -124,6 +126,7 @@ public class EquipmentInfoTask {
      */
     private void saveDeviceConfigure(){
         var objectMapper=new ObjectMapper();
+        var totalCount=0L;
         var page = 1;
         var size = 20;
         var flag=true;
@@ -132,6 +135,7 @@ public class EquipmentInfoTask {
             map.put("page",String.valueOf(page));
             map.put("size",String.valueOf(size));
             PageDTO<ChuanyunDeviceConfigureDTO> pageInfo=clawFeign.findChuanyunDeviceConfigure(map);
+            totalCount=pageInfo.getTotalElements();
             if (page<=pageInfo.getTotalPages()){
                 page += 1;
             }else {
@@ -173,8 +177,8 @@ public class EquipmentInfoTask {
                     e.printStackTrace();
                 }
             });
-            log.info("设备配置信息完成更新"+pageInfo.getTotalElements());
         }
+        log.info("设备配置信息完成更新"+totalCount);
     }
 
     @Data