From 619a86e0ed6cdda88e2458b9ec4302d202d2215f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 六月 2024 19:59:48 +0800
Subject: [PATCH] 修复循环引用
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 125 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 37 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 d1578d1..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,66 +1,93 @@
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 org.springframework.util.StringUtils;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.util.ObjectUtils;
-import java.util.HashMap;
-
+@Schema(description = "娴佸獟浣撴湇鍔′俊鎭�")
public class MediaServerItem{
+ @Schema(description = "ID")
private String id;
+ @Schema(description = "IP")
private String ip;
+ @Schema(description = "hook浣跨敤鐨処P锛坺lm璁块棶WVP浣跨敤鐨処P锛�")
private String hookIp;
+ @Schema(description = "SDP IP")
private String sdpIp;
+ @Schema(description = "娴両P")
private String streamIp;
+ @Schema(description = "HTTP绔彛")
private int httpPort;
+ @Schema(description = "HTTPS绔彛")
private int httpSSlPort;
+ @Schema(description = "RTMP绔彛")
private int rtmpPort;
+ @Schema(description = "RTMPS绔彛")
private int rtmpSSlPort;
+ @Schema(description = "RTP鏀舵祦绔彛锛堝崟绔彛妯″紡鏈夌敤锛�")
private int rtpProxyPort;
+ @Schema(description = "RTSP绔彛")
private int rtspPort;
+ @Schema(description = "RTSPS绔彛")
private int rtspSSLPort;
+ @Schema(description = "鏄惁寮�鍚嚜鍔ㄩ厤缃甖LM")
private boolean autoConfig;
+ @Schema(description = "ZLM閴存潈鍙傛暟")
private String secret;
- private String streamNoneReaderDelayMS;
+ @Schema(description = "keepalive hook瑙﹀彂闂撮殧,鍗曚綅绉�")
+ private Float hookAliveInterval;
+ @Schema(description = "鏄惁浣跨敤澶氱鍙ｆā寮�")
private boolean rtpEnable;
+ @Schema(description = "鐘舵��")
+ private boolean status;
+
+ @Schema(description = "澶氱鍙TP鏀舵祦绔彛鑼冨洿")
private String rtpPortRange;
+ @Schema(description = "RTP鍙戞祦绔彛鑼冨洿")
+ private String sendRtpPortRange;
+
+ @Schema(description = "assist鏈嶅姟绔彛")
private int recordAssistPort;
+ @Schema(description = "鍒涘缓鏃堕棿")
private String createTime;
+ @Schema(description = "鏇存柊鏃堕棿")
private String updateTime;
+ @Schema(description = "涓婃蹇冭烦鏃堕棿")
+ private String lastKeepaliveTime;
+
+ @Schema(description = "鏄惁鏄粯璁LM")
private boolean defaultServer;
- private SsrcConfig ssrcConfig;
+ @Schema(description = "褰曞儚瀛樺偍鏃堕暱")
+ private int recordDay;
- private int currentPort;
+ @Schema(description = "褰曞儚瀛樺偍璺緞")
+ private String recordPath;
-
- /**
- * 姣忎竴鍙癦LM閮芥湁涓�濂楃嫭绔嬬殑SSRC鍒楄〃
- * 鍦ˋpplicationCheckRunner閲屽mediaServerSsrcMap杩涜鍒濆鍖�
- */
- private HashMap<String, SsrcConfig> mediaServerSsrcMap;
+ @Schema(description = "杞爜鐨勫墠缂�")
+ private String transcodeSuffix;
public MediaServerItem() {
}
@@ -68,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();
@@ -80,9 +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浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
recordAssistPort = 0; // 榛樿鍏抽棴
+ transcodeSuffix = zlmServerConfig.getTranscodeSuffix();
}
@@ -198,14 +227,6 @@
this.secret = secret;
}
- public String getStreamNoneReaderDelayMS() {
- return streamNoneReaderDelayMS;
- }
-
- public void setStreamNoneReaderDelayMS(String streamNoneReaderDelayMS) {
- this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
- }
-
public boolean isRtpEnable() {
return rtpEnable;
}
@@ -254,29 +275,59 @@
this.updateTime = updateTime;
}
- public HashMap<String, SsrcConfig> getMediaServerSsrcMap() {
- return mediaServerSsrcMap;
+ public boolean isStatus() {
+ return status;
}
- public void setMediaServerSsrcMap(HashMap<String, SsrcConfig> mediaServerSsrcMap) {
- this.mediaServerSsrcMap = mediaServerSsrcMap;
+ public void setStatus(boolean status) {
+ this.status = status;
}
- public SsrcConfig getSsrcConfig() {
- return ssrcConfig;
+ public String getLastKeepaliveTime() {
+ return lastKeepaliveTime;
}
- public void setSsrcConfig(SsrcConfig ssrcConfig) {
- this.ssrcConfig = ssrcConfig;
+ public void setLastKeepaliveTime(String lastKeepaliveTime) {
+ this.lastKeepaliveTime = lastKeepaliveTime;
}
- public int getCurrentPort() {
- return currentPort;
+ public Float getHookAliveInterval() {
+ return hookAliveInterval;
}
- public void setCurrentPort(int currentPort) {
- this.currentPort = currentPort;
+ public void setHookAliveInterval(Float hookAliveInterval) {
+ this.hookAliveInterval = hookAliveInterval;
}
+ public String getSendRtpPortRange() {
+ return sendRtpPortRange;
+ }
+ public void setSendRtpPortRange(String sendRtpPortRange) {
+ this.sendRtpPortRange = sendRtpPortRange;
+ }
+
+ public int getRecordDay() {
+ return recordDay;
+ }
+
+ 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