From 9e5f0ca0faa2e28a808c20798b0304eecbba7b6f Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Thu, 21 Aug 2025 17:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8D=E5=85=B4=E7=AB=99=E6=97=A0=E4=BA=BA?= =?UTF-8?q?=E6=9C=BA=E6=9C=BA=E5=99=A8=E7=8B=97=E7=82=B9=E4=BD=8Did?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolResultController.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 093b0a1..a0d13c3 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 @@ -1134,12 +1134,14 @@ public class PatrolResultController extends BaseController { } else if (StringUtils.isNotEmpty(sendCode)) { str = sendCodeToDevType(sendCode); patrolTaskStatus.setPosType(str); + // 鲁人机器人 if ("1".equals(str) && "E100-001".equals(sendCode)) { List listEqpBook = baseDataClient.queryEqpBookCode(sendCode); patrolTaskStatusItem.setCode(listEqpBook.get(0).getChannelCode()); } } List patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); + // 任务状态完成，终止，超过期限 if (patrolTaskStatusItem.getTaskState() != null && (patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode()) || patrolTaskStatusItem.getTaskState().equals(TaskStatus.HALTED.getCode()) @@ -1376,9 +1378,10 @@ public class PatrolResultController extends BaseController { patrolResultParam.setTaskPatrolledId(patrolResult.getTaskPatrolledId()); str = parseObject.getString("SendCode"); String strfile; + // 机器狗 if ("2".equals(datetype)) { logger.info("feedback from robot"); - Long patrolPointId = baseDataClient.queryPatrolPointId(str + "_" + patrolResult.getDeviceId()); + Long patrolPointId = baseDataClient.queryPatrolPointId(str + "|" + patrolResult.getDeviceId()); if (patrolPointId != null) { patrolResult.setDeviceId(patrolPointId.toString()); } @@ -1399,6 +1402,13 @@ public class PatrolResultController extends BaseController { } } } + // 无人机点位id处理 + if ("3".equals(datetype)) { + Long patrolPointId = baseDataClient.queryPatrolPointId(str + "|" + patrolResult.getDeviceId()); + if (patrolPointId != null) { + patrolResult.setDeviceId(patrolPointId.toString()); + } + } patrolResultParam.setDeviceId(patrolResult.getDeviceId()); patrolResultParam.setDataType(datetype);