From 985082d33930868c3cc1723f28fd9aaae9013a8f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 八月 2023 09:11:22 +0800
Subject: [PATCH] 添加缺少的内容
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 46 ++++++++--------------------------------------
1 files changed, 8 insertions(+), 38 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 620b167..066a677
--- 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.ObjectUtils;
-
-import java.util.HashMap;
@Schema(description = "娴佸獟浣撴湇鍔′俊鎭�")
public class MediaServerItem{
@@ -83,19 +80,9 @@
@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() {
}
@@ -118,7 +105,6 @@
hookAliveInterval = zlmServerConfig.getHookAliveInterval();
rtpEnable = false; // 榛樿浣跨敤鍗曠鍙�;鐩村埌鐢ㄦ埛鑷繁璁剧疆寮�鍚绔彛
rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
- sendRtpPortRange = "30000,30500"; // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
recordAssistPort = 0; // 榛樿鍏抽棴
}
@@ -283,22 +269,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;
}
@@ -323,14 +293,6 @@
this.lastKeepaliveTime = lastKeepaliveTime;
}
- public String getSendRtpPortRange() {
- return sendRtpPortRange;
- }
-
- public void setSendRtpPortRange(String sendRtpPortRange) {
- this.sendRtpPortRange = sendRtpPortRange;
- }
-
public Float getHookAliveInterval() {
return hookAliveInterval;
}
@@ -338,4 +300,12 @@
public void setHookAliveInterval(Float hookAliveInterval) {
this.hookAliveInterval = hookAliveInterval;
}
+
+ public String getSendRtpPortRange() {
+ return sendRtpPortRange;
+ }
+
+ public void setSendRtpPortRange(String sendRtpPortRange) {
+ this.sendRtpPortRange = sendRtpPortRange;
+ }
}
--
Gitblit v1.8.0