From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 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 0c06145..7c23a2f 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
@@ -114,6 +114,36 @@
*/
private String catalogId;
+ /**
+ * 宸茶璁㈤槄鐩綍淇℃伅
+ */
+ private boolean catalogSubscribe;
+
+ /**
+ * 宸茶璁㈤槄鎶ヨ淇℃伅
+ */
+ private boolean alarmSubscribe;
+
+ /**
+ * 宸茶璁㈤槄绉诲姩浣嶇疆淇℃伅
+ */
+ private boolean mobilePositionSubscribe;
+
+ /**
+ * 鐐规挱鏈帹娴佺殑璁惧鏃舵槸鍚︿娇鐢╮edis閫氱煡鎷夎捣
+ */
+ private boolean startOfflinePush;
+
+ /**
+ * 鐩綍鍒嗙粍-姣忔鍚戜笂绾у彂閫侀�氶亾淇℃伅鏃跺崟涓寘鎼哄甫鐨勯�氶亾鏁伴噺锛屽彇鍊�1,2,4,8
+ */
+ private int catalogGroup;
+
+ /**
+ * 琛屾斂鍖哄垝
+ */
+ private String administrativeDivision;
+
public Integer getId() {
return id;
}
@@ -290,4 +320,52 @@
public void setCatalogId(String catalogId) {
this.catalogId = catalogId;
}
+
+ public boolean isCatalogSubscribe() {
+ return catalogSubscribe;
+ }
+
+ public void setCatalogSubscribe(boolean catalogSubscribe) {
+ this.catalogSubscribe = catalogSubscribe;
+ }
+
+ public boolean isAlarmSubscribe() {
+ return alarmSubscribe;
+ }
+
+ public void setAlarmSubscribe(boolean alarmSubscribe) {
+ this.alarmSubscribe = alarmSubscribe;
+ }
+
+ public boolean isMobilePositionSubscribe() {
+ return mobilePositionSubscribe;
+ }
+
+ 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;
+ }
}
--
Gitblit v1.8.0