From 7561554c3302f465c36d004d1a04337ba03cfaec Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Mon, 21 Apr 2025 18:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=A7=E8=A1=8C=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/job/client/TaskExecClient.java | 3 ++ .../com/inspect/job/task/JobMainTask.java | 29 +++++++++++++------ .../controller/PatrolTaskExecController.java | 11 +++++++ .../PatrolTaskStatusController.java | 12 ++++---- 4 files changed, 40 insertions(+), 15 deletions(-) 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 f8b8835..f8fbb5e 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 @@ -22,6 +22,9 @@ public interface TaskExecClient { @PostMapping({"/exec/selectTaskInfoList"}) List selectTaskInfoList(PatrolTaskInfo taskInfo); + @PostMapping({"/exec/getConfigByKey"}) + String getConfigByKey(String key); + @PostMapping({"/exec/selectPatrolPresetPosList"}) List selectPatrolPresetPosList(PatrolPresetPos presetPos); 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 5179023..73584f8 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 @@ -844,10 +844,10 @@ public class JobMainTask { @PostMapping({"/immediatelyExecTask"}) public void immediatelyExecTask(@RequestBody PatrolTask patrolTask) { String taskCode = redisService.getCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, patrolTask.getTaskCode()); - if (StringUtils.isNotEmpty(taskCode)) { - log.info(Color.CYAN + "TASK SLOT IS TAKEN BY: {}" + Color.END, taskCode); - return; - } +// if (StringUtils.isNotEmpty(taskCode)) { +// log.info(Color.CYAN + "TASK SLOT IS TAKEN BY: {}" + Color.END, taskCode); +// return; +// } PatrolTaskInfo patrolTaskInfo = new PatrolTaskInfo(); List patrolTaskList = new ArrayList<>(); @@ -855,10 +855,10 @@ public class JobMainTask { List cameraPatrolTasks = new ArrayList<>(); assembleVideoTask(patrolTaskList, cameraPatrolTasks); String redisImmediatelyExecTaskTime = redisService.getCacheObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, patrolTask.getTaskCode()); - if (redisImmediatelyExecTaskTime != null) { - log.info(Color.CYAN + "IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime); - return; - } +// if (redisImmediatelyExecTaskTime != null) { +// log.info(Color.CYAN + "IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime); +// return; +// } if (shaoXinBigModel.isSwitchStatus()) { log.info("[BIG] Temporary gathering, close bigSwitch in nacos"); @@ -936,13 +936,24 @@ public class JobMainTask { private void assembleVideoTask(List patrolTaskList, List cameraPatrolTasks) { if (patrolTaskList != null) { + String jobAreas = taskExecClient.getConfigByKey("JOB_AREAS"); + log.info("jobAreas: {}", jobAreas); + List jobAreaList = new ArrayList<>(); + if(StringUtils.isNotBlank(jobAreas)) { + String[] jobAreaArr = jobAreas.split(","); + for(int i = 0; i < jobAreaArr.length; i++) { + jobAreaList.add(jobAreaArr[i]); + } + } + log.info("jobAreaList: {}", JSONObject.toJSONString(jobAreaList)); + for (PatrolTask task : patrolTaskList) { if (!StringUtils.isEmpty(task.getDevType())) { String[] devTypes = task.getDevType().split(StringUtils.COMMA); String[] devNos = task.getDevNo().split(StringUtils.COMMA); for (int i = 0; i < devTypes.length; ++i) { if ("2".equals(devTypes[i])) { - if("camera".equals(devNos[i])) {//武汉站手动任务台账编码 + if(jobAreaList.size() == 0 || jobAreaList.contains(devNos[i])) { PatrolTask cameraPatrolTask = new PatrolTask(); cameraPatrolTask.setTaskId(task.getTaskId()); cameraPatrolTask.setStationName(task.getStationName()); 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 e603580..4150003 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 @@ -719,6 +719,17 @@ public class PatrolTaskExecController extends BaseController { return CollectionUtils.isNotEmpty(list) ? list.get(0) : null; } + @PostMapping({"/getConfigByKey"}) + public String getConfigByKey(@RequestBody String key) { + String value = patrolTaskService.selectConfigByKey(key); + logger.info("-------------------getConfigByKey key: {}, value: {}", key, value); + if(StringUtils.isBlank(value)) { + return ""; + } else { + return value.trim(); + } + } + public static void main(String[] args) { String dateString = DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date()); System.out.println(dateString); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java index 1d89703..f67847a 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java @@ -657,13 +657,13 @@ public class PatrolTaskStatusController extends BaseController { String str = JSONObject.toJSONString(sendTask); this.feignTaskClient.sendCommand(str); } else { - String taskCode = redisService.getCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, String.valueOf(patrolTask.getTaskId())); - if (!StringUtils.isEmpty(taskCode)) { - log.info("[TASK] CURRENT EXEC TASK: {}", taskCode); - return AjaxResult.error(501, "THERE TASK IS RUNNING!"); - } else { +// String taskCode = redisService.getCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, String.valueOf(patrolTask.getTaskId())); +// if (!StringUtils.isEmpty(taskCode)) { +// log.info("[TASK] CURRENT EXEC TASK: {}", taskCode); +// return AjaxResult.error(501, "THERE TASK IS RUNNING!"); +// } else { sendTaskToVideo(patrolTask); - } +// } } } }