From 8b6449ce3ac8eb4a0f59f3a6e3974d9190dcd133 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 八月 2022 09:55:09 +0800
Subject: [PATCH] 升级版本号
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 138 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 119 insertions(+), 19 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
index b56881f..ec09ce5 100644
--- 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,54 +1,105 @@
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.ObjectUtils;
import org.springframework.util.StringUtils;
-public class MediaServerItem implements IMediaServerItem{
+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 = "鏌愪釜娴佹棤浜鸿鐪嬫椂锛岃Е鍙慼ook.on_stream_none_reader浜嬩欢鐨勬渶澶х瓑寰呮椂闂达紝鍗曚綅姣")
+ private int streamNoneReaderDelayMS;
+ @Schema(description = "keepalive hook瑙﹀彂闂撮殧,鍗曚綅绉�")
+ private int 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;
- private boolean docker;
+ @Schema(description = "涓婃蹇冭烦鏃堕棿")
+ private String lastKeepaliveTime;
- private int count;
+ @Schema(description = "鏄惁鏄粯璁LM")
+ private boolean defaultServer;
+
+ @Schema(description = "SSRC淇℃伅")
+ private SsrcConfig ssrcConfig;
+
+ @Schema(description = "褰撳墠浣跨敤鍒扮殑绔彛")
+ private int currentPort;
+
+
+ /**
+ * 姣忎竴鍙癦LM閮芥湁涓�濂楃嫭绔嬬殑SSRC鍒楄〃
+ * 鍦ˋpplicationCheckRunner閲屽mediaServerSsrcMap杩涜鍒濆鍖�
+ */
+ @Schema(description = "ID")
+ private HashMap<String, SsrcConfig> mediaServerSsrcMap;
public MediaServerItem() {
}
@@ -56,9 +107,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();
@@ -69,7 +120,10 @@
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; // 榛樿鍏抽棴
}
@@ -186,11 +240,11 @@
this.secret = secret;
}
- public String getStreamNoneReaderDelayMS() {
+ public int getStreamNoneReaderDelayMS() {
return streamNoneReaderDelayMS;
}
- public void setStreamNoneReaderDelayMS(String streamNoneReaderDelayMS) {
+ public void setStreamNoneReaderDelayMS(int streamNoneReaderDelayMS) {
this.streamNoneReaderDelayMS = streamNoneReaderDelayMS;
}
@@ -218,14 +272,12 @@
this.recordAssistPort = recordAssistPort;
}
- @Override
- public boolean isDocker() {
- return docker;
+ public boolean isDefaultServer() {
+ return defaultServer;
}
- @Override
- public void setDocker(boolean docker) {
- this.docker = docker;
+ public void setDefaultServer(boolean defaultServer) {
+ this.defaultServer = defaultServer;
}
public String getCreateTime() {
@@ -244,11 +296,59 @@
this.updateTime = updateTime;
}
- public int getCount() {
- return count;
+ public HashMap<String, SsrcConfig> getMediaServerSsrcMap() {
+ return mediaServerSsrcMap;
}
- public void setCount(int count) {
- this.count = count;
+ 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;
+ }
+
+ public void setStatus(boolean status) {
+ this.status = status;
+ }
+
+ public String getLastKeepaliveTime() {
+ return lastKeepaliveTime;
+ }
+
+ public void setLastKeepaliveTime(String lastKeepaliveTime) {
+ this.lastKeepaliveTime = lastKeepaliveTime;
+ }
+
+ public String getSendRtpPortRange() {
+ return sendRtpPortRange;
+ }
+
+ public void setSendRtpPortRange(String sendRtpPortRange) {
+ this.sendRtpPortRange = sendRtpPortRange;
+ }
+
+ public int getHookAliveInterval() {
+ return hookAliveInterval;
+ }
+
+ public void setHookAliveInterval(int hookAliveInterval) {
+ this.hookAliveInterval = hookAliveInterval;
}
}
--
Gitblit v1.8.0