From 52721e75ba4a5b1d27432e04533496b89313df01 Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Wed, 9 Apr 2025 15:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E5=B7=A1=E8=A7=86=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/inspect/base/core/constant/RedisConst.java | 5 +++-- .../src/main/java/com/inspect/job/task/JobMainTask.java | 1 - .../controller/PatrolTaskExecuteSchedulerController.java | 1 + .../partrolresult/controller/PatrolResultController.java | 8 +------- .../com/inspect/task/controller/PatrolTaskController.java | 8 +++++--- .../taskstatus/controller/PatrolTaskStatusController.java | 6 +++--- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java index 5b914b1..de29786 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/constant/RedisConst.java @@ -6,8 +6,9 @@ public class RedisConst { public static final String TASK_CODE = "TASK_CODE@";//已经和taskcode关联 public static final String REQUEST_UUID = "REQUEST_UUID@";//已经和uuid关联 - public static final String TASK_PATROL_ID = "TASK_PATROL_ID"; - public static final String TASK_PATROL_STATE = "TASK_PATROL_STATE"; + public static final String TASK_PATROL_ID = "TASK_PATROL_ID";//应该没用到 + public static final String TASK_PATROL_STATE = "TASK_PATROL_STATE";//应该没用到 + public static final String TASK_RECORD_CNT = "TASK_RECORD_CNT"; public static final String TASK_CURRENT_CODE = "TASK_CURRENT_CODE@"; public static final String IMMEDIATELY_EXEC_TASK_TIME = "IMMEDIATELY_EXEC_TASK_TIME"; 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 577a9b0..671d0af 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 @@ -726,7 +726,6 @@ public class JobMainTask { totalProgress, TaskStatus.DONE.getCode()/*点位全部执行成功,上报进度100%*/ ); - //在不知道其它record是否执行完毕的情况下，不能把TASK_CURRENT_CODE锁删除 final int redisRecCnt = redisService.getCacheObject(RedisConst.TASK_RECORD_CNT); log.info(Color.MAGENTA + "[JOB] TIMES 0, execRecordCounter: {}, redisRecCnt: {}" + Color.END, execRecordCounter, redisRecCnt); if (execRecordCounter == redisRecCnt) { 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 1f5729c..372ebee 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 @@ -99,6 +99,7 @@ public class PatrolTaskExecuteSchedulerController extends BaseController { @Autowired AccessFeign accessFeign; + //和JobMainTask完全重复 @PostMapping({"/immediatelyExecTask"}) public void immediatelyExecTask(PatrolTask patrolTask) { PatrolTaskInfo patrolTaskInfo = new PatrolTaskInfo(); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index bfeba0c..47a47d2 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1194,15 +1194,9 @@ public class PatrolResultController extends BaseController { List tasks = patrolTaskService.selectPatrolTaskList(PatrolTask.builder().taskCode(code).build()); String datetype; if (!tasks.isEmpty()) { - int devCount = tasks.get(0).getDevNo().split(",").length; PatrolTaskResultMain taskResultMain = new PatrolTaskResultMain(); taskResultMain.setTaskId(String.valueOf(tasks.get(0).getTaskId())); - if(devCount > 1) { - taskResultMain.setFileStatus("0"); - } else { - taskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId()); - } - + taskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId()); logger.info("taskResultMain: {}", taskResultMain); listEqpBook = iPatrolTaskResultMainService.selectPatrolTaskResultMainList(taskResultMain); if (!listEqpBook.isEmpty()) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 48e7e99..2a3a54b 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -678,12 +678,12 @@ public class PatrolTaskController extends BaseController { } public void issueTask(PatrolTask patrolTask) { - String rebootCode = patrolTaskService.selectConfigByKey("rebootCode"); - String uavCode = patrolTaskService.selectConfigByKey("uavCode"); + String rebootCode = patrolTaskService.selectConfigByKey("rebootCode");//robotCode + String uavCode = patrolTaskService.selectConfigByKey("uavCode");//droneCode String receiveCode = ""; String sendCode = ""; BasedataEqpBookMoMain based = new BasedataEqpBookMoMain(); - based.setType("20"); + based.setType("20");//巡视主机 List basedataEqpBookMoMains = patrolResultService.selectBasedataEqpBookList(based); if (!basedataEqpBookMoMains.isEmpty()) { sendCode = basedataEqpBookMoMains.get(0).getPatrolDeviceCode(); @@ -882,6 +882,7 @@ public class PatrolTaskController extends BaseController { String str = JSONObject.toJSONString(sendTask); logger.info("-----------------sendTask: " + str); if (StringUtils.isEmpty(receiveCode)) { + //手工巡视任务会进入这里，不下发 continue; } feignTaskClient.sendCommand(str); @@ -1085,6 +1086,7 @@ public class PatrolTaskController extends BaseController { String str = JSONObject.toJSONString(sendTask); System.out.println(str); if (StringUtils.isEmpty(receiveCode)) { + //手工巡视任务会进入这里，不下发 return; } feignTaskClient.sendCommand(str); 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 b442c31..f5e8f7b 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 @@ -176,7 +176,6 @@ public class PatrolTaskStatusController extends BaseController { } ResultAnalysis resultAnalysis = new ResultAnalysis(); - log.info(Color.GREEN + "[TASK STATUS] taskPatrolledId: {}" + Color.END, item.getTaskPatrolledId()); resultAnalysis.setTaskPatrolledId(item.getTaskPatrolledId()); ResultAnalysis analysisRes = resultAnalysisService.selectTaskAbnormalData(resultAnalysis); @@ -701,8 +700,9 @@ public class PatrolTaskStatusController extends BaseController { return toAjax(res); } + //没有用到 public void issueTask(PatrolTaskStatus patrolTaskStatus) { - String posType = patrolTaskStatus.getPosType(); + String posType = patrolTaskStatus.getPosType();//预置位类型 0-视频 1-机器人 2-无人机 if (StringUtils.isEmpty(posType)) { log.warn("[TASK] posType is null"); return; @@ -750,7 +750,7 @@ public class PatrolTaskStatusController extends BaseController { /** * Calc wrj code */ - Set wrjCode = new HashSet<>(); + Set wrjCode = new HashSet<>();//droneCode for (BasedataEqpBookMoMain book : bookList) { final String type = book.getType(); if (!type.equals("1") && !type.equals("2") && !type.equals("3") && !type.equals("13")) {