From 48fad3582d81dd79423db1db5402d9f47fd5f30f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 09 二月 2023 14:13:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 4c24d14..4790fa4 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -3,17 +3,13 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
@Component
@ConfigurationProperties(prefix = "sip", ignoreInvalidFields = true)
public class SipConfig {
private String ip;
-
- /**
- * 榛樿浣跨敤 0.0.0.0
- */
- private String monitorIp = "0.0.0.0";
private Integer port;
@@ -25,18 +21,12 @@
Integer ptzSpeed = 50;
- Integer keepaliveTimeOut = 255;
+ Integer registerTimeInterval = 120;
- Integer registerTimeInterval = 60;
-
- private boolean alarm = false;
+ private boolean alarm;
public void setIp(String ip) {
this.ip = ip;
- }
-
- public void setMonitorIp(String monitorIp) {
- this.monitorIp = monitorIp;
}
public void setPort(Integer port) {
@@ -59,16 +49,9 @@
this.ptzSpeed = ptzSpeed;
}
- public void setKeepaliveTimeOut(Integer keepaliveTimeOut) {
- this.keepaliveTimeOut = keepaliveTimeOut;
- }
public void setRegisterTimeInterval(Integer registerTimeInterval) {
this.registerTimeInterval = registerTimeInterval;
- }
-
- public String getMonitorIp() {
- return monitorIp;
}
public String getIp() {
@@ -99,10 +82,6 @@
return ptzSpeed;
}
- public Integer getKeepaliveTimeOut() {
- return keepaliveTimeOut;
- }
-
public Integer getRegisterTimeInterval() {
return registerTimeInterval;
}
@@ -114,4 +93,10 @@
public void setAlarm(boolean alarm) {
this.alarm = alarm;
}
+
+ public void getLocalIp(String deviceLocalIp) {
+ if (ObjectUtils.isEmpty(deviceLocalIp)) {
+
+ }
+ }
}
--
Gitblit v1.8.0