From b35db44aeb80bb4b55e9dfc49abbd2385b467849 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Mon, 25 Dec 2023 14:23:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=AC=A1=E5=AE=9E=E6=97=B6=E7=82=B9?=
 =?UTF-8?q?=E6=92=AD=E6=8C=81=E7=BB=AD=E6=97=B6=E9=97=B4=E5=8F=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/skcks/docking/gb28181/wvp/config/WvpProxyConfig.java | 6 ++++++
 .../skcks/docking/gb28181/wvp/service/wvp/WvpService.java   | 3 ++-
 .../src/main/resources/application.yml                      | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/WvpProxyConfig.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/WvpProxyConfig.java
index e672d27..cbaf88b 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/WvpProxyConfig.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/WvpProxyConfig.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,4 +35,9 @@ public class WvpProxyConfig {
      * 用于生成 代理 wvp 的 视频流 ws-flv 地址
      */
     private String proxyMediaUrl = "";
+
+    /**
+     * 实时视频单次点播持续时间 (默认: 15分钟)
+     */
+    private Duration realtimeVideoDuration = Duration.ofMinutes(15);
 }
diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
index bf638c4..d38136b 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/wvp/WvpService.java
@@ -392,12 +392,13 @@ public class WvpService {
                     wvpProxyConfig.getProxyMediaUrl(), data.getApp(),
                     StringUtils.joinWith(".", data.getStream(), "live", "flv"));
 
+
             // 定时任务
             schedule = scheduledExecutorService.schedule(() -> {
                 log.info("[定时任务] 关闭设备(deviceCode => {}) 视频", deviceCode);
                 playing.remove(deviceCode);
                 closeRealtimeVideo(deviceCode);
-            }, 3, TimeUnit.MINUTES);
+            }, wvpProxyConfig.getRealtimeVideoDuration().getSeconds(), TimeUnit.SECONDS);
             playing.put(deviceCode, schedule);
 
             result.setResult(JsonResponse.success(url));
diff --git a/gb28181-wvp-proxy-starter/src/main/resources/application.yml b/gb28181-wvp-proxy-starter/src/main/resources/application.yml
index 52bba6a..650a857 100644
--- a/gb28181-wvp-proxy-starter/src/main/resources/application.yml
+++ b/gb28181-wvp-proxy-starter/src/main/resources/application.yml
@@ -57,7 +57,10 @@ proxy:
     parents:
       - 44050100002000000003
       - 44050100001180000001
+    # 用于生成 代理 wvp 的 视频流 ws-flv 地址
     proxy-media-url: 'wss://192.168.1.241:9022/mf-config/media'
+    # 实时视频单次点播持续时间 (默认: 15分钟)
+    realtime-video-duration: 15m
   gb28181:
     sip:
       id: 44050100002000000005