From 3cd13607fe569164f6ab5284558ab8e258852940 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 15 Nov 2025 15:38:19 +0800
Subject: [PATCH] 2025-11-15 zwy 航线任务模块更改； 1、航线文件从夏吉建航线表中取； 2、修改增加循环任务功能； 3、增加字段及字段注释，对应JSON字段； 4、航线任务列表，增加筛选功能；根据不同条件查询结果。
---
ard-admin/src/main/java/com/ard/web/controller/sample/LiveStreamController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/LiveStreamController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/LiveStreamController.java
index db6e21b..b3d901a 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/LiveStreamController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/LiveStreamController.java
@@ -4,8 +4,10 @@
import com.ard.common.utils.SecurityUtils;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.mqtt.model.ChannelName;
+import com.ard.sample.component.websocket.handler.LiveStreamHandler;
import com.ard.sample.manage.model.dto.CapacityDeviceDTO;
import com.ard.sample.manage.model.dto.LiveTypeDTO;
+import com.ard.sample.manage.model.param.RemoteDebugParam;
import com.ard.sample.manage.model.receiver.LiveCapacityReceiver;
import com.ard.sample.manage.service.ILiveStreamService;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,6 +39,9 @@
private ILiveStreamService liveStreamService;
@Autowired
+ private LiveStreamHandler _liveStreamHandler;
+
+ @Autowired
private ObjectMapper mapper;
/**
@@ -57,13 +62,28 @@
* @return live capability
*/
@ApiOperation(value = "获取直播能力数据", notes = "获取当前用户工作空间下所有无人机的直播能力数据")
- @PreAuthorize("@ss.hasPermi('dock:live:capacity')")
+// @PreAuthorize("@ss.hasPermi('dock:live:capacity')")
@GetMapping("/capacity")
public ResponseResult<List<CapacityDeviceDTO>> getLiveCapacity(HttpServletRequest request) {
// Get information about the current user.
List<CapacityDeviceDTO> liveCapacity = liveStreamService.getLiveCapacity();
return ResponseResult.success(liveCapacity);
+ }
+
+ @ApiOperation("获取video_id")
+ @PostMapping("/videoid/{sn}")
+ public ResponseResult<LiveTypeDTO> getVideoId(@PathVariable String sn) {
+ LiveTypeDTO liveTypeDTO = new LiveTypeDTO();
+ try{
+ liveTypeDTO = _liveStreamHandler.getLiveParam(sn);
+
+ }
+ catch (Exception e){
+ // videoId = e.getMessage();
+ e.printStackTrace();
+ }
+ return ResponseResult.success(liveTypeDTO);
}
/**
@@ -73,7 +93,7 @@
* @return
*/
@ApiOperation(value = "开始直播", notes = "根据前端传入的参数开始直播")
- @PreAuthorize("@ss.hasPermi('dock:live:start')")
+// @PreAuthorize("@ss.hasPermi('dock:live:start')")
@PostMapping("/streams/start")
public ResponseResult liveStart(@RequestBody LiveTypeDTO liveParam) {
return liveStreamService.liveStart(liveParam);
@@ -86,7 +106,7 @@
* @return
*/
@ApiOperation(value = "停止直播", notes = "根据前端传入的参数停止直播")
- @PreAuthorize("@ss.hasPermi('dock:live:stop')")
+// @PreAuthorize("@ss.hasPermi('dock:live:stop')")
@PostMapping("/streams/stop")
public ResponseResult liveStop(@RequestBody LiveTypeDTO liveParam) {
return liveStreamService.liveStop(liveParam.getVideoId());
@@ -99,21 +119,21 @@
* @return
*/
@ApiOperation(value = "设置直播质量", notes = "根据前端传入的参数设置直播质量")
- @PreAuthorize("@ss.hasPermi('dock:live:quality')")
+// @PreAuthorize("@ss.hasPermi('dock:live:quality')")
@PostMapping("/quality/switch")
public ResponseResult liveSetQuality(@RequestBody LiveTypeDTO liveParam) {
return liveStreamService.liveSetQuality(liveParam);
}
@ApiOperation(value = "切换镜头", notes = "根据前端传入的参数切换镜头")
- @PreAuthorize("@ss.hasPermi('dock:live:lens')")
+// @PreAuthorize("@ss.hasPermi('dock:live:lens')")
@PostMapping("/lens/switch")
public ResponseResult liveLensChange(@RequestBody LiveTypeDTO liveParam) {
return liveStreamService.liveLensChange(liveParam);
}
@ApiOperation(value = "机场直播相机切换", notes = "根据前端传入的参数切换相机")
- @PreAuthorize("@ss.hasPermi('dock:live:camera')")
+// @PreAuthorize("@ss.hasPermi('dock:live:camera')")
@PostMapping("/camera/switch")
public ResponseResult liveCameraChange(@RequestBody LiveTypeDTO liveParam) {
return liveStreamService.liveCameraChange(liveParam);
--
Gitblit v1.9.3