多任务执行优化

inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java

@@ -1,13 +1,12 @@
 package com.inspect.base.core.constant;
 
 public class RedisConst {
-    public static final String TASK_PATROL_STOP = "PATROL_TASK_STOP";//没有获取该key的地方
     public static final String TASK_CODE_EX = "TASK_CODE@*";//查询匹配用
 
-    public static final String TASK_PATROL_ID = "TASK_PATROL_ID";//已经和taskcode关联
     public static final String TASK_CODE = "TASK_CODE@";//已经和taskcode关联
     public static final String REQUEST_UUID = "REQUEST_UUID@";//已经和uuid关联
 
+    public static final String TASK_PATROL_ID = "TASK_PATROL_ID";
     public static final String TASK_PATROL_STATE = "TASK_PATROL_STATE";
     public static final String TASK_RECORD_CNT = "TASK_RECORD_CNT";
     public static final String TASK_CURRENT_CODE = "TASK_CURRENT_CODE@";

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

@@ -370,10 +370,10 @@ public class JobMainTask {
 //                .patrolDeviceCode(patrolTaskInfo.getDevNo())
                 .isEnable("1")
                 .build();
-        log.info(Color.RED + "[JOB] prePointExec, info, deviceId= {}, devNo= {}, patrolPresetPos={}" + Color.END, patrolTaskInfo.getDeviceId(), patrolTaskInfo.getDevNo(), patrolPresetPos);
+        log.info(Color.CYAN + "[JOB] prePointExec, info, deviceId= {}, devNo= {}, patrolPresetPos={}" + Color.END, patrolTaskInfo.getDeviceId(), patrolTaskInfo.getDevNo(), patrolPresetPos);
         List<PatrolPresetPos> presetPosList = taskExecClient.selectPatrolPresetPosList(patrolPresetPos);
 
-        log.info(Color.RED + "[JOB] prePointExec, presetPosList size= {}" + Color.END, presetPosList.size());
+        log.info(Color.CYAN + "[JOB] prePointExec, presetPosList size= {}" + Color.END, presetPosList.size());
         PatrolPresetPos presetPos = !presetPosList.isEmpty() ? presetPosList.get(0) : PatrolPresetPos.builder().presetPosId("0").build();
         String taskPatrolId = taskExecRecord.getTaskPatrolId();
         log.info("[JOB] PRE POS size: {}, pointId: {}, deviceCode: {}, patrolId: {}", presetPosList.size(), patrolTaskInfo.getDeviceId(), patrolTaskInfo.getDevNo(), taskPatrolId);
@@ -732,6 +732,7 @@ public class JobMainTask {
                 if (execRecordCounter == redisRecCnt) {
                     resetRecordCounter();
                     resetRedisCurrentCode();
+                    redisService.deleteObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME);
                 }
             }
         }

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

@@ -335,11 +335,6 @@ public class PatrolTaskExecController extends BaseController {
 
         execRecord.setTaskState(state);
         patrolTaskExecRecordService.updatePatrolTaskExecRecord(execRecord);
-        //log.info("[TASK] MODIFY SUCCESS state:{}", state);
-        if (TaskStatus.PAUSED.getCode().equals(state)) {
-            //log.info("[TASK] MODIFY ADD STOP TIME, state:{}", state);
-            redisService.setCacheMapValue(RedisConst.TASK_PATROL_STOP, execRecord.getDevNo() + "&" + execRecord.getTaskPatrolId(), new Date());
-        }
     }
 
     @PostMapping({"/isManualControl"})
@@ -379,8 +374,6 @@ public class PatrolTaskExecController extends BaseController {
         execRecord.setTaskState("3");
         execRecord.setManualPauseState("1");
         this.patrolTaskExecRecordService.updatePatrolTaskExecRecord(execRecord);
-        this.log.info("[EXEC] STOP TASK: {}", JSONObject.toJSONString(execRecord));
-        this.redisService.setCacheMapValue(RedisConst.TASK_PATROL_STOP, execRecord.getDevNo() + "&" + execRecord.getTaskPatrolId(), new Date());
         return true;
     }
 

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

@@ -163,9 +163,6 @@ public class PatrolTaskExecuteSchedulerController extends BaseController {
                     this.log.info("暂停当前执行任务 {} ", "taskName:" + patrolTaskExecRecord.getTaskName() + " taskCode:" + patrolTaskExecRecord.getTaskCode() + " execPointId:" + patrolTaskExecRecord.getExecPointId() + " deviceId:" + patrolTaskPointExecRecord.getDeviceId());
                     patrolTaskExecRecord.setTaskState("3");
                     this.taskExecClient.updatePatrolTaskExecRecord(patrolTaskExecRecord);
-                    this.log.info("修改执行状态成功=state:3 ");
-                    this.log.info("====================暂停添加时间记录=state:3");
-                    this.redisService.setCacheMapValue(RedisConst.TASK_PATROL_STOP, patrolTaskExecRecord.getDevNo() + "&" + patrolTaskExecRecord.getTaskPatrolId(), new Date());
                     break;
                 }
             }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java

@@ -585,15 +585,8 @@ public class PatrolTaskStatusController extends BaseController {
     //立即执行任务
     @GetMapping({"/controlChange"})
     public AjaxResult controlChange(PatrolTask patrolTask) {
-        String taskCode = redisService.getCacheObject(RedisConst.TASK_CURRENT_CODE);
-        if (!StringUtils.isEmpty(taskCode)) {
-            log.info("[TASK] CURRENT EXEC TASK: {}", taskCode);
-            return AjaxResult.error(501, "THERE TASK IS RUNNING!");
-        } else {
-            PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId());
-            issueToRobot(patrol);//type=41 立即执行任务
-            return toAjax(1);
-        }
+        PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId());
+        return issueToRobot(patrol);//type=41 立即执行任务
     }
 
     public void sendTaskToVideo(final PatrolTask patrolTask) {
@@ -636,7 +629,7 @@ public class PatrolTaskStatusController extends BaseController {
 
     }
 
-    public void issueToRobot(PatrolTask patrolTask) {
+    public AjaxResult issueToRobot(PatrolTask patrolTask) {
         String receiveCode = "";
         String sendCode = "";
         BasedataEqpBookMoMain basedataEqpBookMoMain = new BasedataEqpBookMoMain();
@@ -665,24 +658,17 @@ public class PatrolTaskStatusController extends BaseController {
                     String str = JSONObject.toJSONString(sendTask);
                     this.feignTaskClient.sendCommand(str);
                 } else {
-                    sendTaskToVideo(patrolTask);
+                    String taskCode = redisService.getCacheObject(RedisConst.TASK_CURRENT_CODE);
+                    if (!StringUtils.isEmpty(taskCode)) {
+                        log.info("[TASK] CURRENT EXEC TASK: {}", taskCode);
+                        return AjaxResult.error(501, "THERE TASK IS RUNNING!");
+                    } else {
+                        sendTaskToVideo(patrolTask);
+                    }
                 }
-//
-//                SendTask sendTaskcontrol = new SendTask();
-//                sendTaskcontrol.setReceiveCode(receiveCode);
-//                sendTaskcontrol.setSendCode(sendCode);
-//                sendTaskcontrol.setCode(devNo);
-//                sendTaskcontrol.setType("1");
-//                sendTaskcontrol.setCommand("5");
-//                List<PatrolSendTask> sendTaskArrayList = new ArrayList<>();
-//                PatrolSendTask patrolSendTask = new PatrolSendTask();
-//                patrolSendTask.setValue("1");
-//                sendTaskArrayList.add(patrolSendTask);
-//                sendTaskcontrol.setItems(sendTaskArrayList);
-//                String jsonString = JSONObject.toJSONString(sendTaskcontrol);
-//                this.feignTaskClient.sendCommand(jsonString);
             }
         }
+        return toAjax(1);
     }
 
     @GetMapping({"/taskStatusChange"})