From ba8b1496ba9881719e522d0a60a8c86baa7be08b Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 20 Dec 2025 10:34:23 +0800
Subject: [PATCH] 优化飞行状态

---
 ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java b/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
index 2ca21ae..626e421 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java
@@ -6,13 +6,16 @@
 import com.ard.work.domain.dto.BoxHistoryDTO;
 import com.ard.work.domain.dto.BoxPhotosDTO;
 import com.ard.work.domain.dto.BoxSettingsDTO;
-import com.ard.work.domain.entity.ArdDroneInfo;
+import com.ard.work.domain.dto.UavFlightStateDTO;
+import com.ard.work.domain.dto.telemetry.TelemetryData;
 import com.ard.work.domain.entity.ArdFlightTask;
+import com.ard.work.domain.entity.ArdFlightTaskPart;
 import com.ard.work.domain.entity.ArdMedia;
 import com.ard.work.domain.receiver.BoxHistoryReceiver;
-import com.ard.work.domain.receiver.BoxPhotosReceiver;
 import com.ard.work.domain.receiver.BoxInfoReceiver;
+import com.ard.work.domain.receiver.BoxPhotosReceiver;
 import com.ard.work.domain.receiver.BoxStreamUrlReceiver;
+import com.ard.work.service.IArdFlightTaskPartService;
 import com.ard.work.service.IArdFlightTaskService;
 import com.ard.work.service.IArdMediaService;
 import com.ard.work.service.ITyService;
@@ -20,11 +23,13 @@
 import com.github.xiaoymin.knife4j.annotations.ApiSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import java.util.List;
 
-import static com.ard.common.utils.PageUtils.startPage;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
 
 /**
  * UavBaseController
@@ -42,6 +47,8 @@
     private ITyService tyService;
     @Resource
     private IArdFlightTaskService ardFlightTaskService;
+    @Resource
+    private IArdFlightTaskPartService ardFlightTaskPartService;
     @Resource
     private IArdMediaService ardMediaService;
 
@@ -79,6 +86,14 @@
         return getDataTable(list);
     }
 
+    @ApiOperation("获取架次飞行轨迹")
+    @ApiOperationSupport(order = 4)
+    @GetMapping("/getCompleteFlightData")
+    public TableDataInfo getCompleteFlightData(ArdFlightTaskPart ardFlightTaskPart){
+        List<UavFlightStateDTO> completeFlightData = ardFlightTaskPartService.getCompleteFlightData(ardFlightTaskPart);
+        return getDataTable(completeFlightData);
+    }
+
     @ApiOperation("获取媒体数据")
     @ApiOperationSupport(order = 4)
     @GetMapping("/getMediaList")

--
Gitblit v1.9.3