From 894d18bb13dae351028e584f9b73a8d6964a0a50 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 19 Nov 2025 13:51:17 +0800
Subject: [PATCH] 2025-11-15 zwy 航线信息被删掉后，航线任务列表在读取航线时会报错；处理错误，航线不存在时航线文件名称显示空。正常逻辑应该是航线文件有任务在用，就不能随意删除；
---
ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 ad009c0..2ca21ae 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,10 +6,15 @@
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.entity.ArdFlightTask;
+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.BoxStreamUrlReceiver;
+import com.ard.work.service.IArdFlightTaskService;
+import com.ard.work.service.IArdMediaService;
import com.ard.work.service.ITyService;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSort;
@@ -35,6 +40,10 @@
@Resource
private ITyService tyService;
+ @Resource
+ private IArdFlightTaskService ardFlightTaskService;
+ @Resource
+ private IArdMediaService ardMediaService;
@ApiOperation("获取边缘服务器token信息")
@ApiOperationSupport(order = 1)
@@ -61,6 +70,23 @@
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("/getMediaList")
+ public TableDataInfo getMediaList(ArdMedia ardMedia) {
+ startPage();
+ List<ArdMedia> list = ardMediaService.selectArdMediaList(ardMedia);
+ return getDataTable(list);
+ }
@ApiOperation("获取任务照片")
@ApiOperationSupport(order = 5)
@@ -72,7 +98,7 @@
@ApiOperation("获取直播地址")
@ApiOperationSupport(order = 6)
- @GetMapping("/getBoxList/{boxSn}")
+ @GetMapping("/getBoxLiveUrl/{boxSn}")
public AjaxResult getBoxLiveUrl(@PathVariable("boxSn") String boxSn) {
BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(boxSn);
return AjaxResult.success(boxLiveUrl);
--
Gitblit v1.9.3