From 07e47c91ed4cf22c36087c800b6d2513efbf38b3 Mon Sep 17 00:00:00 2001 From: lijw Date: Fri, 21 Mar 2025 10:50:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8Dredis=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/inspect/job/task/JobMainTask.java | 6 +++--- .../inspect/exec/controller/PatrolTaskExecController.java | 2 +- .../controller/PatrolTaskExecuteSchedulerController.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java index 9681ba7..99feb17 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java @@ -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 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); } diff --git a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java index e02a464..e93bb79 100644 --- a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java +++ b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java @@ -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 cameraPatrolTasks = redisService.getCacheObject(key); if (!cameraPatrolTasks.isEmpty()) { diff --git a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecuteSchedulerController.java b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecuteSchedulerController.java index 94cf121..47ea9c5 100644 --- a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecuteSchedulerController.java +++ b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecuteSchedulerController.java @@ -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();