From a59095db0c240987028d4d05ab561665ed8fe7ea Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期五, 29 七月 2022 15:16:39 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 93 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 3633789..0d98674 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -4,7 +4,7 @@
/**
- * 鏁版嵁搴撹嚜璧營D
+ * 鏁版嵁搴撹嚜澧濱D
*/
private int id;
@@ -155,6 +155,26 @@
private double latitude;
/**
+ * 缁忓害 GCJ02
+ */
+ private double longitudeGcj02;
+
+ /**
+ * 绾害 GCJ02
+ */
+ private double latitudeGcj02;
+
+ /**
+ * 缁忓害 WGS84
+ */
+ private double longitudeWgs84;
+
+ /**
+ * 绾害 WGS84
+ */
+ private double latitudeWgs84;
+
+ /**
* 瀛愯澶囨暟
*/
private int subCount;
@@ -168,6 +188,21 @@
* 鏄惁鍚湁闊抽
*/
private boolean hasAudio;
+
+ /**
+ * 鏍囪閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝
+ */
+ private int channelType;
+
+ /**
+ * 涓氬姟鍒嗙粍
+ */
+ private String businessGroupId;
+
+ /**
+ * GPS鐨勬洿鏂版椂闂�
+ */
+ private String gpsTime;
public int getId() {
return id;
@@ -402,6 +437,38 @@
this.latitude = latitude;
}
+ public double getLongitudeGcj02() {
+ return longitudeGcj02;
+ }
+
+ public void setLongitudeGcj02(double longitudeGcj02) {
+ this.longitudeGcj02 = longitudeGcj02;
+ }
+
+ public double getLatitudeGcj02() {
+ return latitudeGcj02;
+ }
+
+ public void setLatitudeGcj02(double latitudeGcj02) {
+ this.latitudeGcj02 = latitudeGcj02;
+ }
+
+ public double getLongitudeWgs84() {
+ return longitudeWgs84;
+ }
+
+ public void setLongitudeWgs84(double longitudeWgs84) {
+ this.longitudeWgs84 = longitudeWgs84;
+ }
+
+ public double getLatitudeWgs84() {
+ return latitudeWgs84;
+ }
+
+ public void setLatitudeWgs84(double latitudeWgs84) {
+ this.latitudeWgs84 = latitudeWgs84;
+ }
+
public int getSubCount() {
return subCount;
}
@@ -441,4 +508,28 @@
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
+
+ public int getChannelType() {
+ return channelType;
+ }
+
+ public void setChannelType(int channelType) {
+ this.channelType = channelType;
+ }
+
+ public String getBusinessGroupId() {
+ return businessGroupId;
+ }
+
+ public void setBusinessGroupId(String businessGroupId) {
+ this.businessGroupId = businessGroupId;
+ }
+
+ public String getGpsTime() {
+ return gpsTime;
+ }
+
+ public void setGpsTime(String gpsTime) {
+ this.gpsTime = gpsTime;
+ }
}
--
Gitblit v1.8.0