From 0c4a8c09757ce855fd877fd7b896b5295c4dd26b Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期三, 22 六月 2022 13:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 32 ++++++++++++++++++--------------
1 files changed, 18 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 81b9666..253520b 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,12 @@
/**
* 鏄惁寮�鍚痵src鏍￠獙锛岄粯璁ゅ叧闂紝寮�鍚彲浠ラ槻姝覆娴�
*/
- private boolean ssrcCheck;
+ private boolean ssrcCheck = true;
+
+ /**
+ * 鍦扮悊鍧愭爣绯伙紝 鐩墠鏀寔 WGS84,GCJ02 TODO CGCS2000
+ */
+ private String geoCoordSys;
public String getDeviceId() {
@@ -279,14 +283,6 @@
this.mediaServerId = mediaServerId;
}
- public boolean isFirsRegister() {
- return firsRegister;
- }
-
- public void setFirsRegister(boolean firsRegister) {
- this.firsRegister = firsRegister;
- }
-
public String getCharset() {
return charset;
}
@@ -334,4 +330,12 @@
public void setSsrcCheck(boolean ssrcCheck) {
this.ssrcCheck = ssrcCheck;
}
+
+ public String getGeoCoordSys() {
+ return geoCoordSys;
+ }
+
+ public void setGeoCoordSys(String geoCoordSys) {
+ this.geoCoordSys = geoCoordSys;
+ }
}
--
Gitblit v1.8.0