From b097f7539a7429a85cdda7959c9ecb83a37a2918 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 11 Jun 2026 14:49:28 +0800
Subject: [PATCH] 架次关联航线

---
 ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
index dae11c0..910a082 100644
--- a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
@@ -14,7 +14,13 @@
         <result property="videoPath" column="video_path"/>
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
+        <result property="flightDuration" column="flight_duration"/>
+        <result property="flightMileage" column="flight_mileage"/>
+        <result property="aveSpeed" column="ave_speed"/>
+        <result property="maxSpeed" column="max_speed"/>
         <result property="serverId" column="server_id"/>
+        <result property="flightMode" column="flight_mode"/>
+        <result property="routeId" column="route_id"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -33,7 +39,13 @@
         aft.video_path,
         aft.start_time,
         aft.end_time,
+        aft.flight_duration,
+        aft.flight_mileage,
+        aft.ave_speed,
+        aft.max_speed,
         aft.server_id,
+        aft.flight_mode,
+        aft.route_id,
         aft.create_by,
         aft.create_time,
         aft.update_by,
@@ -49,6 +61,14 @@
                 <if test="startTime != null">AND aft.start_time &gt;= #{startTime}</if>
                 <if test="endTime != null">AND aft.end_time &lt;= #{endTime}</if>
                 <if test="serverId != null">AND aft.server_id = #{serverId}</if>
+                <if test="routeId != null">AND aft.route_id = #{routeId}</if>
+                <if test="flightMode != null">AND aft.flight_mode = #{flightMode}</if>
+                <if test="params.beginTime != null"><!-- 开始时间检索 -->
+                    AND aft.create_time &gt;= #{params.beginTime}
+                </if>
+                <if test="params.endTime != null"><!-- 结束时间检索 -->
+                    AND aft.create_time &lt;= #{params.endTime}
+                </if>
             </trim>
         </where>
         ORDER BY aft.task_id DESC
@@ -67,7 +87,13 @@
             <if test="videoPath != null">video_path,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
+            <if test="flightDuration != null">flight_duration,</if>
+            <if test="flightMileage != null">flight_mileage,</if>
+            <if test="aveSpeed != null">ave_speed,</if>
+            <if test="maxSpeed != null">max_speed,</if>
             <if test="serverId != null">server_id,</if>
+            <if test="flightMode != null">flight_mode,</if>
+            <if test="routeId != null">route_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -84,7 +110,13 @@
             <if test="videoPath != null">#{videoPath},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
+            <if test="flightDuration != null">#{flightDuration},</if>
+            <if test="flightMileage != null">#{flightMileage},</if>
+            <if test="aveSpeed != null">#{aveSpeed},</if>
+            <if test="maxSpeed != null">#{maxSpeed},</if>
             <if test="serverId != null">#{serverId},</if>
+            <if test="flightMode != null">#{flightMode},</if>
+            <if test="routeId != null">#{routeId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -105,7 +137,13 @@
             <if test="videoPath != null">video_path = #{videoPath},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="flightDuration != null">flight_duration = #{flightDuration},</if>
+            <if test="flightMileage != null">flight_mileage = #{flightMileage},</if>
+            <if test="aveSpeed != null">ave_speed = #{aveSpeed},</if>
+            <if test="maxSpeed != null">max_speed = #{maxSpeed},</if>
             <if test="serverId != null">server_id = #{serverId},</if>
+            <if test="flightMode != null">flight_mode = #{flightMode},</if>
+            <if test="routeId != null">route_id = #{routeId},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
@@ -120,13 +158,13 @@
         WHERE task_id = #{taskId}
     </select>
 
-
     <!-- 获取某个时间戳后的任务 -->
     <select id="getTasksAfter" resultType="ArdFlightTask">
         SELECT *
         FROM ard_flight_task
         WHERE end_time > #{lastSyncTime}
     </select>
+
     <select id="findMaxStartTimeByServerId" resultType="java.util.Date">
         SELECT MAX(start_time)
         FROM ard_flight_task

--
Gitblit v1.9.3