1.代码恢复到第一个版本

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -235,7 +235,7 @@ public class CheckController extends AbstractBaseController {
         String userId = RequestContext.getExeUserId();
         try {
             UserTransmittableUtils.setUser();
-            planTaskService.handleAllBatch2(ids, userId);
+            planTaskService.handleAllBatch(ids, userId);
         } catch (Exception e) {
             return ResponseHelperUtil.buildErrorResponse("提交失败:"+e.getMessage());
         } finally {
@@ -246,12 +246,12 @@ public class CheckController extends AbstractBaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "一键提交巡检任务", notes = "一键提交巡检任务<font color='blue'>手机app</font>")
-    @RequestMapping(value = "/saveRecordAll1", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    @RequestMapping(value = "/saveRecordAll2", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public ResponseModel<Object> saveCheckRecordAll1(@RequestParam String ids) {
         String userId = RequestContext.getExeUserId();
         try {
             UserTransmittableUtils.setUser();
-            planTaskService.handleAllBatch(ids, userId);
+            planTaskService.handleAllBatch2(ids, userId);
         } catch (Exception e) {
             return ResponseHelperUtil.buildErrorResponse("提交失败:"+e.getMessage());
         } finally {

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ESPlanTaskList.java

@@ -2,13 +2,14 @@ package com.yeejoin.amos.patrol.business.dao.repository;
 
 
 import com.yeejoin.amos.patrol.dao.entity.ESPlanTaskListDto;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-public interface ESPlanTaskList extends PagingAndSortingRepository<ESPlanTaskListDto, String> {
+public interface ESPlanTaskList extends ElasticsearchRepository<ESPlanTaskListDto, String> {
 
     List<ESPlanTaskListDto> findAllByPlanTaskIdIn(List<String> planTaskIds);
 }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/ESTaskDetail.java

@@ -2,13 +2,13 @@ package com.yeejoin.amos.patrol.business.dao.repository;
 
 
 import com.yeejoin.amos.patrol.dao.entity.ESTaskDetailDto;
-import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-public interface ESTaskDetail extends PagingAndSortingRepository<ESTaskDetailDto, String> {
+public interface ESTaskDetail extends ElasticsearchRepository<ESTaskDetailDto, String> {
 
     List<ESTaskDetailDto> findAllByPlanTaskIdIn(List<String> planTaskIds);
 }

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

@@ -13,7 +13,6 @@ import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.component.rule.RuleTrigger;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -41,7 +40,6 @@ import com.yeejoin.amos.patrol.business.util.PlanTaskUtil;
 import com.yeejoin.amos.patrol.business.util.WordTemplateUtils;
 import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.common.enums.*;
-import com.yeejoin.amos.patrol.core.async.AsyncTask;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.response.AppCheckInputRespone;
 import com.yeejoin.amos.patrol.core.common.response.AppPointCheckRespone;
@@ -1724,9 +1722,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         // 2.数组准备：查询未完成状态的任务明细及更新状态
         CompletableFuture<List<PlanTaskDetail>> planTaskDetailsFuture = CompletableFuture.supplyAsync(() -> planTaskDetailMapper.findAllByIdInAndStatus(planTaskIdsList, PlanTaskDetailStatusEnum.NOTSTARTED.getValue()), asyncServiceExecutor);
         // 3.数组准备: es存储数据组装1
-        CompletableFuture<List<ESTaskDetailDto>> allESTaskDetailDtosFuture = CompletableFuture.supplyAsync(() -> esTaskDetail.findAllByPlanTaskIdIn(planTaskIdsList.stream().map(String::valueOf).collect(Collectors.toList())), asyncServiceExecutor);
+        CompletableFuture<List<ESTaskDetailDto>> allESTaskDetailDtosFuture = CompletableFuture.supplyAsync(() -> this.queryTaskDetailEs(planTaskIds), asyncServiceExecutor);
         // 4.数组准备: es存储数据组装2
-        CompletableFuture<List<ESPlanTaskListDto>> esPlanTaskListDtosFuture = CompletableFuture.supplyAsync(() -> esPlanTaskList.findAllByPlanTaskIdIn(planTaskIdsList.stream().map(String::valueOf).collect(Collectors.toList())), asyncServiceExecutor);
+        CompletableFuture<List<ESPlanTaskListDto>> esPlanTaskListDtosFuture = CompletableFuture.supplyAsync(() -> this.queryTaskListEs(planTaskIds), asyncServiceExecutor);
+        CompletableFuture.allOf(allESTaskDetailDtosFuture, esPlanTaskListDtosFuture).join();
         CompletableFuture.allOf(planTasksFuture, planTaskDetailsFuture, allESTaskDetailDtosFuture, esPlanTaskListDtosFuture).join();
         List<PlanTask> planTasks = planTasksFuture.join();
         List<PlanTaskDetail> planTaskDetails = planTaskDetailsFuture.join();
@@ -1739,6 +1738,22 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         this.sendInsertMessage(planTasks, planTaskDetails);
     }
 
+    private List<ESPlanTaskListDto> queryTaskListEs(String planTaskIds) {
+        List<ESPlanTaskListDto> esPlanTaskListDtos = new ArrayList<>();
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        boolMust.must(QueryBuilders.termsQuery("planTaskId",planTaskIds.split(",")));
+        esPlanTaskList.search(boolMust).forEach(esPlanTaskListDtos::add);
+        return esPlanTaskListDtos;
+    }
+
+    private List<ESTaskDetailDto> queryTaskDetailEs(String planTaskIds) {
+        List<ESTaskDetailDto> esTaskDetailDtos = new ArrayList<>();
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        boolMust.must(QueryBuilders.termsQuery("planTaskId",planTaskIds.split(",")));
+        esTaskDetail.search(boolMust).forEach(esTaskDetailDtos::add);
+        return esTaskDetailDtos;
+    }
+
     private void finshPlanTask(List<PlanTask> planTasks, List<PlanTaskDetail> planTaskDetails) {
         planTasks.forEach(planTask -> {
             planTask.setFinishStatus(XJConstant.TASK_STATUS_FINISH);