From c0b167404dbc4e98ccb8b84f94f48c96bcb3df02 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 12 Dec 2025 09:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
index 2b0e11e..8d5f081 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -8,6 +8,7 @@
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
         <result property="path"    column="path"    />
+        <result property="path1"    column="path1"    />
         <result property="groupId"    column="group_id"    />
         <result property="type"    column="type"    />
         <result property="aircraft"    column="aircraft"    />
@@ -18,12 +19,14 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="pointCount"    column="point_count"    />
     </resultMap>
 
     <sql id="selectArdRouteInfoVo">
         select id,
                name,
                path,
+               path1,
                group_id,
                type,
                aircraft,
@@ -33,19 +36,28 @@
                create_by,
                create_time,
                update_by,
-               update_time
+               update_time,
+               point_count
         from ard_route_info
     </sql>
 
     <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 DESC
+        </if>
+        <!-- 动态排序 -->
+        <if test="orderByTime != null and orderByTime != ''">
+            ORDER BY update_time ${orderByTime}
+        </if>
     </select>
     
     <select id="selectArdRouteInfoById" parameterType="String" resultMap="ArdRouteInfoResult">
@@ -59,6 +71,7 @@
             <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="path != null">path,</if>
+            <if test="path1 != null">path1,</if>
             <if test="groupId != null">group_id,</if>
             <if test="type != null">type,</if>
             <if test="aircraft != null">aircraft,</if>
@@ -69,11 +82,13 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="pointCount != null">point_count,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="path != null">#{path},</if>
+            <if test="path1 != null">#{path1},</if>
             <if test="groupId != null">#{groupId},</if>
             <if test="type != null">#{type},</if>
             <if test="aircraft != null">#{aircraft},</if>
@@ -84,6 +99,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="pointCount != null">#{pointCount},</if>
          </trim>
     </insert>
 
@@ -92,6 +108,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="path != null">path = #{path},</if>
+            <if test="path1 != null">path1 = #{path1},</if>
             <if test="groupId != null">group_id = #{groupId},</if>
             <if test="type != null">type = #{type},</if>
             <if test="aircraft != null">aircraft = #{aircraft},</if>
@@ -102,6 +119,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="pointCount != null">point_count = #{pointCount},</if>
         </trim>
         where id = #{id}
     </update>
@@ -119,7 +137,7 @@
 
     <select id="selectArdRouteInfoByName" parameterType="String" resultMap="ArdRouteInfoResult">
         <include refid="selectArdRouteInfoVo"/>
-        where file_name = #{fileName}
+        where name = #{name}
     </select>
 
     <delete id="deleteRouteInforByGroupIds" parameterType="String">
@@ -130,7 +148,7 @@
     </delete>
 
     <select id="selectArdRouteInfoByGroupId" parameterType="String" resultMap="ArdRouteInfoResult">
-        select id,name,path,group_id,type,aircraft,payload,read_only,create_by,create_time,update_by,update_time from ard_route_info
+        select id,name,path,path1,group_id,type,aircraft,payload,read_only,create_by,create_time,update_by,update_time,point_count from ard_route_info
         <where>
             <if test="groupId != null "> and group_id = #{groupId}</if>
         </where>

--
Gitblit v1.9.3