From 3469271ec25c69e4528b085ba3be7d9d85ec519e Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 26 七月 2021 11:40:32 +0800
Subject: [PATCH] 优化集群方案， 每个zlm一套ssrc； 优化集群下的docker接入逻辑； 更正sql脚本； 支持重启不设置设备离线。重启SIP事务不丢失
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 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..d1578d1 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,10 +1,13 @@
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;
-public class MediaServerItem implements IMediaServerItem{
+import java.util.HashMap;
+
+public class MediaServerItem{
private String id;
@@ -46,9 +49,18 @@
private String updateTime;
- private boolean docker;
+ private boolean defaultServer;
- private int count;
+ private SsrcConfig ssrcConfig;
+
+ private int currentPort;
+
+
+ /**
+ * 姣忎竴鍙癦LM閮芥湁涓�濂楃嫭绔嬬殑SSRC鍒楄〃
+ * 鍦ˋpplicationCheckRunner閲屽mediaServerSsrcMap杩涜鍒濆鍖�
+ */
+ private HashMap<String, SsrcConfig> mediaServerSsrcMap;
public MediaServerItem() {
}
@@ -218,14 +230,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 +254,29 @@
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;
+ }
+
+
}
--
Gitblit v1.8.0