From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java | 30 +-----------------------------
1 files changed, 1 insertions(+), 29 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 bc41a9c..0904ee9 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
@@ -5,9 +5,7 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.work.domain.dto.*;
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.entity.*;
import com.ard.work.domain.receiver.*;
import com.ard.work.service.IArdFlightTaskPartService;
import com.ard.work.service.IArdFlightTaskService;
@@ -70,32 +68,6 @@
public AjaxResult getBoxHistory(@RequestBody BoxHistoryDTO boxHistoryDTO) {
List<BoxHistoryReceiver> boxHistory = tyService.getBoxHistory(boxHistoryDTO);
return AjaxResult.success(boxHistory);
- }
-
- @ApiOperation("获取飞行架次")
- @ApiOperationSupport(order = 4)
- @GetMapping("/getFlightTask")
- public TableDataInfo getFlightTask(ArdFlightTask ardFlightTask) {
- startPage();
- List<ArdFlightTask> list = ardFlightTaskService.selectArdFlightTask(ardFlightTask);
- 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")
- public TableDataInfo getMediaList(ArdMedia ardMedia) {
- startPage();
- List<ArdMedia> list = ardMediaService.selectArdMediaList(ardMedia);
- return getDataTable(list);
}
@ApiOperation("获取任务照片")
--
Gitblit v1.9.3