From 342236a5694a22c544a217c9f1503e5ac790b609 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 17:42:46 +0800
Subject: [PATCH] 2026-04-01 优化机场视频推流顺序，先入库再推流。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 26df1ee..5330d79 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
@@ -21,7 +21,6 @@
import com.ard.sample.manage.service.ILiveStreamService;
import com.ard.vtdu.config.MediamtxConfig;
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;
@@ -44,7 +43,7 @@
*/
@Slf4j
@Service
-@Transactional
+//@Transactional
public class LiveStreamServiceImpl implements ILiveStreamService {
@Autowired
@@ -112,15 +111,18 @@
return responseResult;
}
+ // 将机场推流代码放到入库代码后面。
DeviceDTO data = (DeviceDTO) responseResult.getData();
// target topic
String respTopic = THING_MODEL_PRE + PRODUCT +
data.getDeviceSn() + SERVICES_SUF;
- ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
+ ServiceReply receiveReply=new ServiceReply();
+// ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
- if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
- return ResponseResult.error(receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
- }
+// if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
+// log.info("机场直播开启失败，错误码：{},错误描述：{}", receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
+// return ResponseResult.error(receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
+// }
LiveUrlTypeEnum urlType = LiveUrlTypeEnum.find(liveParam.getUrlType());
LiveDTO live = new LiveDTO();
@@ -139,6 +141,11 @@
String webrtcUrl =
protocol + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getWebrtcPort() + "/" + name; // 拼接
// webrtcUrl
+
+ //不管插入数据库成不成功，都返回地址
+ live.setRtmpUrl(rtmpUrl);
+ live.setRtspUrl(rtspUrl);
+ live.setWebrtcUrl(webrtcUrl);
// 如果没有，插入新的记录
ArdVtdu vtdu =
@@ -183,6 +190,13 @@
return ResponseResult.error(LiveErrorEnum.URL_TYPE_NOT_SUPPORTED);
}
+ receiveReply = this.publishLiveStart(respTopic, liveParam);
+
+ if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
+ log.info("机场直播开启失败，错误码：{},错误描述：{}", receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
+ return ResponseResult.error(receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
+ }
+
// 开始直播时发送机场相机摄像头默认信息（舱外）到所有在线用户,只取机场sn，发机场的摄像头信息
if(data.getChildDeviceSn()!=null) {
String sn = data.getDeviceSn();
@@ -202,6 +216,7 @@
ServiceReply receiveReply = this.publishLiveStop(respTopic, videoId);
if (receiveReply.getResult() != 0) {
+ log.info("videoId:{},直播停止失败，错误码：{},错误描述：{}", videoId, receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
//注释掉删除流媒体管理库中的信息
@@ -234,6 +249,7 @@
@Override
public ResponseResult liveLensChange(LiveTypeDTO liveParam) {
+ log.info("切换镜头参数：{}", liveParam);
ResponseResult<DeviceDTO> responseResult = this.checkBeforeLive(liveParam.getVideoId());
if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
return responseResult;
--
Gitblit v1.9.3