From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 175 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 131 insertions(+), 44 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 c6b50b0..bdd1503 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,105 +1,136 @@
package com.genersoft.iot.vmp.conf;
-import io.netty.util.internal.StringUtil;
+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;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
@Configuration("mediaConfig")
-public class MediaConfig {
+public class MediaConfig{
+
+ // 淇敼蹇呴』閰嶇疆锛屼笉鍐嶆敮鎸佽嚜鍔ㄨ幏鍙�
+ @Value("${media.id}")
+ private String id;
@Value("${media.ip}")
private String ip;
- @Value("${media.hookIp:${sip.ip}}")
+ @Value("${media.hook-ip:${sip.ip}}")
private String hookIp;
- @Value("${media.sdpIp:${media.ip}}")
+ @Value("${sip.ip}")
+ private String sipIp;
+
+ @Value("${sip.domain}")
+ private String sipDomain;
+
+ @Value("${media.sdp-ip:${media.ip}}")
private String sdpIp;
- @Value("${media.streamIp:${media.ip}}")
+ @Value("${media.stream-ip:${media.ip}}")
private String streamIp;
- @Value("${media.httpPort}")
- private String httpPort;
+ @Value("${media.http-port}")
+ private Integer httpPort;
- @Value("${media.httpSSlPort:}")
- private String httpSSlPort;
+ @Value("${media.http-ssl-port:0}")
+ private Integer httpSSlPort = 0;
- @Value("${media.rtmpPort:}")
- private String rtmpPort;
+ @Value("${media.rtmp-port:0}")
+ private Integer rtmpPort = 0;
- @Value("${media.rtmpSSlPort:}")
- private String rtmpSSlPort;
+ @Value("${media.rtmp-ssl-port:0}")
+ private Integer rtmpSSlPort = 0;
- @Value("${media.rtpProxyPort:}")
- private String rtpProxyPort;
+ @Value("${media.rtp-proxy-port:0}")
+ private Integer rtpProxyPort = 0;
- @Value("${media.rtspPort:}")
- private String rtspPort;
+ @Value("${media.rtsp-port:0}")
+ private Integer rtspPort = 0;
- @Value("${media.rtspSSLPort:}")
- private String rtspSSLPort;
+ @Value("${media.rtsp-ssl-port:0}")
+ private Integer rtspSSLPort = 0;
- @Value("${media.autoConfig:true}")
- private boolean autoConfig;
+ @Value("${media.auto-config:true}")
+ private boolean autoConfig = true;
@Value("${media.secret}")
private String secret;
- @Value("${media.streamNoneReaderDelayMS:18000}")
- private String streamNoneReaderDelayMS;
+ @Value("${media.stream-none-reader-delay-ms:10000}")
+ private int streamNoneReaderDelayMS = 10000;
@Value("${media.rtp.enable}")
private boolean rtpEnable;
- @Value("${media.rtp.portRange}")
+ @Value("${media.rtp.port-range}")
private String rtpPortRange;
- @Value("${media.recordAssistPort}")
- private int recordAssistPort;
+
+ @Value("${media.rtp.send-port-range}")
+ private String sendRtpPortRange;
+
+ @Value("${media.record-assist-port:0}")
+ private Integer recordAssistPort = 0;
+
+ public String getId() {
+ return id;
+ }
public String getIp() {
return ip;
}
public String getHookIp() {
- return hookIp;
+ if (StringUtils.isEmpty(hookIp)){
+ return sipIp;
+ }else {
+ return hookIp;
+ }
+
}
- public String getSdpIp() {
- return sdpIp;
+ public String getSipIp() {
+ if (sipIp == null) {
+ return this.ip;
+ }else {
+ return sipIp;
+ }
}
- public String getStreamIp() {
- return streamIp;
- }
-
- public String getHttpPort() {
+ public int getHttpPort() {
return httpPort;
}
- public String getHttpSSlPort() {
+ public int getHttpSSlPort() {
return httpSSlPort;
}
- public String getRtmpPort() {
+ public int getRtmpPort() {
return rtmpPort;
}
-
- public String getRtmpSSlPort() {
+
+ public int getRtmpSSlPort() {
return rtmpSSlPort;
}
- public String getRtpProxyPort() {
- return rtpProxyPort;
+ public int getRtpProxyPort() {
+ if (rtpProxyPort == null) {
+ return 0;
+ }else {
+ return rtpProxyPort;
+ }
+
}
- public String getRtspPort() {
+ public int getRtspPort() {
return rtspPort;
}
- public String getRtspSSLPort() {
+ public int getRtspSSLPort() {
return rtspSSLPort;
}
@@ -111,7 +142,7 @@
return secret;
}
- public String getStreamNoneReaderDelayMS() {
+ public int getStreamNoneReaderDelayMS() {
return streamNoneReaderDelayMS;
}
@@ -122,8 +153,64 @@
public String getRtpPortRange() {
return rtpPortRange;
}
-
+
public int getRecordAssistPort() {
return recordAssistPort;
}
+
+ public String getSdpIp() {
+ if (StringUtils.isEmpty(sdpIp)){
+ return ip;
+ }else {
+ return sdpIp;
+ }
+ }
+
+ public String getStreamIp() {
+ if (StringUtils.isEmpty(streamIp)){
+ return ip;
+ }else {
+ return streamIp;
+ }
+ }
+
+ public String getSipDomain() {
+ return sipDomain;
+ }
+
+ public String getSendRtpPortRange() {
+ return sendRtpPortRange;
+ }
+
+ public MediaServerItem getMediaSerItem(){
+ MediaServerItem mediaServerItem = new MediaServerItem();
+ mediaServerItem.setId(id);
+ mediaServerItem.setIp(ip);
+ mediaServerItem.setDefaultServer(true);
+ mediaServerItem.setHookIp(getHookIp());
+ mediaServerItem.setSdpIp(getSdpIp());
+ mediaServerItem.setStreamIp(getStreamIp());
+ mediaServerItem.setHttpPort(httpPort);
+ mediaServerItem.setHttpSSlPort(httpSSlPort);
+ mediaServerItem.setRtmpPort(rtmpPort);
+ mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
+ mediaServerItem.setRtpProxyPort(getRtpProxyPort());
+ mediaServerItem.setRtspPort(rtspPort);
+ mediaServerItem.setRtspSSLPort(rtspSSLPort);
+ mediaServerItem.setAutoConfig(autoConfig);
+ mediaServerItem.setSecret(secret);
+ mediaServerItem.setStreamNoneReaderDelayMS(streamNoneReaderDelayMS);
+ mediaServerItem.setRtpEnable(rtpEnable);
+ mediaServerItem.setRtpPortRange(rtpPortRange);
+ mediaServerItem.setSendRtpPortRange(sendRtpPortRange);
+ mediaServerItem.setRecordAssistPort(recordAssistPort);
+ mediaServerItem.setHookAliveInterval(120);
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ mediaServerItem.setCreateTime(format.format(System.currentTimeMillis()));
+ mediaServerItem.setUpdateTime(format.format(System.currentTimeMillis()));
+
+ return mediaServerItem;
+ }
+
}
--
Gitblit v1.8.0