From 3ee3fd6e703db70e455a9fd73b37a3daa5c0e21a Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Fri, 5 Sep 2025 18:42:19 +0800 Subject: [PATCH] =?UTF-8?q?/*=E4=BA=91=E6=B7=B1=E5=A4=84=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E7=8B=97=E7=BB=88=E6=AD=A2=E6=99=BA=E5=B7=A1=E8=81=94=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=B8=BA=E7=BB=88=E6=AD=A2=E7=8A=B6?= =?UTF-8?q?=E6=80=81*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AnalyseResponseServiceImpl.java | 5 +++-- .../partrolresult/controller/PatrolResultController.java | 9 +++++++++ .../partrolresult/service/AnalyseRequestServiceImpl.java | 2 +- .../taskstatus/mapper/PatrolTaskStatusMapper.java | 2 ++ .../taskstatus/service/IPatrolTaskStatusService.java | 2 ++ .../service/impl/PatrolTaskStatusServiceImpl.java | 4 ++++ .../resources/mapper/task/PatrolTaskStatusMapper.xml | 9 +++++++++ 7 files changed, 30 insertions(+), 3 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java index b3c41da..e4aa076 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java @@ -110,7 +110,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { //redisService.setCacheObject(keyId, "123456789"); } else { log.info("ANALYSE_REQUEST_ID: DEL {} FROM REDIS!", keyId); - redisService.deleteObject(keyId); + //redisService.deleteObject(keyId); } String patrolTaskIdObj = redisService.getCacheObject(keyId); @@ -168,7 +168,8 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { || AlgConstants.INFRA_YU3.equals(algType) || AlgConstants.INFRA_CAMERA.equals(algType) || AlgConstants.INFRA_CAMERA_REVERSE.equals(algType) - || AlgConstants.INFRARED2.equals(algType)) + || AlgConstants.INFRARED2.equals(algType) + || "isolator".equals(algType)) ) { /* * 先检查结果有缺无缺陷，如果有缺陷不用判断算法直接调用大模型；* 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 69f7ba2..a3103d4 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 @@ -1162,6 +1162,15 @@ public class PatrolResultController extends BaseController { || patrolTaskStatusItem.getTaskState().equals(TaskStatus.EXPIRED.getCode()))) { patrolTaskStatusItem.setTaskState(patrolTaskStatusItem.getTaskState()); patrolTaskStatusItem.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date())); + + List statusList = patrolTaskStatusService.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(patrolTaskStatusItem.getTaskPatrolledId()).build()); + if (!statusList.isEmpty()) { + PatrolTaskStatus taskStatus = statusList.get(0); + taskStatus.setTaskState(patrolTaskStatusItem.getTaskState()); + taskStatus.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date())); + logger.info("GET_INFO_41 UPDATE TASK_STATE TO HALTED taskStatus: {}", taskStatus); + iPatrolTaskStatusService.updatePatrolTaskStatusOfTaskStateAndEndTime(taskStatus); + } } List patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); logger.info("GET_INFO_41 ROBOT_TASK_STATUS patrolTaskStatusList: {}", patrolTaskStatusList); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java index 067c7e7..9b3a1d0 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java @@ -56,7 +56,7 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { String requestId = StringUtils.isNotEmpty(analyseReq.getRequestId()) ? analyseReq.getRequestId() : UUID.randomUUID().toString().trim().replaceAll(StringUtils.DASH, StringUtils.EMPTY); String taskPatrolId = analyseReq.getTaskPatrolId(); - // redisService.setCacheObject(RedisConst.REQUEST_UUID + requestId, taskPatrolId, requestTimeout, TimeUnit.DAYS); + redisService.setCacheObject(RedisConst.REQUEST_UUID + requestId, taskPatrolId, requestTimeout, TimeUnit.DAYS); //log.info("CALL_REMOTE_ANALYZE isFilter: {}, requestId: {}, taskPatrolId: {}", isFilter, requestId, taskPatrolId); analyseReq.setRequestId(requestId); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java index 09724fa..e8c13ef 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/mapper/PatrolTaskStatusMapper.java @@ -28,6 +28,8 @@ public interface PatrolTaskStatusMapper { int updatePatrolTaskStatusOfTaskState(PatrolTaskStatus patrolTaskStatus); + int updatePatrolTaskStatusOfTaskStateAndEndTime(PatrolTaskStatus patrolTaskStatus); + int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus); int deletePatrolTaskStatusByLineId(Long lineId); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java index 6f6edd9..e7050fa 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/IPatrolTaskStatusService.java @@ -26,6 +26,8 @@ public interface IPatrolTaskStatusService { int updatePatrolTaskStatusOfTaskState(PatrolTaskStatus patrolTaskStatus); + int updatePatrolTaskStatusOfTaskStateAndEndTime(PatrolTaskStatus patrolTaskStatus); + int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus); int deletePatrolTaskStatusByLineIds(Long[] lineIds); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java index 7fc453a..39cc907 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/service/impl/PatrolTaskStatusServiceImpl.java @@ -67,6 +67,10 @@ public class PatrolTaskStatusServiceImpl implements IPatrolTaskStatusService { return this.patrolTaskStatusMapper.updatePatrolTaskStatusOfTaskState(patrolTaskStatus); } + public int updatePatrolTaskStatusOfTaskStateAndEndTime(PatrolTaskStatus patrolTaskStatus) { + return this.patrolTaskStatusMapper.updatePatrolTaskStatusOfTaskStateAndEndTime(patrolTaskStatus); + } + public int updatePatrolTaskStatusRunning(PatrolTaskStatus patrolTaskStatus) { return this.patrolTaskStatusMapper.updatePatrolTaskStatusRunning(patrolTaskStatus); } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml index c2cd14b..720dfb2 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskStatusMapper.xml @@ -280,6 +280,15 @@ where line_id = #{lineId} + + update patrol_task_status + + task_state = #{taskState}, + end_time = #{endTime}, + + where line_id = #{lineId} + + delete from patrol_task_status