From d09ee0c2ff93c799b0c19481f0890a5be5a2db03 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 18 六月 2021 19:44:55 +0800
Subject: [PATCH] 解决启动设置所有设备离线未删除redis记录

---
 src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java |  171 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 95 insertions(+), 76 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 cd4e90d..48f1af5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -14,29 +14,35 @@
     @Value("${media.hookIp:${sip.ip}}")
     private String hookIp;
 
+    @Value("${sip.ip}")
+    private String sipIp;
+
     @Value("${media.sdpIp:${media.ip}}")
     private String sdpIp;
 
+    @Value("${media.streamIp:${media.ip}}")
+    private String streamIp;
+
     @Value("${media.httpPort}")
-    private String httpPort;
+    private Integer httpPort;
 
     @Value("${media.httpSSlPort:}")
-    private String httpSSlPort;
+    private Integer httpSSlPort;
 
     @Value("${media.rtmpPort:}")
-    private String rtmpPort;
+    private Integer rtmpPort;
 
     @Value("${media.rtmpSSlPort:}")
-    private String rtmpSSlPort;
+    private Integer rtmpSSlPort;
 
     @Value("${media.rtpProxyPort:}")
-    private String rtpProxyPort;
+    private Integer rtpProxyPort;
 
     @Value("${media.rtspPort:}")
-    private String rtspPort;
+    private Integer rtspPort;
 
     @Value("${media.rtspSSLPort:}")
-    private String rtspSSLPort;
+    private Integer rtspSSLPort;
 
     @Value("${media.autoConfig:true}")
     private boolean autoConfig;
@@ -54,7 +60,7 @@
     private String rtpPortRange;
 
     @Value("${media.recordAssistPort}")
-    private int recordAssistPort;
+    private Integer recordAssistPort;
 
     public String getIp() {
         return ip;
@@ -65,26 +71,99 @@
     }
 
     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 getSdpIp() {
+        if (StringUtils.isEmpty(sdpIp)){
+            return ip;
+        }else {
+            return sdpIp;
+        }
+    }
+
+    public void setSdpIp(String sdpIp) {
+        this.sdpIp = sdpIp;
+    }
+
+    public String getStreamIp() {
+        if (StringUtils.isEmpty(streamIp)){
+            return ip;
+        }else {
+            return streamIp;
+        }
+    }
+
+    public void setStreamIp(String streamIp) {
+        this.streamIp = streamIp;
+    }
+
+    public Integer getHttpPort() {
         return httpPort;
     }
 
-    public void setHttpPort(String httpPort) {
+    public void setHttpPort(Integer httpPort) {
         this.httpPort = httpPort;
     }
 
-    public boolean isAutoConfig() {
-        return autoConfig;
+    public Integer getHttpSSlPort() {
+        return httpSSlPort;
     }
 
-    public boolean getAutoConfig() {
+    public void setHttpSSlPort(Integer httpSSlPort) {
+        this.httpSSlPort = httpSSlPort;
+    }
+
+    public Integer getRtmpPort() {
+        return rtmpPort;
+    }
+
+    public void setRtmpPort(Integer rtmpPort) {
+        this.rtmpPort = rtmpPort;
+    }
+
+    public Integer getRtmpSSlPort() {
+        return rtmpSSlPort;
+    }
+
+    public void setRtmpSSlPort(Integer rtmpSSlPort) {
+        this.rtmpSSlPort = rtmpSSlPort;
+    }
+
+    public Integer getRtpProxyPort() {
+        return rtpProxyPort;
+    }
+
+    public void setRtpProxyPort(Integer rtpProxyPort) {
+        this.rtpProxyPort = rtpProxyPort;
+    }
+
+    public Integer getRtspPort() {
+        return rtspPort;
+    }
+
+    public void setRtspPort(Integer rtspPort) {
+        this.rtspPort = rtspPort;
+    }
+
+    public Integer getRtspSSLPort() {
+        return rtspSSLPort;
+    }
+
+    public void setRtspSSLPort(Integer rtspSSLPort) {
+        this.rtspSSLPort = rtspSSLPort;
+    }
+
+    public boolean isAutoConfig() {
         return autoConfig;
     }
 
@@ -124,71 +203,11 @@
         this.rtpPortRange = rtpPortRange;
     }
 
-    public String getHttpSSlPort() {
-        return httpSSlPort;
-    }
-
-    public void setHttpSSlPort(String httpSSlPort) {
-        this.httpSSlPort = httpSSlPort;
-    }
-
-    public String getRtmpPort() {
-        return rtmpPort;
-    }
-
-    public void setRtmpPort(String rtmpPort) {
-        this.rtmpPort = rtmpPort;
-    }
-
-    public String getRtmpSSlPort() {
-        return rtmpSSlPort;
-    }
-
-    public void setRtmpSSlPort(String rtmpSSlPort) {
-        this.rtmpSSlPort = rtmpSSlPort;
-    }
-
-    public String getRtpProxyPort() {
-        return rtpProxyPort;
-    }
-
-    public void setRtpProxyPort(String rtpProxyPort) {
-        this.rtpProxyPort = rtpProxyPort;
-    }
-
-    public String getRtspPort() {
-        return rtspPort;
-    }
-
-    public void setRtspPort(String rtspPort) {
-        this.rtspPort = rtspPort;
-    }
-
-    public String getRtspSSLPort() {
-        return rtspSSLPort;
-    }
-
-    public void setRtspSSLPort(String rtspSSLPort) {
-        this.rtspSSLPort = rtspSSLPort;
-    }
-
-    public int getRecordAssistPort() {
+    public Integer getRecordAssistPort() {
         return recordAssistPort;
     }
 
-    public void setRecordAssistPort(int recordAssistPort) {
+    public void setRecordAssistPort(Integer recordAssistPort) {
         this.recordAssistPort = recordAssistPort;
-    }
-
-    public String getSdpIp() {
-        if (StringUtils.isEmpty(sdpIp)) {
-            return ip;
-        }else {
-            return sdpIp;
-        }
-    }
-
-    public void setSdpIp(String sdpIp) {
-        this.sdpIp = sdpIp;
     }
 }

--
Gitblit v1.8.0