From 87df5b53109d185d8d1d1a8ba1b9ac26b9e25197 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 05 Dec 2025 16:22:25 +0800
Subject: [PATCH] 增加架次中飞行时长/飞行里程/平均速度/最大速度字段
---
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java | 4 ++++
ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml | 20 ++++++++++++++++++++
ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java | 4 ++++
3 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java b/ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java
index 62a8d23..0556aba 100644
--- a/ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java
+++ b/ard-work/src/main/java/com/ard/work/domain/entity/ArdFlightTask.java
@@ -25,6 +25,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime; // 任务结束时间
private Long duration; // 持续时长(单位:秒)
+ private Integer flightDuration; // 飞行时长(单位:秒)
+ private Integer flightMileage; // 飞行里程
+ private Float aveSpeed; // 平均速度
+ private Float maxSpeed; // 最大速度
private String serverId; // 服务器ID
// 计算持续时长,单位:秒
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
index 4365828..70f86ab 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java
@@ -135,6 +135,10 @@
.serverId(serverId)
.startTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, boxHistoryReceiver.getStartTime()))
.endTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, boxHistoryReceiver.getEndTime()))
+ .flightMileage(boxHistoryReceiver.getFlightMileage())
+ .flightDuration(boxHistoryReceiver.getFlightDuration())
+ .aveSpeed(boxHistoryReceiver.getAveSpeed())
+ .maxSpeed(boxHistoryReceiver.getMaxSpeed())
.build();
Long flyUserId = uavControlService.getCurrentController(flightTask.getBoxSn(), "fly");
diff --git a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
index dae11c0..51b88d3 100644
--- a/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml
@@ -14,6 +14,10 @@
<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="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
@@ -33,6 +37,10 @@
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.create_by,
aft.create_time,
@@ -67,6 +75,10 @@
<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="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@@ -84,6 +96,10 @@
<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="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@@ -105,6 +121,10 @@
<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="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
--
Gitblit v1.9.3