From 0f5b969ddd52ca43ef003867b5a6749d74b7d71d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 12 Nov 2025 17:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
index c525b94..6eca74e 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
@@ -9,7 +9,13 @@
<result property="fileName" column="file_name" />
<result property="fileNameNew" column="file_name_new" />
<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="routeType" column="route_type" />
+ <result property="aircraft" column="aircraft" />
+ <result property="aircraftModel" column="aircraft_model" />
+ <result property="routeData" column="route_data" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@@ -21,7 +27,13 @@
file_name,
file_name_new,
up_path,
+ minio_up_path,
up_file_size,
+ folder_id,
+ route_type,
+ aircraft,
+ aircraft_model,
+ route_data,
create_by,
create_time,
update_by,
@@ -33,6 +45,9 @@
<include refid="selectArdRouteInformationVo"/>
<where>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+ <if test="aircraft != null and aircraft != ''"> and aircraft = #{aircraft}</if>
+ <if test="aircraftModel != null and aircraftModel != ''"> and aircraft_model = #{aircraftModel}</if>
+ <if test="routeType != null and routeType != ''"> and route_type = #{routeType}</if>
<if test="upPath != null and upPath != ''"> and up_path = #{upPath}</if>
<if test="upFileSize != null "> and up_file_size = #{upFileSize}</if>
</where>
@@ -50,7 +65,13 @@
<if test="fileName != null">file_name,</if>
<if test="fileNameNew != null">file_name_new,</if>
<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="routeType != null">route_type,</if>
+ <if test="aircraft != null">aircraft,</if>
+ <if test="aircraftModel != null">aircraft_model,</if>
+ <if test="routeData != null">route_data,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
@@ -61,7 +82,13 @@
<if test="fileName != null">#{fileName},</if>
<if test="fileNameNew != null">#{fileNameNew},</if>
<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="routeType != null">#{routeType},</if>
+ <if test="aircraft != null">#{aircraft},</if>
+ <if test="aircraftModel != null">#{aircraftModel},</if>
+ <if test="routeData != null">#{routeData},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
@@ -75,7 +102,12 @@
<if test="fileName != null">file_name = #{fileName},</if>
<if test="fileNameNew != null">file_name_new = #{fileNameNew},</if>
<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="routeType != null">route_type = #{routeType},</if>
+ <if test="aircraft != null">aircraft = #{aircraft},</if>
+ <if test="aircraftModel != null">aircraft_model = #{aircraftModel},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@@ -95,4 +127,31 @@
</foreach>
</delete>
+ <select id="selectArdRouteInformationByName" parameterType="String" resultMap="ArdRouteInformationResult">
+ <include refid="selectArdRouteInformationVo"/>
+ 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>
+
+ <select id="selectArdRouteInformationByFolderId" parameterType="String" resultMap="ArdRouteInformationResult">
+ <include refid="selectArdRouteInformationVo"/>
+ <where>
+ <if test="folderId != null "> and folder_id = #{folderId}</if>
+ </where>
+ </select>
+
+ <update id="updateRouteInformationFolderId">
+ update ard_route_information
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="folderId != null">folder_id = #{folderId},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3