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/sample/LiveStreamController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 03a960e..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;
/**
@@ -66,6 +71,21 @@
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);
+ }
+
/**
* Live streaming according to the parameters passed in from the web side.
*
--
Gitblit v1.9.3