From b5074aef0d43572d60264d1cc5c070956090285f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 26 Jan 2021 15:54:14 +0800
Subject: [PATCH] 初版

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java |  170 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
index 4230d99..0cb876b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java
@@ -42,108 +42,124 @@
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 	/**
-	* 接警类型
-	*/
-		@ApiModelProperty(value = "接警类型")
-		@TableField("alarmType")
+	 * 接警类型
+	 */
+	@ApiModelProperty(value = "接警类型")
+	@TableField("alarmType")
 	private String alarmType;
 	/**
-	* 接警人姓名
-	*/
-		@ApiModelProperty(value = "接警人姓名")
-		@TableField("alarmPeople")
+	 * 接警人姓名
+	 */
+	@ApiModelProperty(value = "接警人姓名")
+	@TableField("alarmPeople")
 	private String alarmPeople;
 	/**
-	* 接警时间
-	*/
-		@ApiModelProperty(value = "接警时间")
-		@TableField("alarmTime")
+	 * 报警时间
+	 */
+	@ApiModelProperty(value = "报警时间")
+	@TableField("alarmTime")
 	private String alarmTime;
 	/**
-	* 报警人
-	*/
-		@ApiModelProperty(value = "报警人")
-		@TableField("galarmPeople")
+	 * 接警时间
+	 */
+	@ApiModelProperty(value = "接警时间")
+	@TableField("jjTime")
+	private String jjTime;
+	/**
+	 * 报警人
+	 */
+	@ApiModelProperty(value = "报警人")
+	@TableField("galarmPeople")
 	private String galarmPeople;
 	/**
-	* 性别(0:男1：女)
-	*/
-		@ApiModelProperty(value = "性别(0:男1：女)")
-		private String sex;
+	 * 性别(0:男1：女)
+	 */
+	@ApiModelProperty(value = "性别(0:男1：女)")
+	private String sex;
 	/**
-	* 联系电话
-	*/
-		@ApiModelProperty(value = "联系电话")
-		@TableField("phoneNumber")
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	@TableField("phoneNumber")
 	private String phoneNumber;
 	/**
-	* 事发地址
-	*/
-		@ApiModelProperty(value = "事发地址")
-		private String place;
+	 * 事发地址
+	 */
+	@ApiModelProperty(value = "事发地址")
+	private String place;
 	/**
-	* 报警内容
-	*/
-		@ApiModelProperty(value = "报警内容")
-		private String content;
+	 * 报警内容
+	 */
+	@ApiModelProperty(value = "报警内容")
+	private String content;
 	/**
-	* 警情类别
-	*/
-		@ApiModelProperty(value = "警情类别")
-		@TableField("waringType")
+	 * 警情类别
+	 */
+	@ApiModelProperty(value = "警情类别")
+	@TableField("waringType")
 	private String waringType;
 	/**
-	* 设备编号
-	*/
-		@ApiModelProperty(value = "设备编号")
-		@TableField("deviceNumber")
+	 * 设备编号
+	 */
+	@ApiModelProperty(value = "设备编号")
+	@TableField("deviceNumber")
 	private String deviceNumber;
 	/**
-	* AOI区域编码
-	*/
-		@ApiModelProperty(value = "AOI区域编码")
-		private String region;
+	 * AOI区域编码
+	 */
+	@ApiModelProperty(value = "AOI区域编码")
+	private String region;
 	/**
-	* 行政区编码
-	*/
-		@ApiModelProperty(value = "行政区编码")
-		private String addvcd;
+	 * 行政区编码
+	 */
+	@ApiModelProperty(value = "行政区编码")
+	private String district;
 	/**
-	* 行政区编码
-	*/
-		@ApiModelProperty(value = "接警人ID")
-		@TableField("alarmId")
+	 * 省份编码
+	 */
+	@ApiModelProperty(value = "省份")
+	private String province;
+	/**
+	 * 行政区编码
+	 */
+	@ApiModelProperty(value = "地市")
+	private String city;
+	/**
+	 * 地市编码
+	 */
+	@ApiModelProperty(value = "接警人ID")
+	@TableField("alarmId")
 	private String alarmId;
 	/**
-	* 警情级别
-	*/
-		@ApiModelProperty(value = "警情级别")
-		private String level;
+	 * 警情级别
+	 */
+	@ApiModelProperty(value = "警情级别")
+	private String level;
 	/**
-	* 空间坐标
-	*/
-		@ApiModelProperty(value = "空间坐标")
-		private String coordinate;
+	 * 空间坐标
+	 */
+//	@ApiModelProperty(value = "空间坐标")
+//	private String coordinate;
 	/**
-	* 经度
-	*/
-		@ApiModelProperty(value = "经度")
-		private String jd;
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private String jd;
 	/**
-	* 纬度
-	*/
-		@ApiModelProperty(value = "纬度")
-		private String wd;
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	private String wd;
 	/**
-	* 是否生成警单(0:否 1：是)
-	*/
-		@ApiModelProperty(value = "是否生成警单(0:否 1：是)")
-		private String jtype;
-		private String rname;
-		@ApiModelProperty(value = "时间")
-		@TableField("czTime")
-		private String czTime;
-		private String bz;
+	 * 是否生成警单(0:否 1：是)
+	 */
+	@ApiModelProperty(value = "是否生成警单(0:否 1：是)")
+	private String jtype;
+	private String rname;
+	@ApiModelProperty(value = "时间")
+	@TableField("czTime")
+	private String czTime;
+	private String bz;
 
 
 }

--
Gitblit v1.9.3