From 7fa9b838fcc73000b51f9b0ce381a74951c6f250 Mon Sep 17 00:00:00 2001 From: lijw Date: Mon, 24 Mar 2025 10:07:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=81=94=E8=B0=83=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java | 2 +- .../src/main/resources/mapper/task/PatrolResultMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 99feb17..bbabde4 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 @@ -567,7 +567,7 @@ public class JobMainTask { PatrolPresetPos patrolPresetPos = PatrolPresetPos.builder() .patrolPointId(Long.parseLong(patrolTaskInfo.getDeviceId())) - .patrolDeviceCode(patrolTaskInfo.getDevNo()) +// .patrolDeviceCode(patrolTaskInfo.getDevNo()) .isEnable("1") .build(); log.info(Color.RED + "[JOB] prePointExec, info, deviceId= {}, devNo= {}, patrolPresetPos={}" + Color.END, patrolTaskInfo.getDeviceId(), patrolTaskInfo.getDevNo(), patrolPresetPos); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 595f014..62c2196 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -480,7 +480,7 @@ d.area_name as jg_name, e.area_name from patrol_result f - left join basedata_patrolpoint a on f.device_id = a.patrol_point_id + left join basedata_patrolpoint a on f.device_id = a.patrol_point_id OR f.device_name = a.patrol_point_name left join basedata_device b on a.device_id = b.device_id and b.power_main_equ_flag = "no" left join basedata_device c on b.parent_id = c.device_id left join basedata_area d on c.area_id = d.area_id and d.area_type = 'bayunit'