diff --git a/inspect-job/src/main/java/com/inspect/job/client/TaskExecClient.java b/inspect-job/src/main/java/com/inspect/job/client/TaskExecClient.java index 195db0e..204795e 100644 --- a/inspect-job/src/main/java/com/inspect/job/client/TaskExecClient.java +++ b/inspect-job/src/main/java/com/inspect/job/client/TaskExecClient.java @@ -19,6 +19,9 @@ public interface TaskExecClient { @PostMapping({"/exec/selectTaskList"}) List selectTaskList(PatrolTask task); + @PostMapping({"/exec/selectPatrolTaskList"}) + List selectPatrolTaskList(PatrolTask task); + @PostMapping({"/exec/selectTaskInfoList"}) List selectTaskInfoList(PatrolTaskInfo taskInfo); diff --git a/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolTask.java b/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolTask.java index af5b774..8d44001 100644 --- a/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolTask.java +++ b/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolTask.java @@ -80,6 +80,8 @@ public class PatrolTask extends BaseEntity { ) private Date invalidEndTime; private String isEnable; + + private String isenable; private String linkageState; private String devType; private String creator; @@ -103,12 +105,30 @@ public class PatrolTask extends BaseEntity { if (this == object) return true; if (object == null || getClass() != object.getClass()) return false; PatrolTask that = (PatrolTask) object; - return intervalNumber == that.intervalNumber && Objects.equals(taskId, that.taskId) && Objects.equals(stationName, that.stationName) && Objects.equals(stationCode, that.stationCode) && Objects.equals(type, that.type) && Objects.equals(taskCode, that.taskCode) && Objects.equals(taskName, that.taskName) && Objects.equals(priority, that.priority) && Objects.equals(deviceLevel, that.deviceLevel) && Objects.equals(deviceList, that.deviceList) && Objects.equals(fixedStartTime, that.fixedStartTime) && Objects.equals(cycleMonth, that.cycleMonth) && Objects.equals(cycleWeek, that.cycleWeek) && Objects.equals(cycleExecuteTime, that.cycleExecuteTime) && Objects.equals(cycleStartTime, that.cycleStartTime) && Objects.equals(cycleEndTime, that.cycleEndTime) && Objects.equals(intervalType, that.intervalType) && Objects.equals(intervalExecuteTime, that.intervalExecuteTime) && Objects.equals(intervalStartTime, that.intervalStartTime) && Objects.equals(intervalEndTime, that.intervalEndTime) && Objects.equals(invalidStartTime, that.invalidStartTime) && Objects.equals(invalidEndTime, that.invalidEndTime) && Objects.equals(isEnable, that.isEnable) && Objects.equals(linkageState, that.linkageState) && Objects.equals(devType, that.devType) && Objects.equals(creator, that.creator) && Objects.equals(executionStatus, that.executionStatus) && Objects.equals(fileStatus, that.fileStatus) && Objects.equals(taskCycle, that.taskCycle) && Objects.equals(devNo, that.devNo) && Objects.equals(storage, that.storage) && Objects.equals(taskProgress, that.taskProgress) && Objects.equals(taskState, that.taskState) && Objects.equals(executionMode, that.executionMode) && Objects.equals(beginTime, that.beginTime) && Objects.equals(endTime, that.endTime) && Objects.equals(areaId, that.areaId) && Objects.equals(areaName, that.areaName) && Objects.equals(eqPointList, that.eqPointList) && Objects.equals(patrolTaskStatusList, that.patrolTaskStatusList); + return intervalNumber == that.intervalNumber && Objects.equals(taskId, that.taskId) && Objects.equals(stationName, that.stationName) && Objects.equals(stationCode, that.stationCode) && Objects.equals(type, that.type) && Objects.equals(taskCode, that.taskCode) && Objects.equals(taskName, that.taskName) && Objects.equals(priority, that.priority) && Objects.equals(deviceLevel, that.deviceLevel) && Objects.equals(deviceList, that.deviceList) && Objects.equals(fixedStartTime, that.fixedStartTime) && Objects.equals(cycleMonth, that.cycleMonth) && Objects.equals(cycleWeek, that.cycleWeek) && Objects.equals(cycleExecuteTime, that.cycleExecuteTime) && Objects.equals(cycleStartTime, that.cycleStartTime) && Objects.equals(cycleEndTime, that.cycleEndTime) && Objects.equals(intervalType, that.intervalType) && Objects.equals(intervalExecuteTime, that.intervalExecuteTime) && Objects.equals(intervalStartTime, that.intervalStartTime) && Objects.equals(intervalEndTime, that.intervalEndTime) && Objects.equals(invalidStartTime, that.invalidStartTime) && Objects.equals(invalidEndTime, that.invalidEndTime) && Objects.equals(isEnable, that.isEnable) && Objects.equals(isenable, that.isenable) && Objects.equals(linkageState, that.linkageState) && Objects.equals(devType, that.devType) && Objects.equals(creator, that.creator) && Objects.equals(executionStatus, that.executionStatus) && Objects.equals(fileStatus, that.fileStatus) && Objects.equals(taskCycle, that.taskCycle) && Objects.equals(devNo, that.devNo) && Objects.equals(storage, that.storage) && Objects.equals(taskProgress, that.taskProgress) && Objects.equals(taskState, that.taskState) && Objects.equals(executionMode, that.executionMode) && Objects.equals(beginTime, that.beginTime) && Objects.equals(endTime, that.endTime) && Objects.equals(areaId, that.areaId) && Objects.equals(areaName, that.areaName) && Objects.equals(eqPointList, that.eqPointList) && Objects.equals(patrolTaskStatusList, that.patrolTaskStatusList); } @Override public int hashCode() { - return Objects.hash(taskId, stationName, stationCode, type, taskCode, taskName, priority, deviceLevel, deviceList, fixedStartTime, cycleMonth, cycleWeek, cycleExecuteTime, cycleStartTime, cycleEndTime, intervalNumber, intervalType, intervalExecuteTime, intervalStartTime, intervalEndTime, invalidStartTime, invalidEndTime, isEnable, linkageState, devType, creator, executionStatus, fileStatus, taskCycle, devNo, storage, taskProgress, taskState, executionMode, beginTime, endTime, areaId, areaName, eqPointList, patrolTaskStatusList); + return Objects.hash(taskId, stationName, stationCode, type, taskCode, taskName, priority, deviceLevel, deviceList, fixedStartTime, cycleMonth, cycleWeek, cycleExecuteTime, cycleStartTime, cycleEndTime, intervalNumber, intervalType, intervalExecuteTime, intervalStartTime, intervalEndTime, invalidStartTime, invalidEndTime, isEnable, isenable, linkageState, devType, creator, executionStatus, fileStatus, taskCycle, devNo, storage, taskProgress, taskState, executionMode, beginTime, endTime, areaId, areaName, eqPointList, patrolTaskStatusList); + } + + public void setIsEnable(String isEnable) { + this.isEnable = isEnable; + this.isenable = isEnable; + } + + public String getIsEnable() { + return isEnable; + } + + public void setIsenable(String isenable) { + this.isenable = isenable; + this.isEnable = isenable; + } + + public String getIsenable() { + return isenable; } @Override @@ -137,6 +157,7 @@ public class PatrolTask extends BaseEntity { ", invalidStartTime=" + invalidStartTime + ", invalidEndTime=" + invalidEndTime + ", isEnable='" + isEnable + '\'' + + ", isenable='" + isenable + '\'' + ", linkageState='" + linkageState + '\'' + ", devType='" + devType + '\'' + ", creator='" + creator + '\'' + 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 3062054..8e98397 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 @@ -2086,7 +2086,13 @@ public class JobMainTask { String[] keywords = StringUtils.split(redisKey, StringUtils.AT); if (keywords.length == 3) { String taskCode = keywords[1]; - if (isTaskSlotEmpty(taskCode)) { + List patrolTasks = taskExecClient.selectPatrolTaskList(PatrolTask.builder().taskCode(taskCode).build()); + if (patrolTasks.isEmpty()) { + continue; + } + String isEnable = patrolTasks.get(0).getIsEnable(); + log.info("---execEveryDayTask isEnable: {}, taskCode: {}", isEnable, taskCode); + if (isTaskSlotEmpty(taskCode) && "0".equals(isEnable)) { log.info(Color.YELLOW + "[JOB] TASK_CODE: {}" + Color.END, taskCode); // long currentTime = System.currentTimeMillis(); // long currentDays = TimeUnit.MILLISECONDS.toDays(currentTime); 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 8fbe7ed..2d6c87f 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 @@ -166,6 +166,12 @@ public class PatrolTaskExecController extends BaseController { return resultList; } + @PostMapping({"/selectPatrolTaskList"}) + @ResponseBody + public List selectPatrolTaskList(@RequestBody PatrolTask patrolTask) { + return patrolTaskService.selectPatrolTaskList(patrolTask); + } + @PostMapping({"/selectTaskInfoList"}) @ResponseBody public List selectTaskInfoList(@RequestBody PatrolTaskInfo patrolTask) { diff --git a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml index c5476ae..bb76f6f 100644 --- a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml @@ -814,7 +814,7 @@ basedata_eqpbook_channel b WHERE a.main_system_code = #{patrolDeviceCode} AND a.eqp_book_id = b.eqp_book_id - AND b.channel_type = 'ir'; + AND b.channel_type = 'ir' limit 1;