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/DeviceAlarm.java | 72 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
index 8ba43c2..0f5f392 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
@@ -1,6 +1,12 @@
package com.genersoft.iot.vmp.gb28181.bean;
+
public class DeviceAlarm {
+
+ /**
+ * 鏁版嵁搴搃d
+ */
+ private String id;
/**
* 璁惧Id
@@ -8,9 +14,14 @@
private String deviceId;
/**
+ * 閫氶亾Id
+ */
+ private String channelId;
+
+ /**
* 鎶ヨ绾у埆, 1涓轰竴绾ц鎯�, 2涓轰簩绾ц鎯�, 3涓轰笁绾ц鎯�, 4涓哄洓绾� 璀︽儏-
*/
- private String alarmPriorit;
+ private String alarmPriority;
/**
* 鎶ヨ鏂瑰紡 , 1涓虹數璇濇姤璀�, 2涓鸿澶囨姤璀�, 3涓虹煭淇℃姤璀�, 4涓� GPS鎶ヨ, 5涓鸿棰戞姤璀�, 6涓鸿澶囨晠闅滄姤璀�,
@@ -39,9 +50,43 @@
private double latitude;
/**
- * 鎶ヨ绫诲瀷
+ * 鎶ヨ绫诲瀷,
+ * 鎶ヨ鏂瑰紡涓�2鏃�,涓嶆惡甯� AlarmType涓洪粯璁ょ殑鎶ヨ璁惧鎶ヨ,
+ * 鎼哄甫 AlarmType鍙栧�煎強瀵瑰簲鎶ヨ绫诲瀷濡備笅:
+ * 1-瑙嗛涓㈠け鎶ヨ;
+ * 2-璁惧闃叉媶鎶ヨ;
+ * 3-瀛樺偍璁惧纾佺洏婊℃姤璀�;
+ * 4-璁惧楂樻俯鎶ヨ;
+ * 5-璁惧浣庢俯鎶ヨ銆�
+ * 鎶ヨ鏂瑰紡涓�5鏃�,鍙栧�煎涓�:
+ * 1-浜哄伐瑙嗛鎶ヨ;
+ * 2-杩愬姩鐩爣妫�娴嬫姤璀�;
+ * 3-閬楃暀鐗╂娴嬫姤璀�;
+ * 4-鐗╀綋绉婚櫎妫�娴嬫姤璀�;
+ * 5-缁婄嚎妫�娴嬫姤璀�;
+ * 6-鍏ヤ镜妫�娴嬫姤璀�;
+ * 7-閫嗚妫�娴嬫姤璀�;
+ * 8-寰樺緤妫�娴嬫姤璀�;
+ * 9-娴侀噺缁熻鎶ヨ;
+ * 10-瀵嗗害妫�娴嬫姤璀�;
+ * 11-瑙嗛寮傚父妫�娴嬫姤璀�;
+ * 12-蹇�熺Щ鍔ㄦ姤璀︺��
+ * 鎶ヨ鏂瑰紡涓�6鏃�,鍙栧�间笅:
+ * 1-瀛樺偍璁惧纾佺洏鏁呴殰鎶ヨ;
+ * 2-瀛樺偍璁惧椋庢墖鏁呴殰鎶ヨ銆�
*/
private String alarmType;
+
+ private String createTime;
+
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
public String getDeviceId() {
return deviceId;
@@ -51,12 +96,12 @@
this.deviceId = deviceId;
}
- public String getAlarmPriorit() {
- return alarmPriorit;
+ public String getAlarmPriority() {
+ return alarmPriority;
}
- public void setAlarmPriorit(String alarmPriorit) {
- this.alarmPriorit = alarmPriorit;
+ public void setAlarmPriority(String alarmPriority) {
+ this.alarmPriority = alarmPriority;
}
public String getAlarmMethod() {
@@ -107,4 +152,19 @@
this.alarmType = alarmType;
}
+ public String getChannelId() {
+ return channelId;
+ }
+
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
}
--
Gitblit v1.8.0