优化IMMEDIATELY_EXEC_TASK_TIME

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

@@ -419,8 +419,7 @@ public class JobMainTask {
                 try {
                     log.info(Color.CYAN + "[JOB] *********************chanType: {}, patrolPointId: {}" + Color.END, chanType, presetPos.getPatrolPointId());
                     if ("vl".equals(chanType)) {
-                        //String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true&code=" + presetPos.getChannelCode();
-                        String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true";
+                        String paramUrl = liveIVS_URL + "/api/v1/device/channelsnap?serial=" + presetPos.getVideoNvrCode() + "&realtime=true&code=" + presetPos.getChannelCode();
                         String paramFileName = taskPatrolId.split(StringUtils.UNDERLINE)[1] + StringUtils.UNDERLINE
                                 + taskPatrolId.split(StringUtils.UNDERLINE)[2] + StringUtils.UNDERLINE
                                 + presetPos.getPatrolPointId() + StringUtils.UNDERLINE
@@ -711,7 +710,7 @@ public class JobMainTask {
                 if (execRecordCounter == redisRecCnt) { // 最后一个record
                     resetRecordCounter();
                     resetRedisCurrentCode();
-                    redisService.deleteObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME);
+                    redisService.deleteObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, execRecord.getTaskCode());
                 }
             } else { // 该record下的点没有全部执行成功
                 //设置本record的执行状态为终止
@@ -732,7 +731,7 @@ public class JobMainTask {
                 if (execRecordCounter == redisRecCnt) {
                     resetRecordCounter();
                     resetRedisCurrentCode();
-                    redisService.deleteObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME);
+                    redisService.deleteObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, execRecord.getTaskCode());
                 }
             }
         }
@@ -849,7 +848,7 @@ public class JobMainTask {
         patrolTaskList.add(patrolTask);
         List<PatrolTask> cameraPatrolTasks = new ArrayList<>();
         assembleVideoTask(patrolTaskList, cameraPatrolTasks);
-        String redisImmediatelyExecTaskTime = redisService.getCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME);
+        String redisImmediatelyExecTaskTime = redisService.getCacheObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, patrolTask.getTaskCode());
         if (redisImmediatelyExecTaskTime != null) {
             log.info(Color.CYAN + "[JOB IMMEDIATE] IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime);
             return;
@@ -861,7 +860,7 @@ public class JobMainTask {
         }
 
         String immediatelyExecTaskTime = DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss, new Date());
-        redisService.setCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, immediatelyExecTaskTime);
+        redisService.setCacheObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, patrolTask.getTaskCode(), immediatelyExecTaskTime);
         log.info(Color.CYAN + "[JOB IMMEDIATE] TASK_CURRENT_CODE: {}, value: {}" + Color.END, RedisConst.TASK_CURRENT_CODE, RedisConst.TASK_CODE + patrolTask.getTaskCode() + StringUtils.AT + immediatelyExecTaskTime);
         redisService.setCacheObject(RedisConst.TASK_CURRENT_CODE, RedisConst.TASK_CODE + patrolTask.getTaskCode() + StringUtils.AT + immediatelyExecTaskTime);
         resetRecordCounter();

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

@@ -285,7 +285,7 @@ public class PatrolTaskExecController extends BaseController {
                 updateTaskExecRecord(TaskStatus.RUNNING.getCode(), execRecords);
             } else if (TaskStatus.HALTED.getCode().equals(state)) {
                 updateTaskExecRecord(TaskStatus.HALTED.getCode(), execRecords);
-                redisService.deleteObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME);
+                redisService.deleteObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, taskCode);
                 redisService.deleteObject(RedisConst.TASK_PATROL_STATE);
                 redisService.deleteObject(RedisConst.TASK_PATROL_ID);
 

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

@@ -128,12 +128,12 @@ public class PatrolTaskExecuteSchedulerController extends BaseController {
         String immediatelyExecTaskTime = "";
         Iterator iterator = cameraPatrolTasks.iterator();
         while (true) {
-            PatrolTask task;
+            PatrolTask task = null;
             while (true) {
                 do {
                     if (!iterator.hasNext()) {
                         if (immediatelyExecTaskTime != null && !immediatelyExecTaskTime.isEmpty()) {
-                            this.redisService.deleteObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME);
+                            this.redisService.deleteObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, task.getTaskCode());
                         }
 
                         return;
@@ -170,11 +170,11 @@ public class PatrolTaskExecuteSchedulerController extends BaseController {
 
             PatrolTaskExecRecord patrolTaskExecRecord = new PatrolTaskExecRecord();
             if (immediatelyExecTaskTime != null && !immediatelyExecTaskTime.isEmpty()) {
-                immediatelyExecTaskTime = this.redisService.getCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME);
+                immediatelyExecTaskTime = this.redisService.getCacheObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, task.getTaskCode());
             } else {
                 SimpleDateFormat sdfOld = new SimpleDateFormat("yyyyMMddHHmmss");
                 immediatelyExecTaskTime = sdfOld.format(new Date());
-                this.redisService.setCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, immediatelyExecTaskTime);
+                this.redisService.setCacheObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, task.getTaskCode(), immediatelyExecTaskTime);
             }
 
             Date time = task.getFixedStartTime();