From 21a96ad20fd75e55d03c00af8df8adb039f0c77a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 20 六月 2023 12:51:06 +0800
Subject: [PATCH] 修复通道刷新

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java |   50 +++++++++++++++++++++++++++++---------------------
 1 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index 83b9c6a..0ef0629 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -77,8 +77,8 @@
 	/**
 	 * 鍦ㄧ嚎
 	 */
-	@Schema(description = "鏄惁鍦ㄧ嚎锛�1涓哄湪绾匡紝0涓虹绾�")
-	private int online;
+	@Schema(description = "鏄惁鍦ㄧ嚎锛宼rue涓哄湪绾匡紝false涓虹绾�")
+	private boolean onLine;
 
 
 	/**
@@ -140,7 +140,7 @@
 	/**
 	 * 鐩綍璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
 	 */
-	@Schema(description = "鐩綍璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄")
+	@Schema(description = "鐩綍璁㈤槄鍛ㄦ湡锛宱涓轰笉璁㈤槄")
 	private int subscribeCycleForCatalog;
 
 	/**
@@ -173,12 +173,6 @@
 	@Schema(description = "鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02")
 	private String geoCoordSys;
 
-	/**
-	 * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
-	 */
-	@Schema(description = "鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup")
-	private String treeType;
-
 	@Schema(description = "瀵嗙爜")
 	private String password;
 
@@ -190,6 +184,9 @@
 
 	@Schema(description = "鏄惁浣滀负娑堟伅閫氶亾")
 	private boolean asMessageChannel;
+
+	@Schema(description = "璁惧娉ㄥ唽鐨勪簨鍔′俊鎭�")
+	private SipTransactionInfo sipTransactionInfo;
 
 
 	public String getDeviceId() {
@@ -244,6 +241,17 @@
 		return streamMode;
 	}
 
+	public Integer getStreamModeForParam() {
+		if (streamMode.equalsIgnoreCase("UDP")) {
+			return 0;
+		}else if (streamMode.equalsIgnoreCase("TCP-PASSIVE")) {
+			return 1;
+		}else if (streamMode.equalsIgnoreCase("TCP-ACTIVE")) {
+			return 2;
+		}
+		return 0;
+	}
+
 	public void setStreamMode(String streamMode) {
 		this.streamMode = streamMode;
 	}
@@ -272,12 +280,12 @@
 		this.hostAddress = hostAddress;
 	}
 
-	public int getOnline() {
-		return online;
+	public boolean isOnLine() {
+		return onLine;
 	}
 
-	public void setOnline(int online) {
-		this.online = online;
+	public void setOnLine(boolean onLine) {
+		this.onLine = onLine;
 	}
 
 	public int getChannelCount() {
@@ -392,14 +400,6 @@
 		this.geoCoordSys = geoCoordSys;
 	}
 
-	public String getTreeType() {
-		return treeType;
-	}
-
-	public void setTreeType(String treeType) {
-		this.treeType = treeType;
-	}
-
 	public String getPassword() {
 		return password;
 	}
@@ -439,4 +439,12 @@
 	public void setAsMessageChannel(boolean asMessageChannel) {
 		this.asMessageChannel = asMessageChannel;
 	}
+
+	public SipTransactionInfo getSipTransactionInfo() {
+		return sipTransactionInfo;
+	}
+
+	public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
+		this.sipTransactionInfo = sipTransactionInfo;
+	}
 }

--
Gitblit v1.8.0