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 f7c5823..2844c3d 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 @@ -1178,7 +1178,7 @@ public class JobMainTask { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); try { List patrolTaskList = taskExecClient.selectTaskList(PatrolTask.builder().isEnable(TASK_ENABLE).build()); - log.info(Color.GREEN + "[GABRIEL] {inspect-main} selectTaskList task count: {}" + Color.END, patrolTaskList.size()); + log.info(Color.YELLOW + "[GABRIEL] {inspect-main} selectTaskList task count: {}" + Color.END, patrolTaskList.size()); for (PatrolTask task : patrolTaskList) { if (TASK_TYPE_SILENCE.equals(task.getType()) || TASK_TYPE_LINKAGE.equals(task.getType())) { continue; @@ -1373,7 +1373,7 @@ public class JobMainTask { threadPool.submit(() -> { final String deviceId = execRecord.getDeviceId(); if (!StringUtils.isEmpty(deviceId)) { - log.info(Color.GREEN + "[JOB] RESUME devNo: {}, taskId: {}, deviceId: {}" + Color.END, execRecord.getDevNo(), execRecord.getTaskId(), deviceId); + log.info(Color.YELLOW + "[JOB] RESUME devNo: {}, taskId: {}, deviceId: {}" + Color.END, execRecord.getDevNo(), execRecord.getTaskId(), deviceId); prePointContinueExec(execRecord); } }); @@ -1536,59 +1536,59 @@ public class JobMainTask { } } -// private String getTaskPatrolId(final PatrolTask patrolTask) { -// String time = DateUtils.format(DateUtils.yyyyMMddHHmmss, patrolTask.getFixedStartTime()); -// return patrolTask.getDevNo() + "_" + patrolTask.getTaskCode() + "_" + time; -// } -// -// private String getOldTaskPatrolId(final PatrolTask patrolTask) { -// String time = DateUtils.format(DateUtils.yyyyMMddHHmmss, patrolTask.getFixedStartTime()); -// return patrolTask.getTaskCode() + "_" + time + "_" + time; -// } + private String getTaskPatrolId(final PatrolTask patrolTask) { + String time = DateUtils.format(DateUtils.yyyyMMddHHmmss, patrolTask.getFixedStartTime()); + return patrolTask.getDevNo() + "_" + patrolTask.getTaskCode() + "_" + time; + } + + private String getOldTaskPatrolId(final PatrolTask patrolTask) { + String time = DateUtils.format(DateUtils.yyyyMMddHHmmss, patrolTask.getFixedStartTime()); + return patrolTask.getTaskCode() + "_" + time + "_" + time; + } @SuppressWarnings({"unused"}) public void execEveryDayTask(List patrolTaskList) { log.info("***************************** JobTaskTimer execEveryDayTask with parameters *************************************"); -// setRedisRecordCount(patrolTaskList.size()); -// for (PatrolTask patrolTask : patrolTaskList) { -// List taskInfos = getInfosByRecord(PatrolTaskExecRecord.builder().devNo(patrolTask.getDevNo()).taskId(patrolTask.getTaskId()).build()); -// final String taskPatrolId = getTaskPatrolId(patrolTask); -// final String oldTaskPatrolId = getOldTaskPatrolId(patrolTask); -// log.info(Color.GREEN + "[JOB] NEW EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId); -// PatrolTaskExecRecord patrolTaskExecRecord = PatrolTaskExecRecord.builder() -// .taskPatrolId(taskPatrolId) -// .oldTaskPatrolId(oldTaskPatrolId) -// .taskName(patrolTask.getTaskName()) -// .taskCode(patrolTask.getTaskCode()) -// .taskState(TaskStatus.RUNNING.getCode()) -// .planStartTime(patrolTask.getCycleStartTime()) -// .startTime(new Date()) -// .taskProgress("0") -// .endTime(patrolTask.getCycleEndTime()) -// .description("") -// .devNo(patrolTask.getDevNo()) -// .taskType(patrolTask.getType()) -// .taskPriority(patrolTask.getPriority()) -// .taskId(patrolTask.getTaskId()) -// .stationName(patrolTask.getStationName()) -// .stationCode(patrolTask.getStationCode()) -// .deviceId("0") -// .execPointId(0L) -// .totalNumber(taskInfos.isEmpty() ? 1 : taskInfos.size()) -// .build(); -// try { -// taskExecClient.addPatrolTaskExecRecord(patrolTaskExecRecord); -// taskExecClient.updatePatrolTaskStatus(patrolTask); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// threadPool.submit(() -> { -// log.info(Color.MAGENTA + "[JOB] THREAD START devNo: {}, taskId: {}" + Color.END, patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId()); -// prePointExecImmediate(patrolTaskExecRecord); -// log.info(Color.MAGENTA + "[JOB] THREAD END devNo: {}, taskId: {}" + Color.END, patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId()); -// }); -// } + for (PatrolTask patrolTask : patrolTaskList) { + List taskInfos = getInfosByRecord(PatrolTaskExecRecord.builder().devNo(patrolTask.getDevNo()).taskId(patrolTask.getTaskId()).build()); + final String taskPatrolId = getTaskPatrolId(patrolTask); + final String oldTaskPatrolId = getOldTaskPatrolId(patrolTask); + log.info(Color.YELLOW + "[JOB] NEW EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId); + setRedisRecordCount(patrolTask.getTaskCode(), patrolTaskList.size()); + PatrolTaskExecRecord patrolTaskExecRecord = PatrolTaskExecRecord.builder() + .taskPatrolId(taskPatrolId) + .oldTaskPatrolId(oldTaskPatrolId) + .taskName(patrolTask.getTaskName()) + .taskCode(patrolTask.getTaskCode()) + .taskState(TaskStatus.RUNNING.getCode()) + .planStartTime(patrolTask.getCycleStartTime()) + .startTime(new Date()) + .taskProgress("0") + .endTime(patrolTask.getCycleEndTime()) + .description("") + .devNo(patrolTask.getDevNo()) + .taskType(patrolTask.getType()) + .taskPriority(patrolTask.getPriority()) + .taskId(patrolTask.getTaskId()) + .stationName(patrolTask.getStationName()) + .stationCode(patrolTask.getStationCode()) + .deviceId("0") + .execPointId(0L) + .totalNumber(taskInfos.isEmpty() ? 1 : taskInfos.size()) + .build(); + try { + taskExecClient.addPatrolTaskExecRecord(patrolTaskExecRecord); + taskExecClient.updatePatrolTaskStatus(patrolTask); + } catch (Exception e) { + log.error("error", e); + } + threadPool.submit(() -> { + log.info(Color.YELLOW + "[JOB] THREAD START devNo: {}, taskId: {}" + Color.END, patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId()); + prePointExecImmediate(patrolTaskExecRecord); + log.info(Color.YELLOW + "[JOB] THREAD END devNo: {}, taskId: {}" + Color.END, patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId()); + }); + } } // private void incrementRedisRecordCounter() { @@ -1601,7 +1601,7 @@ public class JobMainTask { // redisService.setCacheObject(RedisConst.TASK_RECORD_CNT, redisRecCnt); // } // -// log.info(Color.GREEN + "[JOB] redisRecCnt: {}" + Color.END, redisRecCnt); +// log.info(Color.YELLOW + "[JOB] redisRecCnt: {}" + Color.END, redisRecCnt); // } @SuppressWarnings({"unused"}) @@ -1611,7 +1611,7 @@ public class JobMainTask { // for (PatrolTask patrolTask : patrolTaskList) { // final String taskPatrolId = getTaskPatrolId(patrolTask); // final String oldTaskPatrolId = getOldTaskPatrolId(patrolTask); -// log.info(Color.GREEN + "[JOB] REPEAT EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId); +// log.info(Color.YELLOW + "[JOB] REPEAT EXEC RECORD: {}, OLD: {}" + Color.END, taskPatrolId, oldTaskPatrolId); // List taskExecRecords = // taskExecClient.selectPatrolTaskExecRecordList(PatrolTaskExecRecord.builder() // .taskPatrolId(taskPatrolId) @@ -1624,12 +1624,12 @@ public class JobMainTask { // int total = execRecord.getTotalNumber(); // int times = execRecord.getRebootTimes(); // if (finish < total) { -// log.info(Color.GREEN + "[JOB] REPEAT EXEC RECORD: id: {}, finish: {}, total: {}, times: {}, progress: {}" + Color.END, execRecord.getTaskPatrolId(), finish, total, times, execRecord.getTaskProgress()); +// log.info(Color.YELLOW + "[JOB] REPEAT EXEC RECORD: id: {}, finish: {}, total: {}, times: {}, progress: {}" + Color.END, execRecord.getTaskPatrolId(), finish, total, times, execRecord.getTaskProgress()); // incrementRedisRecordCounter(); // threadPool.submit(() -> { -// log.info(Color.MAGENTA + "[JOB] REPEAT START devNo: {}, taskId: {}" + Color.END, execRecord.getDevNo(), execRecord.getTaskId()); +// log.info(Color.YELLOW + "[JOB] REPEAT START devNo: {}, taskId: {}" + Color.END, execRecord.getDevNo(), execRecord.getTaskId()); // prePointExecImmediate(execRecord); -// log.info(Color.MAGENTA + "[JOB] REPEAT END devNo: {}, taskId: {}" + Color.END, execRecord.getDevNo(), execRecord.getTaskId()); +// log.info(Color.YELLOW + "[JOB] REPEAT END devNo: {}, taskId: {}" + Color.END, execRecord.getDevNo(), execRecord.getTaskId()); // }); // } // }