From bc8f980e912825eaaadaf9fdd2367f443a56de02 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 07 Mar 2026 10:17:19 +0800
Subject: [PATCH] 2026-03-07 标记功能接口，支持点、线、面、圆标记存储
---
ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
index 60c1ef7..0cfc482 100644
--- a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
+++ b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/LiveStreamHandler.java
@@ -38,6 +38,11 @@
try {
// 获取直播参数
LiveTypeDTO param = getLiveParam(sn);
+ // 判断param是否为空，不为空则返回正确的直播参数，为null则未获取直播参数，不为空则继续操作
+ if (param == null) {
+ log.info("SN: {}-未获取到直播参数param为null，无法开启直播！", sn);
+ return;
+ }
// 如果存在直播则读取直播地址返回
if (RedisOpsUtils.checkExist(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn)) {
resultLive = String.valueOf(RedisOpsUtils.get(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn));
@@ -60,6 +65,9 @@
log.info("SN: {}-更新webrtc地址成功！", sn);
}
}
+ else {
+ log.info("SN: {}-开启直播失败！返回值：{}", sn, rlive);
+ }
}
_dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.LIVESTREAM.getType(), resultLive, userId);
log.info("SN: {}-直播地址：{}", sn, resultLive);
@@ -77,6 +85,7 @@
LiveTypeDTO param = getLiveParam(sn);
// 停止直播逻辑
rlive = _liveStreamService.liveStop(param.getVideoId());
+ log.info("SN: {}-停止直播！返回值：{}", sn, rlive);
// rlive.setGateway(sn);
// rlive.setType(MessageType.LIVESTREAM.getType());
// resultLive = _objectMapper.writeValueAsString(rlive);
@@ -122,8 +131,9 @@
List<CapacityDeviceDTO> devicesList = _liveStreamService.getLiveCapacity();
if (devicesList == null || devicesList.isEmpty()) {
log.info("SN: {}-未获得设备直播能力！", sn);
+ return null;
// 抛弃出异常，给调用者处理
- throw new Exception("未获得设备直播能力！");
+ // throw new Exception("未获得设备直播能力！");
}
for (CapacityDeviceDTO device : devicesList) {
if (!device.getSn().equals(sn)) {
--
Gitblit v1.9.3