更新索引--涉及任务下发、定时器修改、任务执行

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

@@ -206,16 +206,25 @@ public class JobService implements IJobService {
                     } else if (beginTime.getTime() < timestamp && endTime.getTime() > timestamp) {
                         log.error("项目初始化进行中监听器任务监控========");
                         ids = planTaskMapper.selectPlanTaskIdList(planTask.getPlanId(), PlanTaskFinishStatusEnum.NOTSTARTED.getValue());
-                        if(!ObjectUtils.isEmpty(ids)){
+                        if (!ObjectUtils.isEmpty(ids)) {
                             flag = true;
-                            // planTaskMapper.updatePlanTaskList(ids, PlanTaskFinishStatusEnum.UNDERWAY.getValue());
-                            updateEsPlanTaskList(ids, PlanTaskFinishStatusEnum.UNDERWAY.getValue());
+                            if (ids.size() > 10000) {
+                                int index = 10000;
+                                for (int i = 0; i < ids.size(); i += 10000) {
+                                    if (i + 10000 > ids.size()) {
+                                        index = ids.size() - i;
+                                    }
+                                    List<String> newList = ids.subList(i, i + index);
+                                    planTaskMapper.updatePlanTaskList(newList, PlanTaskFinishStatusEnum.UNDERWAY.getValue());
+                                    updateEsPlanTaskList(newList, PlanTaskFinishStatusEnum.UNDERWAY.getValue());
+                                }
+                            }
                         }
                         planTaskAddJob(planTask);
                     } else if (endTime.getTime() < timestamp) {
                         flag = true;
                         log.error("修改为漏检生成记录========");
-                       // updatePlanTaskAndDetailStatus(planTask);
+                        updatePlanTaskAndDetailStatus(planTask);
                     }
                 } else {
                     if (endTime.getTime() < timestamp) {
@@ -223,14 +232,25 @@ public class JobService implements IJobService {
                         ids = planTaskMapper.selectPlanTaskIdList(planTask.getPlanId(), PlanTaskFinishStatusEnum.NOTSTARTED.getValue());
                         if(!ObjectUtils.isEmpty(ids)){
                             flag = true;
-                            // planTaskMapper.updatePlanTaskList(ids, PlanTaskFinishStatusEnum.UNDERWAY.getValue());
-                            updateEsPlanTaskList(ids, PlanTaskFinishStatusEnum.UNDERWAY.getValue());
+                            if (!ObjectUtils.isEmpty(ids)) {
+                                if (ids.size() > 10000) {
+                                    int index = 10000;
+                                    for (int i = 0; i < ids.size(); i += 10000) {
+                                        if (i + 10000 > ids.size()) {
+                                            index = ids.size() - i;
+                                        }
+                                        List<String> newList = ids.subList(i, i + index);
+                                        planTaskMapper.updatePlanTaskList(newList, PlanTaskFinishStatusEnum.UNDERWAY.getValue());
+                                        updateEsPlanTaskList(newList, PlanTaskFinishStatusEnum.UNDERWAY.getValue());
+                                    }
+                                }
+                            }
                         }
                         planTaskAddJob(planTask);
                     } else {
                         flag = true;
                         log.error("修改为漏检生成记录2222========");
-                        // updatePlanTaskAndDetailStatus(planTask);
+                        updatePlanTaskAndDetailStatus(planTask);
                     }
                 }
             } catch (ParseException e) {
@@ -280,7 +300,9 @@ public class JobService implements IJobService {
         planTaskMapper.updatePlanTaskList(esIds, PlanTaskFinishStatusEnum.OVERTIME.getValue());
         List<Long> ids = new ArrayList<>();
         ids.add(planTask.getId());
-        planTaskMapper.updatePlanTaskDetailsByPlanId(ids);
+        if(!ValidationUtil.isEmpty(ids)){
+            planTaskMapper.updatePlanTaskDetailsByPlanId(ids);
+        }
         updateEsPlanTaskList(esIds, PlanTaskFinishStatusEnum.OVERTIME.getValue());
         createOmissionCheckRecord(planTask);
     }