From 19763ebd20ad16435f3c1ccfdc8abd1518712cc1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 24 Dec 2025 15:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java | 91 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 22 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 ea36520..bc41a9c 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
@@ -3,23 +3,27 @@
import com.ard.common.core.controller.BaseController;
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.core.page.TableDataInfo;
-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.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.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.receiver.*;
+import com.ard.work.service.IArdFlightTaskPartService;
+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;
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
@@ -35,56 +39,99 @@
@Resource
private ITyService tyService;
+ @Resource
+ private IArdFlightTaskService ardFlightTaskService;
+ @Resource
+ private IArdFlightTaskPartService ardFlightTaskPartService;
+ @Resource
+ private IArdMediaService ardMediaService;
- @ApiOperation("获取六合token信息")
+ @ApiOperation("获取边缘服务器token信息")
@ApiOperationSupport(order = 1)
@GetMapping("/getToken/{serverId}")
public AjaxResult getToken(@PathVariable("serverId") String serverId) {
return AjaxResult.success(tyService.getAccessToken(serverId));
}
- @ApiOperation("获取全部服务器盒子列表")
+ @ApiOperation("获取盒子列表")
@ApiOperationSupport(order = 2)
@GetMapping("/getBoxList")
- public AjaxResult getBoxList() {
- List<BoxInfoReceiver> boxList = tyService.getBoxList();
- return AjaxResult.success(boxList);
+ public AjaxResult getBoxList(@RequestParam(required = false) String serverId) {
+ if (serverId == null) {
+ return AjaxResult.success(tyService.getBoxList());
+ } else {
+ return AjaxResult.success(tyService.getBoxList(serverId));
+ }
}
@ApiOperation("获取飞行历史")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 4)
@PostMapping("/getBoxHistory")
public AjaxResult getBoxHistory(@RequestBody BoxHistoryDTO boxHistoryDTO) {
List<BoxHistoryReceiver> boxHistory = tyService.getBoxHistory(boxHistoryDTO);
return AjaxResult.success(boxHistory);
}
- @ApiOperation("获取任务照片")
+ @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("获取任务照片")
+ @ApiOperationSupport(order = 5)
@PostMapping("/getBoxPhotos")
public AjaxResult getBoxPhotos(@RequestBody BoxPhotosDTO boxPhotosDTO) {
List<BoxPhotosReceiver> boxPhotos = tyService.getBoxPhotos(boxPhotosDTO);
return AjaxResult.success(boxPhotos);
}
- @ApiOperation("获取直播地址")
+ @ApiOperation("获取任务视频")
@ApiOperationSupport(order = 5)
- @GetMapping("/getBoxList/{boxSn}")
+ @PostMapping("/getBoxVideos")
+ public AjaxResult getBoxVideos(@RequestBody BoxVideosDTO boxVideosDTO) {
+ List<BoxVideosReceiver> boxVideos = tyService.getBoxVideos(boxVideosDTO);
+ return AjaxResult.success(boxVideos);
+ }
+
+ @ApiOperation("获取直播地址")
+ @ApiOperationSupport(order = 6)
+ @GetMapping("/getBoxLiveUrl/{boxSn}")
public AjaxResult getBoxLiveUrl(@PathVariable("boxSn") String boxSn) {
BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(boxSn);
return AjaxResult.success(boxLiveUrl);
}
@ApiOperation("修改云盒设置")
- @ApiOperationSupport(order = 6)
+ @ApiOperationSupport(order = 7)
@PostMapping("/updateBoxSettings")
public AjaxResult updateBoxSettings(@RequestBody BoxSettingsDTO boxSettingsDTO) {
Boolean state = tyService.updateBoxSettings(boxSettingsDTO);
return AjaxResult.success(state);
}
- @ApiOperation("根据[服务器id]获取六合盒子列表")
- @ApiOperationSupport(order = 7)
+ @ApiOperation("根据[服务器id]获取边缘服务器盒子列表")
+ @ApiOperationSupport(order = 8)
@GetMapping("/getBoxSnToList/{id}")
public TableDataInfo getBoxSnToList(@PathVariable("id") String id) {
startPage();
--
Gitblit v1.9.3