From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java |  117 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 78 insertions(+), 39 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 52d8089..6a6c54f 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,71 +1,110 @@
 package com.genersoft.iot.vmp.conf;
 
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
-@Configuration("sipConfig")
+@Component
+@ConfigurationProperties(prefix = "sip", ignoreInvalidFields = true)
+@Order(0)
 public class SipConfig {
 
-	@Value("${sip.ip}")
-	String sipIp;
-	@Value("${sip.port}")
-	Integer sipPort;
-	@Value("${sip.domain}")
-	String sipDomain;
-	@Value("${sip.id}")
-	String sipId;
-	@Value("${sip.password}")
-	String sipPassword;
+	private String ip;
+
+	private String showIp;
+
+	private Integer port;
+
+	private String domain;
+
+	private String id;
+
+	private String password;
 	
-	@Value("${sip.ptz.speed:50}")
-	Integer speed;
+	Integer ptzSpeed = 50;
 
-	public String getSipIp() {
-		return sipIp;
+	Integer registerTimeInterval = 120;
+
+	private boolean alarm;
+
+	public void setIp(String ip) {
+		this.ip = ip;
 	}
 
-	public void setSipIp(String sipIp) {
-		this.sipIp = sipIp;
+	public void setPort(Integer port) {
+		this.port = port;
 	}
 
-	public Integer getSipPort() {
-		return sipPort;
+	public void setDomain(String domain) {
+		this.domain = domain;
 	}
 
-	public void setSipPort(Integer sipPort) {
-		this.sipPort = sipPort;
+	public void setId(String id) {
+		this.id = id;
 	}
 
-	public String getSipDomain() {
-		return sipDomain;
+	public void setPassword(String password) {
+		this.password = password;
 	}
 
-	public void setSipDomain(String sipDomain) {
-		this.sipDomain = sipDomain;
+	public void setPtzSpeed(Integer ptzSpeed) {
+		this.ptzSpeed = ptzSpeed;
 	}
 
-	public String getSipId() {
-		return sipId;
+
+	public void setRegisterTimeInterval(Integer registerTimeInterval) {
+		this.registerTimeInterval = registerTimeInterval;
 	}
 
-	public void setSipId(String sipId) {
-		this.sipId = sipId;
+	public String getIp() {
+		return ip;
 	}
 
-	public String getSipPassword() {
-		return sipPassword;
+
+	public Integer getPort() {
+		return port;
 	}
 
-	public void setSipPassword(String sipPassword) {
-		this.sipPassword = sipPassword;
+
+	public String getDomain() {
+		return domain;
 	}
 
-	public Integer getSpeed() {
-		return speed;
+
+	public String getId() {
+		return id;
 	}
 
-	public void setSpeed(Integer speed) {
-		this.speed = speed;
+	public String getPassword() {
+		return password;
+	}
+
+
+	public Integer getPtzSpeed() {
+		return ptzSpeed;
+	}
+
+	public Integer getRegisterTimeInterval() {
+		return registerTimeInterval;
+	}
+
+	public boolean isAlarm() {
+		return alarm;
+	}
+
+	public void setAlarm(boolean alarm) {
+		this.alarm = alarm;
+	}
+
+	public String getShowIp() {
+		if (this.showIp == null) {
+			return this.ip;
+		}
+		return showIp;
+	}
+
+	public void setShowIp(String showIp) {
+		this.showIp = showIp;
 	}
 }

--
Gitblit v1.8.0