From e0e99fad10f6c8dedf4c11c065b10469cd47a1e8 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 30 Sep 2025 09:00:14 +0800
Subject: [PATCH] 优化流媒体接口实现机场和相机业务
---
ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdMediaServiceImpl.java b/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java
similarity index 96%
rename from ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdMediaServiceImpl.java
rename to ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java
index bbdee95..60e4aa7 100644
--- a/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdMediaServiceImpl.java
+++ b/ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java
@@ -5,7 +5,7 @@
import com.ard.vtdu.client.MediaClient;
import com.ard.vtdu.config.MediamtxConfig;
import com.ard.vtdu.domain.*;
-import com.ard.vtdu.service.IMediaService;
+import com.ard.vtdu.service.IArdMediaService;
import com.ard.vtdu.util.ArdTool;
import com.dtflys.forest.exceptions.ForestRuntimeException;
import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,7 @@
**/
@Service
@Slf4j
-public class ArdMediaServiceImpl implements IMediaService {
+public class ArdArdMediaServiceImpl implements IArdMediaService {
@Resource
MediaClient mediaClient;
@@ -88,8 +88,8 @@
String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889/" + ardVtdu.getName();
Conf conf = new Conf();
- conf.setName(ardVtdu.getName());
conf.setSource(ardVtdu.getRtspSource());
+ conf.setName(ardVtdu.getName());
conf.setRunOnDemand("");
conf.setRunOnDemandRestart(false);
conf.setRunOnDemandCloseAfter("5s");
@@ -148,17 +148,8 @@
if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
runOn = conf.getRunOnDemand();
}
- //RTSP源地址
- Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
- if (matcher.find()) {
- info.setRtspSource(matcher.group());
- info.setIsCode(1);
- } else {
- info.setRtspSource(conf.getSource());
- info.setIsCode(0);
- }
//传输协议
- matcher = Pattern.compile("-rtsp_transport\\s+(\\w+)").matcher(runOn);
+ Matcher matcher = Pattern.compile("-rtsp_transport\\s+(\\w+)").matcher(runOn);
if (matcher.find()) {
info.setProtocol(matcher.group(1));
}
--
Gitblit v1.9.3