1.代码整理

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1662,39 +1662,33 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         publisher.publish(new CheckRecordInsertEvent(this,dataDto));
     }
 
-
     private void saveMustData(List<ESTaskDetailDto> esTaskDetailDtos, List<ESPlanTaskListDto> esPlanTaskListDtos, List<PlanTask> planTasks) {
         // 保存es数据
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-        CompletableFuture<Void> future1 = CompletableFuture.runAsync(() -> {
-            try{
+        CompletableFuture<Void> future1 = CompletableFuture.runAsync(() -> saveTasks(esTaskDetailDtos), asyncServiceExecutor);
+        CompletableFuture<Void> future2 = CompletableFuture.runAsync(() -> savePlanTasks(esPlanTaskListDtos), asyncServiceExecutor);
+        // 更新统计数据表
+        CompletableFuture<Void> future3 = CompletableFuture.runAsync(() -> updateStaticTable(planTasks), asyncServiceExecutor);
+        CompletableFuture<Void> allOfFuture = CompletableFuture.allOf(future1, future2, future3);
+        allOfFuture.join();
+    }
+
+    private void saveTasks(List<ESTaskDetailDto> esTaskDetailDtos) {
+        try {
             esTaskDetail.saveAll(esTaskDetailDtos);
         } catch (Exception e) {
-                log.error(e.getMessage(),e);
+            log.error(e.getMessage(), e);
         }
-        }, asyncServiceExecutor);
-        CompletableFuture<Void> future2 = CompletableFuture.runAsync(() -> {
-            try{
-                esPlanTaskList.saveAll(esPlanTaskListDtos);
-            } catch (Exception e) {
-                log.error(e.getMessage(),e);
     }
-        }, asyncServiceExecutor);
-        // 更新统计数据表
-        CompletableFuture<Void> future3 = CompletableFuture.runAsync(() -> {
-            try{
-                this.updateStaticTable(planTasks);
+
+    private void savePlanTasks(List<ESPlanTaskListDto> esPlanTaskListDtos) {
+        try {
+            esPlanTaskList.saveAll(esPlanTaskListDtos);
         } catch (Exception e) {
-                log.error(e.getMessage(),e);
+            log.error(e.getMessage(), e);
         }
-        }, asyncServiceExecutor);
-        futures.add(future1);
-        futures.add(future2);
-        futures.add(future3);
-        CompletableFuture<Void> allOfFuture = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
-        allOfFuture.join();
     }
 
+
     private void updateStaticTable(List<PlanTask> planTasks) {
         List<StaticTableUpdateDto> staticTableUpdateDtos = planTasks.stream().map(planTask -> {
             StaticTableUpdateDto updateDto = new StaticTableUpdateDto();