From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 68 ++++++++++++----------------------
1 files changed, 24 insertions(+), 44 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..cebfec3
--- 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,11 @@
@Schema(description = "鏄惁鏄粯璁LM")
private boolean defaultServer;
- @Schema(description = "SSRC淇℃伅")
- private SsrcConfig ssrcConfig;
+ @Schema(description = "褰曞儚瀛樺偍鏃堕暱")
+ private int recordDay;
- @Schema(description = "褰撳墠浣跨敤鍒扮殑绔彛")
- private int currentPort;
-
-
- /**
- * 姣忎竴鍙癦LM閮芥湁涓�濂楃嫭绔嬬殑SSRC鍒楄〃
- * 鍦ˋpplicationCheckRunner閲屽mediaServerSsrcMap杩涜鍒濆鍖�
- */
- @Schema(description = "ID")
- private HashMap<String, SsrcConfig> mediaServerSsrcMap;
+ @Schema(description = "褰曞儚瀛樺偍璺緞")
+ private String recordPath;
public MediaServerItem() {
}
@@ -118,7 +107,6 @@
hookAliveInterval = zlmServerConfig.getHookAliveInterval();
rtpEnable = false; // 榛樿浣跨敤鍗曠鍙�;鐩村埌鐢ㄦ埛鑷繁璁剧疆寮�鍚绔彛
rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
- sendRtpPortRange = "30000,30500"; // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
recordAssistPort = 0; // 榛樿鍏抽棴
}
@@ -283,30 +271,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;
}
@@ -323,6 +287,14 @@
this.lastKeepaliveTime = lastKeepaliveTime;
}
+ public Float getHookAliveInterval() {
+ return hookAliveInterval;
+ }
+
+ public void setHookAliveInterval(Float hookAliveInterval) {
+ this.hookAliveInterval = hookAliveInterval;
+ }
+
public String getSendRtpPortRange() {
return sendRtpPortRange;
}
@@ -331,11 +303,19 @@
this.sendRtpPortRange = sendRtpPortRange;
}
- public Float getHookAliveInterval() {
- return hookAliveInterval;
+ public int getRecordDay() {
+ return recordDay;
}
- public void setHookAliveInterval(Float 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;
}
}
--
Gitblit v1.8.0