From c81eec030264b85331628c60a0279a5ff3201b56 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 16 Oct 2025 09:24:41 +0800
Subject: [PATCH] 优化
---
ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java | 1 +
ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java | 2 +-
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java | 35 +++++++++++++++++++++++++----------
3 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java b/ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java
index bebd3a1..d2cefb6 100644
--- a/ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java
+++ b/ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java
@@ -196,6 +196,7 @@
// 3. 删除操作：删除媒体表中多余的记录
List<String> invalidNames = ardVtduList.stream()
.filter(vtdu -> !validNames.contains(vtdu.getName()))
+ .filter(vtdu -> !"publisher".equalsIgnoreCase(vtdu.getRtspSource())) // 不是机场流
.map(ArdVtdu::getName)
.collect(Collectors.toList());
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 b9faeb4..7906af2 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,10 +21,12 @@
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
+
import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.*;
@@ -52,7 +54,7 @@
private IMessageSenderService messageSender;
@Resource
- private IArdMediaService ardMediaService;
+ private IArdVtduService ardVtduService;
@Resource
private MediamtxConfig mediamtxConfig;
@@ -93,7 +95,7 @@
@Override
public ResponseResult liveStart(LiveTypeDTO liveParam) {
- String rtmpPublishUrl="rtmp://" + mediamtxConfig.getApiHost() + ":1935/" + liveParam.getVideoId();
+ String rtmpPublishUrl = "rtmp://" + mediamtxConfig.getApiHost() + ":1935/" + liveParam.getVideoId();
liveParam.setUrl(rtmpPublishUrl);
// Check if this lens is available live.
ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
@@ -116,13 +118,26 @@
switch (urlType) {
case RTMP:
- ArdVtdu vtdu = new ArdVtdu();
- vtdu.setName(liveParam.getVideoId());
- vtdu.setRtspSource("publisher");
- vtdu = ardMediaService.addPath(vtdu);
- live.setRtmpUrl(vtdu.getRtmpUrl());
- live.setRtspUrl(vtdu.getRtspUrl());
- live.setWebrtcUrl(vtdu.getWebrtcUrl());
+ String name = liveParam.getVideoId();
+ // 拼接地址
+ String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":8554" + "/" + name; // 拼接 webrtcUrl
+ String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":1935" + "/" + name; // 拼接 webrtcUrl
+ String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
+ String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889" + "/" + name; // 拼接 webrtcUrl
+
+ live.setRtmpUrl(rtmpUrl);
+ live.setRtspUrl(rtspUrl);
+ live.setWebrtcUrl(webrtcUrl);
+
+ // 如果没有，插入新的记录
+ 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);
+ }
+
break;
case RTSP:
Object url = Objects.requireNonNullElse(receiveReply.getOutput(), receiveReply.getInfo());
@@ -148,7 +163,7 @@
if (receiveReply.getResult() != 0) {
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
- ardMediaService.removePath(videoId);
+ ardVtduService.deleteArdVtduByName(videoId);
return ResponseResult.success();
}
diff --git a/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java b/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java
index 60e4aa7..3b202c1 100644
--- a/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java
+++ b/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java
@@ -393,7 +393,7 @@
nameList.add(item.getName());
}
} catch (Exception ex) {
- log.error("获取流媒体name列表异常：" + ex.getMessage());
+ log.error("获取流媒体name列表异常：{}", ex.getMessage());
}
return nameList;
}
--
Gitblit v1.9.3