From 2127cbeca3c2f2de31b7f70b2841cdb2ee259e1a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 05 六月 2024 22:45:13 +0800
Subject: [PATCH] 调整收到移动位置订阅后开启定时任务
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 100 ++++++++++++++++++++------------------------------
1 files changed, 40 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
old mode 100644
new mode 100755
index 8f5d5af..d5a0f7f
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
@@ -1,12 +1,9 @@
package com.genersoft.iot.vmp.media.zlm.dto;
-import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.util.StringUtils;
-
-import java.util.HashMap;
+import org.springframework.util.ObjectUtils;
@Schema(description = "娴佸獟浣撴湇鍔′俊鎭�")
public class MediaServerItem{
@@ -53,11 +50,8 @@
@Schema(description = "ZLM閴存潈鍙傛暟")
private String secret;
- @Schema(description = "鏌愪釜娴佹棤浜鸿鐪嬫椂锛岃Е鍙慼ook.on_stream_none_reader浜嬩欢鐨勬渶澶х瓑寰呮椂闂达紝鍗曚綅姣")
- private int streamNoneReaderDelayMS;
-
@Schema(description = "keepalive hook瑙﹀彂闂撮殧,鍗曚綅绉�")
- private int hookAliveInterval;
+ private Float hookAliveInterval;
@Schema(description = "鏄惁浣跨敤澶氱鍙ｆā寮�")
private boolean rtpEnable;
@@ -86,19 +80,14 @@
@Schema(description = "鏄惁鏄粯璁LM")
private boolean defaultServer;
- @Schema(description = "SSRC淇℃伅")
- private SsrcConfig ssrcConfig;
+ @Schema(description = "褰曞儚瀛樺偍鏃堕暱")
+ private int recordDay;
- @Schema(description = "褰撳墠浣跨敤鍒扮殑绔彛")
- private int currentPort;
+ @Schema(description = "褰曞儚瀛樺偍璺緞")
+ private String recordPath;
-
- /**
- * 姣忎竴鍙癦LM閮芥湁涓�濂楃嫭绔嬬殑SSRC鍒楄〃
- * 鍦ˋpplicationCheckRunner閲屽mediaServerSsrcMap杩涜鍒濆鍖�
- */
- @Schema(description = "ID")
- private HashMap<String, SsrcConfig> mediaServerSsrcMap;
+ @Schema(description = "杞爜鐨勫墠缂�")
+ private String transcodeSuffix;
public MediaServerItem() {
}
@@ -106,9 +95,9 @@
public MediaServerItem(ZLMServerConfig zlmServerConfig, String sipIp) {
id = zlmServerConfig.getGeneralMediaServerId();
ip = zlmServerConfig.getIp();
- hookIp = StringUtils.isEmpty(zlmServerConfig.getHookIp())? sipIp: zlmServerConfig.getHookIp();
- sdpIp = StringUtils.isEmpty(zlmServerConfig.getSdpIp())? zlmServerConfig.getIp(): zlmServerConfig.getSdpIp();
- streamIp = StringUtils.isEmpty(zlmServerConfig.getStreamIp())? zlmServerConfig.getIp(): zlmServerConfig.getStreamIp();
+ hookIp = ObjectUtils.isEmpty(zlmServerConfig.getHookIp())? sipIp: zlmServerConfig.getHookIp();
+ sdpIp = ObjectUtils.isEmpty(zlmServerConfig.getSdpIp())? zlmServerConfig.getIp(): zlmServerConfig.getSdpIp();
+ streamIp = ObjectUtils.isEmpty(zlmServerConfig.getStreamIp())? zlmServerConfig.getIp(): zlmServerConfig.getStreamIp();
httpPort = zlmServerConfig.getHttpPort();
httpSSlPort = zlmServerConfig.getHttpSSLport();
rtmpPort = zlmServerConfig.getRtmpPort();
@@ -118,12 +107,11 @@
rtspSSLPort = zlmServerConfig.getRtspSSlport();
autoConfig = true; // 榛樿鍊紅rue;
secret = zlmServerConfig.getApiSecret();
- streamNoneReaderDelayMS = zlmServerConfig.getGeneralStreamNoneReaderDelayMS();
hookAliveInterval = zlmServerConfig.getHookAliveInterval();
rtpEnable = false; // 榛樿浣跨敤鍗曠鍙�;鐩村埌鐢ㄦ埛鑷繁璁剧疆寮�鍚绔彛
rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
- sendRtpPortRange = "30000,30500"; // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
recordAssistPort = 0; // 榛樿鍏抽棴
+ transcodeSuffix = zlmServerConfig.getTranscodeSuffix();
}
@@ -239,14 +227,6 @@
this.secret = secret;
}
- public int getStreamNoneReaderDelayMS() {
- return streamNoneReaderDelayMS;
- }
-
- public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) {
- this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
- }
-
public boolean isRtpEnable() {
return rtpEnable;
}
@@ -295,30 +275,6 @@
this.updateTime = updateTime;
}
- public HashMap<String, SsrcConfig> getMediaServerSsrcMap() {
- return mediaServerSsrcMap;
- }
-
- public void setMediaServerSsrcMap(HashMap<String, SsrcConfig> mediaServerSsrcMap) {
- this.mediaServerSsrcMap = mediaServerSsrcMap;
- }
-
- public SsrcConfig getSsrcConfig() {
- return ssrcConfig;
- }
-
- public void setSsrcConfig(SsrcConfig ssrcConfig) {
- this.ssrcConfig = ssrcConfig;
- }
-
- public int getCurrentPort() {
- return currentPort;
- }
-
- public void setCurrentPort(int currentPort) {
- this.currentPort = currentPort;
- }
-
public boolean isStatus() {
return status;
}
@@ -335,6 +291,14 @@
this.lastKeepaliveTime = lastKeepaliveTime;
}
+ public Float getHookAliveInterval() {
+ return hookAliveInterval;
+ }
+
+ public void setHookAliveInterval(Float hookAliveInterval) {
+ this.hookAliveInterval = hookAliveInterval;
+ }
+
public String getSendRtpPortRange() {
return sendRtpPortRange;
}
@@ -343,11 +307,27 @@
this.sendRtpPortRange = sendRtpPortRange;
}
- public int getHookAliveInterval() {
- return hookAliveInterval;
+ public int getRecordDay() {
+ return recordDay;
}
- public void setHookAliveInterval(int hookAliveInterval) {
- this.hookAliveInterval = hookAliveInterval;
+ public void setRecordDay(int recordDay) {
+ this.recordDay = recordDay;
+ }
+
+ public String getRecordPath() {
+ return recordPath;
+ }
+
+ public void setRecordPath(String recordPath) {
+ this.recordPath = recordPath;
+ }
+
+ public String getTranscodeSuffix() {
+ return transcodeSuffix;
+ }
+
+ public void setTranscodeSuffix(String transcodeSuffix) {
+ this.transcodeSuffix = transcodeSuffix;
}
}
--
Gitblit v1.8.0