From a96eac3c8883f1e3cd546349864f4f5956f61420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AF=85?= <97163845@qq.com> Date: Mon, 28 Apr 2025 15:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=B0=E5=B0=BC-=E6=98=93=E8=BE=BE=E5=B7=A1?= =?UTF-8?q?=E8=A7=86=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3=E9=97=AE=E8=85=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatrolResultController.java | 30 ++++---- .../domain/InspectionPointParam.java | 1 + .../domain/InspectionPointResultVo.java | 1 + .../mapper/task/PatrolResultMapper.xml | 76 +++++++++++-------- .../domain/vo/PointLatestResultVo.java | 1 + .../BasedataPatrolPointMapper.xml | 51 +++++++++---- 6 files changed, 99 insertions(+), 61 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 ccc5681..94addea 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 @@ -2054,21 +2054,21 @@ public class PatrolResultController extends BaseController { } } - if (StringUtils.isNotEmpty(brr.getDeviceId())) { - String pointId = brr.getDeviceId(); - List> pointPrelist = this.patrolTaskService.selectBasePointPre(pointId); - if (pointPrelist != null && !pointPrelist.isEmpty()) { - Map drr = (Map) pointPrelist.get(0); - if (drr != null && drr.get("channel_code") != null) { - String channel_code = (String) drr.get("channel_code"); - brr.setPatroldeviceCode(channel_code); - BasedataEqpBookChannel basedataEqpBookChannel = this.patrolResultService.selectChannelName(channel_code); - if (basedataEqpBookChannel != null) { - brr.setPatroldeviceName(basedataEqpBookChannel.getChannelName()); - } - } - } - } +// if (StringUtils.isNotEmpty(brr.getDeviceId())) { +// String pointId = brr.getDeviceId(); +// List> pointPrelist = this.patrolTaskService.selectBasePointPre(pointId); +// if (pointPrelist != null && !pointPrelist.isEmpty()) { +// Map drr = (Map) pointPrelist.get(0); +// if (drr != null && drr.get("channel_code") != null) { +// String channel_code = (String) drr.get("channel_code"); +// brr.setPatroldeviceCode(channel_code); +// BasedataEqpBookChannel basedataEqpBookChannel = this.patrolResultService.selectChannelName(channel_code); +// if (basedataEqpBookChannel != null) { +// brr.setPatroldeviceName(basedataEqpBookChannel.getChannelName()); +// } +// } +// } +// } } } List filteredList = new ArrayList<>(); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointParam.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointParam.java index 94771ed..d416e7e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointParam.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointParam.java @@ -22,6 +22,7 @@ public class InspectionPointParam { String alarmLevel; String alarmType; String resultType; + String filter; int pageNum; int pageSize; int offset; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java index e014a63..4079b5f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java @@ -37,4 +37,5 @@ public class InspectionPointResultVo { String content; String resultType; String valid; + String filter; } 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 8323d1c..2331749 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 @@ -966,8 +966,8 @@ - - + + @@ -989,42 +989,56 @@ + - SELECT bd.device_name main_dev_name,bd.device_id main_dev_id ,bp.patrol_point_name device_name,bp.patrol_point_id device_id, - bec.channel_code patroldevice_code,bec.channel_name patroldevice_name, - latest_pr.task_code,latest_pr.task_name,latest_pr.line_id task_patrolled_id, - bpp.patrol_point_preset_id device_id, bpp.preset_name device_name, - latest_pr.value ,latest_pr.value_unit unit,latest_pr.recognition_type,latest_pr.time, - latest_pr.file_type,latest_pr.file_path,latest_pr.rectangle,latest_pr.valid --- #bec.*, bpp.*, latest_ra.*,latest_pr.* - FROM basedata_eqpbook_channel bec - LEFT JOIN basedata_patrolpoint_preset bpp ON bec.channel_code = bpp.channel_code - left join basedata_patrolpoint bp on bp.patrol_point_id = bpp.patrol_point_id - left join basedata_device bd on bp.main_device_id = bd.device_id - LEFT JOIN ( SELECT pr.* + select latest_pr.line_id id, + bec.channel_code patroldevice_code, + bec.channel_name patroldevice_name, + latest_pr.task_code, + latest_pr.task_name, + latest_pr.line_id task_patrolled_id, + bp.patrol_point_name device_name, + bp.patrol_point_id device_id, + bd.device_name main_dev_name, + bd.device_id main_dev_id , + bdb.device_name component_name, + bdb.device_id component_id , + ra.res_value value , + latest_pr.unit unit, + bas.alg_subtype_id recognition_type, + latest_pr.time, + latest_pr.file_type, + ra.res_img_url file_path, + CASE + WHEN ra.image_normal_url_path IS NOT NULL THEN CONCAT('/', ra.image_normal_url_path) + ELSE ra.image_normal_url_path + END base_file_path, + latest_pr.rectangle, + latest_pr.valid, + ra.filter + FROM (SELECT pr.* FROM patrol_result pr INNER JOIN ( SELECT device_id, MAX(time) AS max_create_time FROM patrol_result GROUP BY device_id - ) pr2 ON pr.device_id = pr2.device_id AND pr.time = pr2.max_create_time) latest_pr ON latest_pr.device_id = bpp.patrol_point_id + ) pr2 ON pr.device_id = pr2.device_id AND pr.time = pr2.max_create_time ) latest_pr + left join basedata_patrolpoint bp on bp.patrol_point_id = latest_pr.device_id + LEFT JOIN patrol_preset_pos bpp ON bp.patrol_point_id = bpp.patrol_point_id + left join basedata_eqpbook_channel bec on bpp.channel_code = bec.channel_code + left join basedata_device bd on bp.main_device_id = bd.device_id + left join result_analysis ra on ra.business_id = latest_pr.line_id + left join basedata_device bdb on bdb.device_id = bp.device_id + left join basedata_alg_subtype bas on ra.alg_type = bas.alg_subtype_code - bpp.patrol_point_id IS NOT NULL AND latest_pr.line_id IS NOT NULL - and bpp.channel_code = #{patroldeviceCode} + and bec.channel_code = #{patroldeviceCode}