From 5a7a7a12bde268c104610d3e81a08df06ccab5eb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 六月 2023 16:46:26 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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 bb3391e..1318c59 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;
@@ -193,6 +187,8 @@
@Schema(description = "璁惧娉ㄥ唽鐨勪簨鍔′俊鎭�")
private SipTransactionInfo sipTransactionInfo;
+
+
public String getDeviceId() {
@@ -286,12 +282,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() {
@@ -406,15 +402,6 @@
this.geoCoordSys = geoCoordSys;
}
-
- public String getTreeType() {
- return treeType;
- }
-
- public void setTreeType(String treeType) {
- this.treeType = treeType;
- }
-
public String getPassword() {
return password;
}
@@ -462,4 +449,20 @@
public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
this.sipTransactionInfo = sipTransactionInfo;
}
+
+ /*======================璁惧涓诲瓙鐮佹祦閫昏緫START=========================*/
+ @Schema(description = "寮�鍚富瀛愮爜娴佸垏鎹㈢殑寮�鍏筹紙false-涓嶅紑鍚紝true-寮�鍚級")
+ private boolean switchPrimarySubStream;
+
+ public boolean isSwitchPrimarySubStream() {
+ return switchPrimarySubStream;
+ }
+
+ public void setSwitchPrimarySubStream(boolean switchPrimarySubStream) {
+ this.switchPrimarySubStream = switchPrimarySubStream;
+ }
+
+ /*======================璁惧涓诲瓙鐮佹祦閫昏緫END=========================*/
+
+
}
--
Gitblit v1.8.0