From fbced0c4dd4950a184f8471ef71995aa93dafd50 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 27 Dec 2025 10:17:44 +0800
Subject: [PATCH] 优化

---
 ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

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 d68a004..533f3bc 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
@@ -51,13 +51,19 @@
     @Override
     public ArdVtdu addPath(ArdVtdu ardVtdu) {
         try {
-            String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":8554/" + ardVtdu.getName();
-            String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":1935/" + ardVtdu.getName();
+            String rtspUrl =
+                    "rtsp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtspPort() + "/" + ardVtdu.getName();
+            String rtmpUrl =
+                    "rtmp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + ardVtdu.getName();
             String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
-            String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889/" + ardVtdu.getName();
+            String webrtcUrl =
+                    protocol + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getWebrtcPort() + "/" + ardVtdu.getName();
 
             Conf conf = new Conf();
             conf.setSource(ardVtdu.getRtspSource());
+            if(!"publisher".equalsIgnoreCase(conf.getSource())) {
+                conf.setSourceOnDemand(true);
+            }
             conf.setRunOnDemandRestart(false);
             conf.setRunOnDemandCloseAfter("5s");
             conf.setMaxReaders(100);
@@ -82,15 +88,20 @@
     @Override
     public ArdVtdu editPath(ArdVtdu ardVtdu) {
         try {
-            String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":8554/" + ardVtdu.getName();
-            String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":1935/" + ardVtdu.getName();
+            String rtspUrl =
+                    "rtsp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtspPort() + "/" + ardVtdu.getName();
+            String rtmpUrl =
+                    "rtmp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + ardVtdu.getName();
             String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
-            String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889/" + ardVtdu.getName();
+            String webrtcUrl =
+                    protocol + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getWebrtcPort() + "/" + ardVtdu.getName();
 
             Conf conf = new Conf();
             conf.setSource(ardVtdu.getRtspSource());
             conf.setName(ardVtdu.getName());
-            conf.setRunOnDemand("");
+            if(!"publisher".equalsIgnoreCase(conf.getSource())) {
+                conf.setSourceOnDemand(true);
+            }
             conf.setRunOnDemandRestart(false);
             conf.setRunOnDemandCloseAfter("5s");
             conf.setMaxReaders(100);
@@ -199,14 +210,15 @@
             //源
             info.setRtspSource(conf.getSource());
             //RTMP播放地址
-            String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":1935/" + name;
+            String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + name;
             info.setRtmpUrl(rtmpUrl);
             //RTSP播放地址
-            String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":8554/" + name;
+            String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtspPort() + "/" + name;
             info.setRtspUrl(rtspUrl);
             //WEBRTC播放地址
             String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
-            String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889/" + name;
+            String webrtcUrl =
+                    protocol + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getWebrtcPort() + "/" + name;
             info.setWebrtcUrl(webrtcUrl);
 
             //上行流量

--
Gitblit v1.9.3