From f3de8ac216bfc05348222e2b963ef3629358ae62 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 06 Dec 2025 15:49:20 +0800
Subject: [PATCH] 2025-12-06 zwy 修改设备属性设置方法，不抛异常，返回错误号与错误提示。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
index e2fb700..d7bbe16 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -22,6 +22,7 @@
import com.ard.vtdu.domain.ArdVtdu;
import com.ard.vtdu.service.IArdMediaService;
import com.ard.vtdu.service.IArdVtduService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +41,7 @@
* @version 0.1
* @date 2021/11/22
*/
+@Slf4j
@Service
@Transactional
public class LiveStreamServiceImpl implements ILiveStreamService {
@@ -116,7 +118,7 @@
ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
- return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
+ return ResponseResult.error(receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
}
LiveUrlTypeEnum urlType = LiveUrlTypeEnum.find(liveParam.getUrlType());
@@ -140,12 +142,36 @@
// 如果没有，插入新的记录
ArdVtdu vtdu =
ArdVtdu.builder().name(name).rtspSource("publisher").rtspUrl(rtspUrl).rtmpUrl(rtmpUrl).webrtcUrl(webrtcUrl).build();
- int i = ardVtduService.insertArdVtdu(vtdu); // 保存到媒体表
- if (i > 0) {
- live.setRtmpUrl(rtmpUrl);
- live.setRtspUrl(rtspUrl);
- live.setWebrtcUrl(webrtcUrl);
+ // 在停止直播时不删除Vtdu表记录，所以在开启直播时再插入会报错，
+ // 所以要先查询是否存在该记录，如果已经存在记录，直接返回直播地址
+ // 查询是否已经存在该记录
+ ArdVtdu ardVtdu = ardVtduService.selectArdVtduByName(vtdu.getName());
+ int i = 0;
+ log.info("机场视频插入前vtdu:{}",vtdu);
+ if(ardVtdu == null){
+ i = ardVtduService.insertArdVtdu(vtdu); // 保存到媒体表
+ log.info("机场视频插入后 i:{}",i);
+ if (i > 0) {
+ live.setRtmpUrl(rtmpUrl);
+ live.setRtspUrl(rtspUrl);
+ live.setWebrtcUrl(webrtcUrl);
+ }
}
+ else{
+ i = ardVtduService.updateArdVtdu(vtdu);
+ log.info("机场视频更新后 i:{}",i);
+ if (i > 0) {
+ live.setRtmpUrl(rtmpUrl);
+ live.setRtspUrl(rtspUrl);
+ live.setWebrtcUrl(webrtcUrl);
+ }
+ }
+ //int i = ardVtduService.insertArdVtdu(vtdu); // 保存到媒体表
+// if (i > 0) {
+// live.setRtmpUrl(rtmpUrl);
+// live.setRtspUrl(rtspUrl);
+// live.setWebrtcUrl(webrtcUrl);
+// }
break;
case RTSP:
@@ -156,6 +182,11 @@
return ResponseResult.error(LiveErrorEnum.URL_TYPE_NOT_SUPPORTED);
}
+ // 开始直播时发送机场相机摄像头默认信息（舱外）到所有在线用户,只取机场sn，发机场的摄像头信息
+ if(data.getChildDeviceSn()!=null) {
+ String sn = data.getDeviceSn();
+ deviceService.setRedisCameraPosition(sn, 1);
+ }
return ResponseResult.success(live);
}
@@ -172,7 +203,8 @@
if (receiveReply.getResult() != 0) {
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
- ardVtduService.deleteArdVtduByName(videoId);
+ //注释掉删除流媒体管理库中的信息
+// ardVtduService.deleteArdVtduByName(videoId);
return ResponseResult.success();
}
@@ -241,6 +273,10 @@
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
+ // 将切换相机摄像头信息到redis
+ Integer camera_position = liveParam.getCameraPosition();
+ String sn = responseResult.getData().getDeviceSn();
+ deviceService.setRedisCameraPosition(sn, camera_position);
return ResponseResult.success();
}
--
Gitblit v1.9.3