From c8bf76a25e6f33d56e378da7fad548fd15064183 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Fri, 5 Dec 2025 17:57:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=8D=E5=85=B4=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E7=8B=97=E5=B7=A1=E8=A7=86=E4=BB=BB=E5=8A=A1=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolResultController.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) 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 373e871..606f9fb 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 @@ -1351,17 +1351,21 @@ public class PatrolResultController extends BaseController { String code; if (!patrolResultList.isEmpty()) { code = ""; - + String sendCode = parseObject.getString("SendCode"); for (PatrolResult arr : patrolResultList) { - Map map = resultAnalysisService.selectPointInfoById(arr.getDeviceId()); - if (map == null) { - Map maps = resultAnalysisService.selectPointInfoByCode(arr.getDeviceId()); - if (maps != null && maps.get("patrol_point_id") != null) { - String patrolPointId = String.valueOf(maps.get("patrol_point_id")); - arr.setDeviceId(patrolPointId); - } - } else { - arr.setDeviceId(String.valueOf(map.get("patrol_point_id"))); +// Map map = resultAnalysisService.selectPointInfoById(arr.getDeviceId()); +// if (map == null) { +// Map maps = resultAnalysisService.selectPointInfoByCode(arr.getDeviceId()); +// if (maps != null && maps.get("patrol_point_id") != null) { +// String patrolPointId = String.valueOf(maps.get("patrol_point_id")); +// arr.setDeviceId(patrolPointId); +// } +// } else { +// arr.setDeviceId(String.valueOf(map.get("patrol_point_id"))); +// } + Long patrolPointId = baseDataClient.queryPatrolPointId(sendCode + "|" + arr.getDeviceId()); + if (patrolPointId != null) { + arr.setDeviceId(patrolPointId.toString()); } code = arr.getTaskCode(); patrolDeviceCodeList.add(arr.getPatrolDeviceCode());