From 9051d6194b11a2151bd62b9be731689524a32d5a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 12:58:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml | 61 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml b/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
index 4556039..9df8940 100644
--- a/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
+++ b/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
@@ -11,7 +11,6 @@
<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="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -20,19 +19,18 @@
<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>-->
+ <resultMap type="ArdPointCloudRoute" 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="groupId" column="group_id" />
+ <result property="filePath" column="file_path" />
+ <result property="routeId" column="route_id" />
+ <result property="name" column="name" />
+ </resultMap>
<sql id="selectArdPointCloudVo">
select id,
@@ -41,7 +39,6 @@
folder_name,
file_size,
associated_state,
- route_id,
group_id,
create_by,
create_time,
@@ -59,10 +56,9 @@
a.folder_name,
a.file_size,
a.associated_state,
- a.route_id,
a.group_id,
a.file_path,
- c.id,
+ c.id as route_id,
c.name
FROM ard_point_cloud a
LEFT JOIN ard_route_cloud b ON a.id = b.cloud_id
@@ -76,7 +72,6 @@
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileSize != null "> and file_size = #{fileSize}</if>
<if test="associatedState != null and associatedState != ''"> and associated_state = #{associatedState}</if>
- <if test="routeId != null and routeId != ''"> and route_id = #{routeId}</if>
<if test="groupId != null and groupId != ''"> and group_id = #{groupId}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
@@ -102,7 +97,6 @@
<if test="folderName != null">folder_name,</if>
<if test="fileSize != null">file_size,</if>
<if test="associatedState != null">associated_state,</if>
- <if test="routeId != null">route_id,</if>
<if test="groupId != null">group_id,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@@ -117,7 +111,6 @@
<if test="folderName != null">#{folderName},</if>
<if test="fileSize != null">#{fileSize},</if>
<if test="associatedState != null">#{associatedState},</if>
- <if test="routeId != null">#{routeId},</if>
<if test="groupId != null">#{groupId},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@@ -135,7 +128,6 @@
<if test="folderName != null">folder_name = #{folderName},</if>
<if test="fileSize != null">file_size = #{fileSize},</if>
<if test="associatedState != null">associated_state = #{associatedState},</if>
- <if test="routeId != null">route_id = #{routeId},</if>
<if test="groupId != null">group_id = #{groupId},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
@@ -162,12 +154,29 @@
where file_name = #{fileName}
</select>
- <select id="selectArdPointCloudNotList" parameterType="String" resultMap="ArdPointCloudResult">
+ <select id="selectArdPointCloudNotList" resultMap="ArdPointCloudResult">
<include refid="selectArdPointCloudVo"/>
- where id NOT IN
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
+ where 1=1
+ <if test="ids != null and ids.length > 0">
+ and id NOT IN
+ <foreach item="id" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="cloudName != null and cloudName != ''">
+ and cloud_name like concat('%', #{cloudName}, '%')
+ </if>
+ <if test="groupId != null and groupId != ''">
+ and group_id = #{groupId}
+ </if>
+ </select>
+
+ <select id="selectPointCloudRoute" parameterType="String" resultMap="ArdPointCloudRouteNameResult">
+ <include refid="selectArdPointCloudRouteName"/>
+ <where>
+ c.id is NOT NULL
+ <if test="id != null and id != ''"> and a.id = #{id}</if>
+ </where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3