From a42dda2bd3cc1cf8c20cc61e7ad9211eadecbaf3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 24 二月 2022 16:55:06 +0800
Subject: [PATCH] 规范数据库，添加必要约束，优化通道批量导入功能
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java | 153 ++++++++++++++++++++++++++++++---------------------
1 files changed, 90 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
index 32cb49b..7e3da46 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.media.zlm;
import com.alibaba.fastjson.annotation.JSONField;
-import org.springframework.util.StringUtils;
public class ZLMServerConfig {
@@ -33,15 +32,20 @@
private String generalMaxStreamWaitMS;
@JSONField(name = "general.streamNoneReaderDelayMS")
- private String generalStreamNoneReaderDelayMS;
+ private int generalStreamNoneReaderDelayMS;
+ @JSONField(name = "ip")
private String ip;
private String sdpIp;
private String streamIp;
+ private String hookIp;
+
private String updateTime;
+
+ private String createTime;
@JSONField(name = "hls.fileBufSize")
private String hlsFileBufSize;
@@ -60,6 +64,9 @@
@JSONField(name = "hook.admin_params")
private String hookAdminParams;
+
+ @JSONField(name = "hook.alive_interval")
+ private int hookAliveInterval;
@JSONField(name = "hook.enable")
private String hookEnable;
@@ -116,7 +123,7 @@
private String httpNotFound;
@JSONField(name = "http.port")
- private String httpPort;
+ private int httpPort;
@JSONField(name = "http.rootPath")
private String httpRootPath;
@@ -125,7 +132,7 @@
private String httpSendBufSize;
@JSONField(name = "http.sslport")
- private String httpSSLport;
+ private int httpSSLport;
@JSONField(name = "multicast.addrMax")
private String multicastAddrMax;
@@ -158,10 +165,10 @@
private String rtmpModifyStamp;
@JSONField(name = "rtmp.port")
- private String rtmpPort;
+ private int rtmpPort;
@JSONField(name = "rtmp.sslport")
- private String rtmpSslPort;
+ private int rtmpSslPort;
@JSONField(name = "rtp.audioMtuSize")
private String rtpAudioMtuSize;
@@ -185,7 +192,7 @@
private String rtpProxyDumpDir;
@JSONField(name = "rtp_proxy.port")
- private String rtpProxyPort;
+ private int rtpProxyPort;
@JSONField(name = "rtp_proxy.timeoutSec")
private String rtpProxyTimeoutSec;
@@ -200,10 +207,10 @@
private String rtspKeepAliveSecond;
@JSONField(name = "rtsp.port")
- private String rtspPort;
+ private int rtspPort;
@JSONField(name = "rtsp.sslport")
- private String rtspSSlport;
+ private int rtspSSlport;
@JSONField(name = "shell.maxReqSize")
private String shellMaxReqSize;
@@ -211,6 +218,14 @@
@JSONField(name = "shell.shell")
private String shellPhell;
+
+ public String getHookIp() {
+ return hookIp;
+ }
+
+ public void setHookIp(String hookIp) {
+ this.hookIp = hookIp;
+ }
public String getApiDebug() {
return apiDebug;
@@ -260,6 +275,14 @@
this.generalEnableVhost = generalEnableVhost;
}
+ public String getGeneralMediaServerId() {
+ return generalMediaServerId;
+ }
+
+ public void setGeneralMediaServerId(String generalMediaServerId) {
+ this.generalMediaServerId = generalMediaServerId;
+ }
+
public String getGeneralFlowThreshold() {
return generalFlowThreshold;
}
@@ -276,11 +299,11 @@
this.generalMaxStreamWaitMS = generalMaxStreamWaitMS;
}
- public String getGeneralStreamNoneReaderDelayMS() {
+ public int getGeneralStreamNoneReaderDelayMS() {
return generalStreamNoneReaderDelayMS;
}
- public void setGeneralStreamNoneReaderDelayMS(String generalStreamNoneReaderDelayMS) {
+ public void setGeneralStreamNoneReaderDelayMS(int generalStreamNoneReaderDelayMS) {
this.generalStreamNoneReaderDelayMS = generalStreamNoneReaderDelayMS;
}
@@ -290,6 +313,38 @@
public void setIp(String ip) {
this.ip = ip;
+ }
+
+ public String getSdpIp() {
+ return sdpIp;
+ }
+
+ public void setSdpIp(String sdpIp) {
+ this.sdpIp = sdpIp;
+ }
+
+ public String getStreamIp() {
+ return streamIp;
+ }
+
+ public void setStreamIp(String streamIp) {
+ this.streamIp = streamIp;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
}
public String getHlsFileBufSize() {
@@ -484,11 +539,11 @@
this.httpNotFound = httpNotFound;
}
- public String getHttpPort() {
+ public int getHttpPort() {
return httpPort;
}
- public void setHttpPort(String httpPort) {
+ public void setHttpPort(int httpPort) {
this.httpPort = httpPort;
}
@@ -508,11 +563,11 @@
this.httpSendBufSize = httpSendBufSize;
}
- public String getHttpSSLport() {
+ public int getHttpSSLport() {
return httpSSLport;
}
- public void setHttpSSLport(String httpSSLport) {
+ public void setHttpSSLport(int httpSSLport) {
this.httpSSLport = httpSSLport;
}
@@ -596,12 +651,20 @@
this.rtmpModifyStamp = rtmpModifyStamp;
}
- public String getRtmpPort() {
+ public int getRtmpPort() {
return rtmpPort;
}
- public void setRtmpPort(String rtmpPort) {
+ public void setRtmpPort(int rtmpPort) {
this.rtmpPort = rtmpPort;
+ }
+
+ public int getRtmpSslPort() {
+ return rtmpSslPort;
+ }
+
+ public void setRtmpSslPort(int rtmpSslPort) {
+ this.rtmpSslPort = rtmpSslPort;
}
public String getRtpAudioMtuSize() {
@@ -660,11 +723,11 @@
this.rtpProxyDumpDir = rtpProxyDumpDir;
}
- public String getRtpProxyPort() {
+ public int getRtpProxyPort() {
return rtpProxyPort;
}
- public void setRtpProxyPort(String rtpProxyPort) {
+ public void setRtpProxyPort(int rtpProxyPort) {
this.rtpProxyPort = rtpProxyPort;
}
@@ -700,19 +763,19 @@
this.rtspKeepAliveSecond = rtspKeepAliveSecond;
}
- public String getRtspPort() {
+ public int getRtspPort() {
return rtspPort;
}
- public void setRtspPort(String rtspPort) {
+ public void setRtspPort(int rtspPort) {
this.rtspPort = rtspPort;
}
- public String getRtspSSlport() {
+ public int getRtspSSlport() {
return rtspSSlport;
}
- public void setRtspSSlport(String rtspSSlport) {
+ public void setRtspSSlport(int rtspSSlport) {
this.rtspSSlport = rtspSSlport;
}
@@ -732,47 +795,11 @@
this.shellPhell = shellPhell;
}
- public String getUpdateTime() {
- return updateTime;
+ public int getHookAliveInterval() {
+ return hookAliveInterval;
}
- public void setUpdateTime(String updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getGeneralMediaServerId() {
- return generalMediaServerId;
- }
-
- public void setGeneralMediaServerId(String generalMediaServerId) {
- this.generalMediaServerId = generalMediaServerId;
- }
-
- public String getRtmpSslPort() {
- return rtmpSslPort;
- }
-
- public void setRtmpSslPort(String rtmpSslPort) {
- this.rtmpSslPort = rtmpSslPort;
- }
-
- public String getSdpIp() {
- if (StringUtils.isEmpty(sdpIp)) {
- return ip;
- }else {
- return sdpIp;
- }
- }
-
- public void setSdpIp(String sdpIp) {
- this.sdpIp = sdpIp;
- }
-
- public String getStreamIp() {
- return streamIp;
- }
-
- public void setStreamIp(String streamIp) {
- this.streamIp = streamIp;
+ public void setHookAliveInterval(int hookAliveInterval) {
+ this.hookAliveInterval = hookAliveInterval;
}
}
--
Gitblit v1.8.0