From ef497a4547843e1ade23d80f40bc682dca952ed0 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 06 Nov 2025 15:23:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
index b3dcf38..767a940 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
@@ -11,6 +11,7 @@
<result property="upPath" column="up_path" />
<result property="minioUpPath" column="minio_up_path" />
<result property="upFileSize" column="up_file_size" />
+ <result property="folderId" column="folder_id" />
<result property="aircraft" column="aircraft" />
<result property="aircraftModel" column="aircraft_model" />
<result property="createBy" column="create_by" />
@@ -26,6 +27,7 @@
up_path,
minio_up_path,
up_file_size,
+ folder_id,
aircraft,
aircraft_model,
create_by,
@@ -58,6 +60,7 @@
<if test="upPath != null">up_path,</if>
<if test="minioUpPath != null">minio_up_path,</if>
<if test="upFileSize != null">up_file_size,</if>
+ <if test="folderId != null">folder_id,</if>
<if test="aircraft != null">aircraft,</if>
<if test="aircraftModel != null">aircraft_model,</if>
<if test="createBy != null">create_by,</if>
@@ -72,6 +75,7 @@
<if test="upPath != null">#{upPath},</if>
<if test="minioUpPath != null">#{minioUpPath},</if>
<if test="upFileSize != null">#{upFileSize},</if>
+ <if test="folderId != null">#{folderId},</if>
<if test="aircraft != null">#{aircraft},</if>
<if test="aircraftModel != null">#{aircraftModel},</if>
<if test="createBy != null">#{createBy},</if>
@@ -89,6 +93,7 @@
<if test="upPath != null">up_path = #{upPath},</if>
<if test="minioUpPath != null">minio_up_path = #{minioUpPath},</if>
<if test="upFileSize != null">up_file_size = #{upFileSize},</if>
+ <if test="folderId != null">folder_id = #{folderId},</if>
<if test="aircraft != null">aircraft = #{aircraft},</if>
<if test="aircraftModel != null">aircraft_model = #{aircraftModel},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -115,4 +120,11 @@
where file_name = #{fileName}
</select>
+ <delete id="deleteRouteInformationByFolderIds" parameterType="String">
+ delete from ard_route_information where folder_id in
+ <foreach item="folderId" collection="array" open="(" separator="," close=")">
+ #{folderId}
+ </foreach>
+ </delete>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3