From ff3ebae026537f151d3fd604048597b7738a925a Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 06 Mar 2026 08:47:52 +0800
Subject: [PATCH] 1. 大文件上传并解压接口业务优化 2. 优化精细化巡检分组权限管理 3. 优化点云文件权限管理 4. 上传到服务器点云文件

---
 ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml b/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
index b05f5c2..236313f 100644
--- a/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
+++ b/ard-inspection/src/main/resources/mapper/ArdPointCloudMapper.xml
@@ -6,7 +6,9 @@
     
     <resultMap type="ArdPointCloud" id="ArdPointCloudResult">
         <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"    />
@@ -15,11 +17,14 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="filePath"    column="file_path"    />
     </resultMap>
 
     <sql id="selectArdPointCloudVo">
         select id,
+               cloud_name,
                file_name,
+               folder_name,
                file_size,
                associated_state,
                route_id,
@@ -27,18 +32,27 @@
                create_by,
                create_time,
                update_by,
-               update_time
+               update_time,
+               file_path
         from ard_point_cloud
     </sql>
 
     <select id="selectArdPointCloudList" parameterType="ArdPointCloud" resultMap="ArdPointCloudResult">
         <include refid="selectArdPointCloudVo"/>
-        <where>  
+        <where>
+            <if test="cloudName != null  and cloudName != ''"> and cloud_name like concat('%', #{cloudName}, '%')</if>
             <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 != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+            </if>
         </where>
     </select>
     
@@ -51,7 +65,9 @@
         insert into ard_point_cloud
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="cloudName != null">cloud_name,</if>
             <if test="fileName != null">file_name,</if>
+            <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>
@@ -60,10 +76,13 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="filePath != null">file_path,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="cloudName != null">#{cloudName},</if>
             <if test="fileName != null">#{fileName},</if>
+            <if test="folderName != null">#{folderName},</if>
             <if test="fileSize != null">#{fileSize},</if>
             <if test="associatedState != null">#{associatedState},</if>
             <if test="routeId != null">#{routeId},</if>
@@ -72,13 +91,16 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="filePath != null">#{filePath},</if>
          </trim>
     </insert>
 
     <update id="updateArdPointCloud" parameterType="ArdPointCloud">
         update ard_point_cloud
         <trim prefix="SET" suffixOverrides=",">
+            <if test="cloudName != null">cloud_name = #{cloudName},</if>
             <if test="fileName != null">file_name = #{fileName},</if>
+            <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>
@@ -87,6 +109,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="filePath != null">file_path = #{filePath},</if>
         </trim>
         where id = #{id}
     </update>
@@ -102,4 +125,9 @@
         </foreach>
     </delete>
 
+    <select id="selectArdPointCloudByFileName" parameterType="String" resultMap="ArdPointCloudResult">
+        <include refid="selectArdPointCloudVo"/>
+        where file_name = #{fileName}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3