From ba967da3b2d0d2f277113602e1d67ef848b7bb9a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 25 Nov 2025 14:33:52 +0800
Subject: [PATCH] 2025-11-25 zwy 增加rth_mode字段，默认为1；实体和DTO中增加@JsonInclude(JsonInclude.Include.NON_NULL)序列化时忽略所有 null 字段
---
ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
index a10104f..5c23ab9 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -40,12 +40,17 @@
<select id="selectArdRouteInfoList" parameterType="ArdRouteInfo" resultMap="ArdRouteInfoResult">
<include refid="selectArdRouteInfoVo"/>
<where>
- <if test="name != null and kmzName != ''"> and name like concat('%', #{name}, '%')</if>
+ <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="aircraft != null and aircraft != ''"> and aircraft = #{aircraft}</if>
<if test="payload != null and payload != ''"> and payload = #{payload}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="path != null and path != ''"> and path = #{path}</if>
+ <if test="groupId != null"> and group_id = #{groupId}</if>
</where>
+ <!-- 动态排序 -->
+ <if test="orderByTime != null and orderByTime != ''">
+ ORDER BY update_time ${orderByTime}
+ </if>
</select>
<select id="selectArdRouteInfoById" parameterType="String" resultMap="ArdRouteInfoResult">
@@ -59,7 +64,7 @@
<if test="id != null">id,</if>
<if test="name != null">name,</if>
<if test="path != null">path,</if>
- <if test="GroupId != null">group_id,</if>
+ <if test="groupId != null">group_id,</if>
<if test="type != null">type,</if>
<if test="aircraft != null">aircraft,</if>
<if test="payload != null">payload,</if>
@@ -74,7 +79,7 @@
<if test="id != null">#{id},</if>
<if test="name != null">#{name},</if>
<if test="path != null">#{path},</if>
- <if test="GroupId != null">#{GroupId},</if>
+ <if test="groupId != null">#{groupId},</if>
<if test="type != null">#{type},</if>
<if test="aircraft != null">#{aircraft},</if>
<if test="payload != null">#{payload},</if>
@@ -92,6 +97,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="path != null">path = #{path},</if>
+ <if test="groupId != null">group_id = #{groupId},</if>
<if test="type != null">type = #{type},</if>
<if test="aircraft != null">aircraft = #{aircraft},</if>
<if test="payload != null">payload = #{payload},</if>
@@ -118,7 +124,7 @@
<select id="selectArdRouteInfoByName" parameterType="String" resultMap="ArdRouteInfoResult">
<include refid="selectArdRouteInfoVo"/>
- where file_name = #{fileName}
+ where name = #{name}
</select>
<delete id="deleteRouteInforByGroupIds" parameterType="String">
--
Gitblit v1.9.3