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 3ec64f6..fe4bbdf 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 @@ -663,13 +663,13 @@ public class JobMainTask { return cursor; } - synchronized private void resetRecordCounter() { + synchronized private void resetRecordCounter(String taskCode) { execRecordCounter = 0; - redisService.setCacheObject(RedisConst.TASK_RECORD_CNT, 0); + redisService.setCacheObjectOfTask(RedisConst.TASK_RECORD_CNT, taskCode, 0); } - private void setRedisRecordCount(final int size) { - redisService.setCacheObject(RedisConst.TASK_RECORD_CNT, size); + private void setRedisRecordCount(String taskCode, final int size) { + redisService.setCacheObjectOfTask(RedisConst.TASK_RECORD_CNT, taskCode, size); } synchronized private void resetRedisCurrentCode() { @@ -705,10 +705,10 @@ public class JobMainTask { totalProgress, TaskStatus.DONE.getCode()/*点位全部执行成功,上报进度100%*/ ); - final Integer redisRecCnt = redisService.getCacheObject(RedisConst.TASK_RECORD_CNT); + final Integer redisRecCnt = redisService.getCacheObjectOfTask(RedisConst.TASK_RECORD_CNT, execRecord.getTaskCode()); log.info(Color.MAGENTA + "RECORD ROUND, patrolId: {}, recordCounter: {}, redisRecCnt: {}" + Color.END, taskPatrolId, execRecordCounter, redisRecCnt); if (execRecordCounter == redisRecCnt) { // 最后一个record - resetRecordCounter(); + resetRecordCounter(execRecord.getTaskCode()); resetRedisCurrentCode(); redisService.deleteObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, execRecord.getTaskCode()); } @@ -726,10 +726,10 @@ public class JobMainTask { totalProgress, TaskStatus.DONE.getCode()/*点位全部执行成功,上报进度100%*/ ); - final int redisRecCnt = redisService.getCacheObject(RedisConst.TASK_RECORD_CNT); + final int redisRecCnt = redisService.getCacheObjectOfTask(RedisConst.TASK_RECORD_CNT, execRecord.getTaskCode()); log.info(Color.MAGENTA + "[JOB] TIMES 0, execRecordCounter: {}, redisRecCnt: {}" + Color.END, execRecordCounter, redisRecCnt); if (execRecordCounter == redisRecCnt) { - resetRecordCounter(); + resetRecordCounter(execRecord.getTaskCode()); resetRedisCurrentCode(); redisService.deleteObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, execRecord.getTaskCode()); } @@ -863,9 +863,9 @@ public class JobMainTask { 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(); + resetRecordCounter(patrolTask.getTaskCode()); log.info(Color.CYAN + "[JOB IMMEDIATE] TASK REC CNT: {}" + Color.END, cameraPatrolTasks.size());//TASK REC CNT: 1 - setRedisRecordCount(cameraPatrolTasks.size()); + setRedisRecordCount(patrolTask.getTaskCode(), cameraPatrolTasks.size()); for (PatrolTask task : cameraPatrolTasks) { List taskInfos = getInfosByRecord(PatrolTaskExecRecord.builder().devNo(task.getDevNo()).taskId(task.getTaskId()).build()); PatrolTaskExecRecord patrolTaskExecRecord = new PatrolTaskExecRecord();