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/ParentPlatform.java | 104 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 84 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index 8df7939..61e777a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -105,11 +105,6 @@
private int channelCount;
/**
- * 鍏变韩鎵�鏈夌殑鐩存挱娴�
- */
- private boolean shareAllLiveStream;
-
- /**
* 榛樿鐩綍Id,鑷姩娣诲姞鐨勯�氶亾澶氭斁鍦ㄨ繖涓洰褰曚笅
*/
private String catalogId;
@@ -125,9 +120,39 @@
private boolean alarmSubscribe;
/**
- * 宸茶璁㈤槄GPS淇℃伅
+ * 宸茶璁㈤槄绉诲姩浣嶇疆淇℃伅
*/
- private boolean gpsSubscribe;
+ private boolean mobilePositionSubscribe;
+
+ /**
+ * 鐐规挱鏈帹娴佺殑璁惧鏃舵槸鍚︿娇鐢╮edis閫氱煡鎷夎捣
+ */
+ private boolean startOfflinePush;
+
+ /**
+ * 鐩綍鍒嗙粍-姣忔鍚戜笂绾у彂閫侀�氶亾淇℃伅鏃跺崟涓寘鎼哄甫鐨勯�氶亾鏁伴噺锛屽彇鍊�1,2,4,8
+ */
+ private int catalogGroup;
+
+ /**
+ * 琛屾斂鍖哄垝
+ */
+ private String administrativeDivision;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private String updateTime;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 鏍戠被鍨� 鍥芥爣瑙勫畾浜嗕袱绉嶆爲鐨勫睍鐜版柟寮� 琛屾斂鍖哄垝 CivilCode 鍜屼笟鍔″垎缁�:BusinessGroup
+ */
+ private String treeType;
public Integer getId() {
return id;
@@ -289,15 +314,6 @@
this.channelCount = channelCount;
}
-
- public boolean isShareAllLiveStream() {
- return shareAllLiveStream;
- }
-
- public void setShareAllLiveStream(boolean shareAllLiveStream) {
- this.shareAllLiveStream = shareAllLiveStream;
- }
-
public String getCatalogId() {
return catalogId;
}
@@ -322,11 +338,59 @@
this.alarmSubscribe = alarmSubscribe;
}
- public boolean isGpsSubscribe() {
- return gpsSubscribe;
+ public boolean isMobilePositionSubscribe() {
+ return mobilePositionSubscribe;
}
- public void setGpsSubscribe(boolean gpsSubscribe) {
- this.gpsSubscribe = gpsSubscribe;
+ public void setMobilePositionSubscribe(boolean mobilePositionSubscribe) {
+ this.mobilePositionSubscribe = mobilePositionSubscribe;
+ }
+
+ public boolean isStartOfflinePush() {
+ return startOfflinePush;
+ }
+
+ public void setStartOfflinePush(boolean startOfflinePush) {
+ this.startOfflinePush = startOfflinePush;
+ }
+
+ public int getCatalogGroup() {
+ return catalogGroup;
+ }
+
+ public void setCatalogGroup(int catalogGroup) {
+ this.catalogGroup = catalogGroup;
+ }
+
+ public String getAdministrativeDivision() {
+ return administrativeDivision;
+ }
+
+ public void setAdministrativeDivision(String administrativeDivision) {
+ this.administrativeDivision = administrativeDivision;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getTreeType() {
+ return treeType;
+ }
+
+ public void setTreeType(String treeType) {
+ this.treeType = treeType;
}
}
--
Gitblit v1.8.0