定时任务修改

inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java

@@ -1557,52 +1557,53 @@ public class JobMainTask {
     @SuppressWarnings({"unused"})
     public void execEveryDayTask(List<PatrolTask> patrolTaskList) {
         log.info("***************************** JobTaskTimer execEveryDayTask with parameters *************************************");
-        List<PatrolTaskInfo> taskInfos = new ArrayList<>();
         for (PatrolTask patrolTask : patrolTaskList) {
+            List<PatrolTaskInfo> taskInfos = new ArrayList<>();
             String[] devTypes = patrolTask.getDevType().split(StringUtils.COMMA);
             String[] devNos = patrolTask.getDevNo().split(StringUtils.COMMA);
             for (int i = 0; i < devNos.length; ++i) {
                 List<PatrolTaskInfo> infosByRecord = getInfosByRecord(PatrolTaskExecRecord.builder().devNo(devNos[i]).taskId(patrolTask.getTaskId()).build());
                 taskInfos.addAll(infosByRecord);
             }
+            log.info("execEveryDayTask taskInfos size: {}", taskInfos.size());
+            log.info("execEveryDayTask patrolTask: {}", patrolTask);
+            final String taskPatrolId = getTaskPatrolId(patrolTask);
+            final String oldTaskPatrolId = getOldTaskPatrolId(patrolTask);
+            log.info(Color.YELLOW + "[JOB] NEW EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId);
+            setRedisRecordCount(patrolTaskList.get(0).getTaskCode(), patrolTaskList.size());
+            PatrolTaskExecRecord patrolTaskExecRecord = PatrolTaskExecRecord.builder()
+                    .taskPatrolId(taskPatrolId)
+                    .oldTaskPatrolId(oldTaskPatrolId)
+                    .taskName(patrolTask.getTaskName())
+                    .taskCode(patrolTask.getTaskCode())
+                    .taskState(TaskStatus.RUNNING.getCode())
+                    .planStartTime(patrolTask.getCycleStartTime())
+                    .startTime(new Date())
+                    .taskProgress("0")
+                    .endTime(patrolTask.getCycleEndTime())
+                    .description("")
+                    .devNo(patrolTask.getDevNo().split(StringUtils.COMMA)[0])
+                    .taskType(patrolTask.getType())
+                    .taskPriority(patrolTask.getPriority())
+                    .taskId(patrolTask.getTaskId())
+                    .stationName(patrolTask.getStationName())
+                    .stationCode(patrolTask.getStationCode())
+                    .deviceId("0")
+                    .execPointId(0L)
+                    .totalNumber(taskInfos.isEmpty() ? 1 : taskInfos.size())
+                    .build();
+            try {
+                taskExecClient.addPatrolTaskExecRecord(patrolTaskExecRecord);
+                taskExecClient.updatePatrolTaskStatus(patrolTask);
+            } catch (Exception e) {
+                log.error("error", e);
+            }
+            threadPool.submit(() -> {
+                log.info(Color.YELLOW + "[JOB] THREAD START devNo: {}, taskId: {}" + Color.END, patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId());
+                prePointExecImmediate(patrolTaskExecRecord, taskInfos);
+                log.info(Color.YELLOW + "[JOB] THREAD END devNo: {}, taskId: {}" + Color.END, patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId());
+            });
         }
-        log.info("patrolTaskList.get(0): {}", patrolTaskList.get(0));
-        final String taskPatrolId = getTaskPatrolId(patrolTaskList.get(0));
-        final String oldTaskPatrolId = getOldTaskPatrolId(patrolTaskList.get(0));
-        log.info(Color.YELLOW + "[JOB] NEW EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId);
-        setRedisRecordCount(patrolTaskList.get(0).getTaskCode(), patrolTaskList.size());
-        PatrolTaskExecRecord patrolTaskExecRecord = PatrolTaskExecRecord.builder()
-                .taskPatrolId(taskPatrolId)
-                .oldTaskPatrolId(oldTaskPatrolId)
-                .taskName(patrolTaskList.get(0).getTaskName())
-                .taskCode(patrolTaskList.get(0).getTaskCode())
-                .taskState(TaskStatus.RUNNING.getCode())
-                .planStartTime(patrolTaskList.get(0).getCycleStartTime())
-                .startTime(new Date())
-                .taskProgress("0")
-                .endTime(patrolTaskList.get(0).getCycleEndTime())
-                .description("")
-                .devNo(patrolTaskList.get(0).getDevNo().split(StringUtils.COMMA)[0])
-                .taskType(patrolTaskList.get(0).getType())
-                .taskPriority(patrolTaskList.get(0).getPriority())
-                .taskId(patrolTaskList.get(0).getTaskId())
-                .stationName(patrolTaskList.get(0).getStationName())
-                .stationCode(patrolTaskList.get(0).getStationCode())
-                .deviceId("0")
-                .execPointId(0L)
-                .totalNumber(taskInfos.isEmpty() ? 1 : taskInfos.size())
-                .build();
-        try {
-            taskExecClient.addPatrolTaskExecRecord(patrolTaskExecRecord);
-            taskExecClient.updatePatrolTaskStatus(patrolTaskList.get(0));
-        } catch (Exception e) {
-            log.error("error", e);
-        }
-        threadPool.submit(() -> {
-            log.info(Color.YELLOW + "[JOB] THREAD START devNo: {}, taskId: {}" + Color.END, patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId());
-            prePointExecImmediate(patrolTaskExecRecord, taskInfos);
-            log.info(Color.YELLOW + "[JOB] THREAD END devNo: {}, taskId: {}" + Color.END, patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId());
-        });
     }
 
 //    private void incrementRedisRecordCounter() {

inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java

@@ -492,8 +492,7 @@ public class PatrolTaskExecController extends BaseController {
                             PatrolTaskExecRecord taskExecRecord = patrolTaskExecRecordService.selectPatrolTaskExecRecordByTaskPatrolId(devNos[0] + "_" + task.getTaskCode() + "_" + DateUtils.format(DateUtils.yyyyMMddHHmmss, task.getFixedStartTime()));
                             String key = RedisConst.TASK_CODE + task.getTaskCode() + StringUtils.AT + DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getFixedStartTime());
                             //log.info("[GABRIEL] key6: {}", key);
-                            String redisValue = redisService.getCacheObject(key);
-                            if (taskExecRecord == null && StringUtils.isEmpty(redisValue)) {
+                            if (taskExecRecord == null) {
                                 redisService.setCacheObject(key, JSONArray.toJSONString(patrolTasks));
                             }
                         }
@@ -578,8 +577,7 @@ public class PatrolTaskExecController extends BaseController {
             log.debug(Color.GREEN + "[TASK] TYPE: {}, DETACH PATROLLED ID: {}" + Color.END, taskType, taskPatrolledId);
             PatrolTaskExecRecord taskExecRecord
                     = patrolTaskExecRecordService.selectPatrolTaskExecRecordByTaskPatrolId(taskPatrolledId);
-            String redisValue = redisService.getCacheObject(key);
-            if (taskExecRecord == null && StringUtils.isEmpty(redisValue)) {
+            if (taskExecRecord == null) {
                 List<PatrolTask> patrolTasks = getPatrolTasks(task);
                 if (!patrolTasks.isEmpty()) {
                     logger.info(Color.GREEN + "[TASK] TYPE: {}, CYCLE BY WEEK key: {}, patrolId: {}" + Color.END, taskType, key, taskPatrolledId);