From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java |   62 ++++++++++++++++++++++++++++---
 1 files changed, 56 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..530bce2 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,41 @@
 	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;
+
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
 
 	public String getDeviceId() {
 		return deviceId;
@@ -51,12 +94,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 +150,11 @@
 		this.alarmType = alarmType;
 	}
 
+	public String getChannelId() {
+		return channelId;
+	}
+
+	public void setChannelId(String channelId) {
+		this.channelId = channelId;
+	}
 }

--
Gitblit v1.8.0