Browse Source

恢复redis设置任务执行中状态

master
lijw 9 months ago
parent
commit
07e47c91ed
3 changed files with 5 additions and 5 deletions
  1. +3
    -3
      inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
  2. +1
    -1
      inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java
  3. +1
    -1
      inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecuteSchedulerController.java

+ 3
- 3
inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java View File

@ -1406,9 +1406,9 @@ public class JobMainTask {
}
String immediatelyExecTaskTime = DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss, new Date());
redisService.setCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, immediatelyExecTaskTime, 60L, TimeUnit.SECONDS);
redisService.setCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, 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, 60L, TimeUnit.SECONDS);
redisService.setCacheObject(RedisConst.TASK_CURRENT_CODE, RedisConst.TASK_CODE + patrolTask.getTaskCode() + StringUtils.AT + immediatelyExecTaskTime);
taskStartInitialize();
log.info(Color.CYAN + "[JOB IMMEDIATE] TASK REC CNT: {}" + Color.END, cameraPatrolTasks.size());
setRedisRecordCount(cameraPatrolTasks.size());
@ -1931,7 +1931,7 @@ public class JobMainTask {
List<PatrolTask> patrolTaskList = JSON.parseArray(redisService.getCacheObject(redisKey), PatrolTask.class);
if (patrolTaskList != null && !patrolTaskList.isEmpty()) {
log.info(Color.GREEN + "[JOB] ADD NEW TASK [{}], TASK LIST SIZE: {}" + Color.END, redisKey, patrolTaskList.size());
redisService.setCacheObject(RedisConst.TASK_CURRENT_CODE, redisKey, 60L, TimeUnit.SECONDS);
redisService.setCacheObject(RedisConst.TASK_CURRENT_CODE, redisKey);
taskStartInitialize();
execEveryDayTask(patrolTaskList);
}


+ 1
- 1
inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java View File

@ -867,7 +867,7 @@ public class PatrolTaskExecController extends BaseController {
private void extracted(String key, String taskCode) {
log.info(Color.RED + "[EXEC] Add new task [{}]" + Color.END, key);
redisService.setCacheObject(RedisConst.TASK_CURRENT_CODE, key, 60L, TimeUnit.SECONDS);
redisService.setCacheObject(RedisConst.TASK_CURRENT_CODE, key);
log.info("[EXEC] key: {}", key);
List<PatrolTask> cameraPatrolTasks = redisService.getCacheObject(key);
if (!cameraPatrolTasks.isEmpty()) {


+ 1
- 1
inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecuteSchedulerController.java View File

@ -176,7 +176,7 @@ public class PatrolTaskExecuteSchedulerController extends BaseController {
} else {
SimpleDateFormat sdfOld = new SimpleDateFormat("yyyyMMddHHmmss");
immediatelyExecTaskTime = sdfOld.format(new Date());
this.redisService.setCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, immediatelyExecTaskTime, 60L, TimeUnit.SECONDS);
this.redisService.setCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, immediatelyExecTaskTime);
}
Date time = task.getFixedStartTime();


Loading…
Cancel
Save