From f5fe67e04309b041ec98a5e071cb227a7a1021ca Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 04 Dec 2025 16:29:46 +0800
Subject: [PATCH] 2025-12-04 zwy hms增加in_the_sky、device_type两个字段
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 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 f1eab22..e612f7b 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());
@@ -143,10 +145,12 @@
// 在停止直播时不删除Vtdu表记录，所以在开启直播时再插入会报错，
// 所以要先查询是否存在该记录，如果已经存在记录，直接返回直播地址
// 查询是否已经存在该记录
- List<ArdVtdu> ardVtduList = ardVtduService.selectArdVtduList(vtdu);
+ ArdVtdu ardVtdu = ardVtduService.selectArdVtduByName(vtdu.getName());
int i = 0;
- if(ardVtduList.isEmpty()){
+ log.info("机场视频插入前vtdu:{}",vtdu);
+ if(ardVtdu == null){
i = ardVtduService.insertArdVtdu(vtdu); // 保存到媒体表
+ log.info("机场视频插入后 i:{}",i);
if (i > 0) {
live.setRtmpUrl(rtmpUrl);
live.setRtspUrl(rtspUrl);
@@ -154,9 +158,13 @@
}
}
else{
- live.setRtmpUrl(rtmpUrl);
- live.setRtspUrl(rtspUrl);
- live.setWebrtcUrl(webrtcUrl);
+ 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) {
--
Gitblit v1.9.3