From 82946c8521c4a371dcfff3def6f0027a6aa469ea Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 09 Dec 2025 13:38:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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 cca3705..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");
@@ -196,10 +200,6 @@
if (needUpdate) {
ardFlightTaskMapper.updateArdFlightTask(local);
}
-
- // 其它媒体增量更新
- updateVideoToDatabase(local, remote.getVideoPathList());
- updatePhotoToDatabase(local, local.getServerId(), remote.getBoxSn());
}
--
Gitblit v1.9.3