From 277b4f8a32c2332bc067a263bcce2e763e8d13aa Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 21 Jan 2026 16:38:01 +0800
Subject: [PATCH] 1. 新增航线任务接口。 2. 新增查询航线任务列表接口。 3. 新增获取航线任务详细信息。 4. 新增航线任务接口。 5. 新增修改航线任务接口。 6. 新增删除航线任务接口。 7. 新增修改航线任务状态接口。 8. 优化查询分组业务逻辑。 9. 航线(kmz)对象增加航线任务ID信息。 10. 新增航线(kmz)业务增加航线任务数据加工校验相关业务逻辑。 11. 新增航向任务下航点信息业务相关接口。

---
 ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 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..9fde058 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -18,6 +18,9 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="pointCount"    column="point_count"    />
+        <result property="isLoop"    column="is_loop"    />
+        <result property="missionId"    column="mission_id"    />
     </resultMap>
 
     <sql id="selectArdRouteInfoVo">
@@ -33,19 +36,31 @@
                create_by,
                create_time,
                update_by,
-               update_time
+               update_time,
+               point_count,
+               is_loop,
+               mission_id
         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>
+            <if test="isLoop != null"> and is_loop = #{isLoop}</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">
@@ -69,6 +84,9 @@
             <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>
+            <if test="isLoop != null">is_loop,</if>
+            <if test="missionId != null">mission_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -84,6 +102,9 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="pointCount != null">#{pointCount},</if>
+            <if test="isLoop != null">#{isLoop},</if>
+            <if test="missionId != null">#{missionId},</if>
          </trim>
     </insert>
 
@@ -102,6 +123,9 @@
             <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>
+            <if test="isLoop != null">is_loop = #{isLoop},</if>
+            <if test="missionId != null">mission_id = #{missionId},</if>
         </trim>
         where id = #{id}
     </update>
@@ -119,7 +143,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 +154,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
+        <include refid="selectArdRouteInfoVo"/>
         <where>
             <if test="groupId != null "> and group_id = #{groupId}</if>
         </where>

--
Gitblit v1.9.3