From 3339af3ec5d084083d27ac03f978687ad026b0a5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 11:19:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml b/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
index 236313f..4556039 100644
--- a/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
+++ b/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
@@ -20,6 +20,20 @@
<result property="filePath" column="file_path" />
</resultMap>
+<!-- <resultMap type="ArdPointCloud" id="ArdPointCloudRouteNameResult">-->
+<!-- <result property="id" column="id" />-->
+<!-- <result property="cloudName" column="cloud_name" />-->
+<!-- <result property="fileName" column="file_name" />-->
+<!-- <result property="folderName" column="folder_name" />-->
+<!-- <result property="fileSize" column="file_size" />-->
+<!-- <result property="associatedState" column="associated_state" />-->
+<!-- <result property="routeId" column="route_id" />-->
+<!-- <result property="groupId" column="group_id" />-->
+<!-- <result property="filePath" column="file_path" />-->
+<!-- <result property="filePath" column="file_path" />-->
+<!-- <result property="filePath" column="file_path" />-->
+<!-- </resultMap>-->
+
<sql id="selectArdPointCloudVo">
select id,
cloud_name,
@@ -35,6 +49,24 @@
update_time,
file_path
from ard_point_cloud
+ </sql>
+
+ <sql id="selectArdPointCloudRouteName">
+ SELECT
+ a.id,
+ a.cloud_name,
+ a.file_name,
+ a.folder_name,
+ a.file_size,
+ a.associated_state,
+ a.route_id,
+ a.group_id,
+ a.file_path,
+ c.id,
+ c.name
+ FROM ard_point_cloud a
+ LEFT JOIN ard_route_cloud b ON a.id = b.cloud_id
+ LEFT JOIN ard_route_info c ON b.route_id = c.id
</sql>
<select id="selectArdPointCloudList" parameterType="ArdPointCloud" resultMap="ArdPointCloudResult">
@@ -130,4 +162,12 @@
where file_name = #{fileName}
</select>
+ <select id="selectArdPointCloudNotList" parameterType="String" resultMap="ArdPointCloudResult">
+ <include refid="selectArdPointCloudVo"/>
+ where id NOT IN
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3