From 87e7d0026f2a0feae169f103f90256005968b6aa Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期五, 23 七月 2021 16:56:32 +0800
Subject: [PATCH] 解决@value注解无法赋默认值问题
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 303 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 241 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
index 9d3ed7e..f2a0bcd 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,56 +1,88 @@
package com.genersoft.iot.vmp.conf;
+import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
@Configuration("mediaConfig")
-public class MediaConfig {
+public class MediaConfig implements IMediaServerItem {
+
+ @Value("${media.id:}")
+ private String id;
@Value("${media.ip}")
private String ip;
- @Value("${media.wanIp}")
- private String wanIp;
-
- @Value("${media.hookIp}")
+ @Value("${media.hook-ip:${sip.ip}}")
private String hookIp;
- @Value("${media.httpPort}")
- private String httpPort;
+ @Value("${sip.ip}")
+ private String sipIp;
- @Value("${media.httpSSlPort}")
- private String httpSSlPort;
+ @Value("${media.sdp-ip:${media.ip}}")
+ private String sdpIp;
- @Value("${media.rtmpPort}")
- private String rtmpPort;
+ @Value("${media.stream-ip:${media.ip}}")
+ private String streamIp;
- @Value("${media.rtmpSSlPort}")
- private String rtmpSSlPort;
+ @Value("${media.http-port}")
+ private Integer httpPort;
- @Value("${media.rtpProxyPort}")
- private String rtpProxyPort;
+ @Value("${media.http-ssl-port:0}")
+ private Integer httpSSlPort = 0;
- @Value("${media.rtspPort}")
- private String rtspPort;
+ @Value("${media.rtmp-port:0}")
+ private Integer rtmpPort = 0;
- @Value("${media.rtspSSLPort}")
- private String rtspSSLPort;
+ @Value("${media.rtmp-ssl-port:0}")
+ private Integer rtmpSSlPort = 0;
- @Value("${media.autoConfig}")
- private boolean autoConfig;
+ @Value("${media.rtp-proxy-port:0}")
+ private Integer rtpProxyPort = 0;
+
+ @Value("${media.rtsp-port:0}")
+ private Integer rtspPort = 0;
+
+ @Value("${media.rtsp-ssl-port:0}")
+ private Integer rtspSSLPort = 0;
+
+ @Value("${media.auto-config:true}")
+ private boolean autoConfig = true;
@Value("${media.secret}")
private String secret;
- @Value("${media.streamNoneReaderDelayMS}")
- private String streamNoneReaderDelayMS;
+ @Value("${media.stream-none-reader-delay-ms:18000}")
+ private String streamNoneReaderDelayMS = "18000";
@Value("${media.rtp.enable}")
private boolean rtpEnable;
- @Value("${media.rtp.portRange}")
+ @Value("${media.rtp.port-range}")
private String rtpPortRange;
+ @Value("${media.record-assist-port:0}")
+ private Integer recordAssistPort = 0;
+
+ private String updateTime;
+
+ private String createTime;
+
+ private boolean docker = false;
+
+ private int count;
+
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
public String getIp() {
return ip;
}
@@ -59,35 +91,132 @@
this.ip = ip;
}
- public String getWanIp() {
- return wanIp;
- }
-
- public void setWanIp(String wanIp) {
- this.wanIp = wanIp;
- }
-
public String getHookIp() {
- return hookIp;
+ if (StringUtils.isEmpty(hookIp)){
+ return sipIp;
+ }else {
+ return hookIp;
+ }
+
}
public void setHookIp(String hookIp) {
this.hookIp = hookIp;
}
- public String getHttpPort() {
+ public String getSipIp() {
+ return sipIp;
+ }
+
+ public void setSipIp(String sipIp) {
+ this.sipIp = sipIp;
+ }
+
+ public void setSdpIp(String sdpIp) {
+ this.sdpIp = sdpIp;
+ }
+
+ public void setStreamIp(String streamIp) {
+ this.streamIp = streamIp;
+ }
+
+ public int getHttpPort() {
return httpPort;
}
- public void setHttpPort(String httpPort) {
+ @Override
+ public void setHttpPort(int httpPort) {
+
+ }
+
+ public void setHttpPort(Integer httpPort) {
this.httpPort = httpPort;
}
- public boolean isAutoConfig() {
- return autoConfig;
+ public int getHttpSSlPort() {
+ return httpSSlPort;
}
- public boolean getAutoConfig() {
+ @Override
+ public void setHttpSSlPort(int httpSSlPort) {
+
+ }
+
+ public void setHttpSSlPort(Integer httpSSlPort) {
+ this.httpSSlPort = httpSSlPort;
+ }
+
+ public int getRtmpPort() {
+ return rtmpPort;
+ }
+
+ @Override
+ public void setRtmpPort(int rtmpPort) {
+
+ }
+
+ public void setRtmpPort(Integer rtmpPort) {
+ this.rtmpPort = rtmpPort;
+ }
+
+ public int getRtmpSSlPort() {
+ return rtmpSSlPort;
+ }
+
+ @Override
+ public void setRtmpSSlPort(int rtmpSSlPort) {
+
+ }
+
+ public void setRtmpSSlPort(Integer rtmpSSlPort) {
+ this.rtmpSSlPort = rtmpSSlPort;
+ }
+
+ public int getRtpProxyPort() {
+ if (rtpProxyPort == null) {
+ return 0;
+ }else {
+ return rtpProxyPort;
+ }
+
+ }
+
+ @Override
+ public void setRtpProxyPort(int rtpProxyPort) {
+
+ }
+
+ public void setRtpProxyPort(Integer rtpProxyPort) {
+ this.rtpProxyPort = rtpProxyPort;
+ }
+
+ public int getRtspPort() {
+ return rtspPort;
+ }
+
+ @Override
+ public void setRtspPort(int rtspPort) {
+
+ }
+
+ public void setRtspPort(Integer rtspPort) {
+ this.rtspPort = rtspPort;
+ }
+
+ public int getRtspSSLPort() {
+ return rtspSSLPort;
+ }
+
+ @Override
+ public void setRtspSSLPort(int rtspSSLPort) {
+
+ }
+
+ public void setRtspSSLPort(Integer rtspSSLPort) {
+ this.rtspSSLPort = rtspSSLPort;
+ }
+
+ public boolean isAutoConfig() {
return autoConfig;
}
@@ -127,51 +256,101 @@
this.rtpPortRange = rtpPortRange;
}
- public String getHttpSSlPort() {
- return httpSSlPort;
+ public int getRecordAssistPort() {
+ return recordAssistPort;
}
- public void setHttpSSlPort(String httpSSlPort) {
- this.httpSSlPort = httpSSlPort;
+ @Override
+ public void setRecordAssistPort(int recordAssistPort) {
+
}
- public String getRtmpPort() {
- return rtmpPort;
+ public void setRecordAssistPort(Integer recordAssistPort) {
+ this.recordAssistPort = recordAssistPort;
}
- public void setRtmpPort(String rtmpPort) {
- this.rtmpPort = rtmpPort;
+ @Override
+ public boolean isDocker() {
+ return docker;
}
- public String getRtmpSSlPort() {
- return rtmpSSlPort;
+ @Override
+ public void setDocker(boolean docker) {
+ this.docker = docker;
}
- public void setRtmpSSlPort(String rtmpSSlPort) {
- this.rtmpSSlPort = rtmpSSlPort;
+ public String getSdpIp() {
+ if (StringUtils.isEmpty(sdpIp)){
+ return ip;
+ }else {
+ return sdpIp;
+ }
}
- public String getRtpProxyPort() {
- return rtpProxyPort;
+ public String getStreamIp() {
+ if (StringUtils.isEmpty(streamIp)){
+ return ip;
+ }else {
+ return streamIp;
+ }
}
- public void setRtpProxyPort(String rtpProxyPort) {
- this.rtpProxyPort = rtpProxyPort;
+
+
+ public MediaServerItem getMediaSerItem(){
+ MediaServerItem mediaServerItem = new MediaServerItem();
+ mediaServerItem.setId(id);
+ mediaServerItem.setIp(ip);
+ mediaServerItem.setDocker(true);
+ mediaServerItem.setHookIp(hookIp);
+ mediaServerItem.setSdpIp(sdpIp);
+ mediaServerItem.setStreamIp(streamIp);
+ mediaServerItem.setHttpPort(httpPort);
+ mediaServerItem.setHttpSSlPort(httpSSlPort);
+ mediaServerItem.setRtmpPort(rtmpPort);
+ mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
+ mediaServerItem.setRtpProxyPort(rtpProxyPort);
+ mediaServerItem.setRtspPort(rtspPort);
+ mediaServerItem.setRtspSSLPort(rtspSSLPort);
+ mediaServerItem.setAutoConfig(autoConfig);
+ mediaServerItem.setSecret(secret);
+ mediaServerItem.setStreamNoneReaderDelayMS(streamNoneReaderDelayMS);
+ mediaServerItem.setRtpEnable(rtpEnable);
+ mediaServerItem.setRtpPortRange(rtpPortRange);
+ mediaServerItem.setRecordAssistPort(recordAssistPort);
+ mediaServerItem.setCreateTime(createTime);
+ mediaServerItem.setUpdateTime(updateTime);
+ mediaServerItem.setCount(count);
+ return mediaServerItem;
}
- public String getRtspPort() {
- return rtspPort;
+ @Override
+ public String getUpdateTime() {
+ return updateTime;
}
- public void setRtspPort(String rtspPort) {
- this.rtspPort = rtspPort;
+ @Override
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
}
- public String getRtspSSLPort() {
- return rtspSSLPort;
+ @Override
+ public String getCreateTime() {
+ return createTime;
}
- public void setRtspSSLPort(String rtspSSLPort) {
- this.rtspSSLPort = rtspSSLPort;
+ @Override
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ @Override
+ public int getCount() {
+ return count;
+ }
+
+ @Override
+ public void setCount(int count) {
+ this.count = count;
}
}
--
Gitblit v1.8.0