From e78c402a248ff252ee93e724396c62d806087fab Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 03 七月 2022 10:32:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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 1dc62ab..a35d051 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
@@ -1,6 +1,10 @@
package com.genersoft.iot.vmp.gb28181.bean;
+/**
+ * 鍥芥爣璁惧/骞冲彴
+ * @author lin
+ */
public class Device {
/**
@@ -100,11 +104,6 @@
private String mediaServerId;
/**
- * 棣栨娉ㄥ唽
- */
- private boolean firsRegister;
-
- /**
* 瀛楃闆�, 鏀寔 UTF-8 涓� GB2312
*/
private String charset ;
@@ -132,7 +131,17 @@
/**
* 鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�
*/
- private boolean ssrcCheck;
+ private boolean ssrcCheck = true;
+
+ /**
+ * 鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02 TODO CGCS2000
+ */
+ private String geoCoordSys;
+
+ /**
+ * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝锛欳ivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
+ */
+ private String treeType;
public String getDeviceId() {
@@ -279,14 +288,6 @@
this.mediaServerId = mediaServerId;
}
- public boolean isFirsRegister() {
- return firsRegister;
- }
-
- public void setFirsRegister(boolean firsRegister) {
- this.firsRegister = firsRegister;
- }
-
public String getCharset() {
return charset;
}
@@ -335,4 +336,20 @@
this.ssrcCheck = ssrcCheck;
}
+ public String getGeoCoordSys() {
+ return geoCoordSys;
+ }
+
+ public void setGeoCoordSys(String geoCoordSys) {
+ this.geoCoordSys = geoCoordSys;
+ }
+
+
+ public String getTreeType() {
+ return treeType;
+ }
+
+ public void setTreeType(String treeType) {
+ this.treeType = treeType;
+ }
}
--
Gitblit v1.8.0