查询设备告警列表

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java

@@ -24,7 +24,7 @@ public class DeviceAlarmBo extends BaseEntity {
     /**
      * ID
      */
-    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    @NotNull(message = "ID不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
@@ -34,14 +34,27 @@ public class DeviceAlarmBo extends BaseEntity {
 
     /**
      * 报警事项
+     * device_action
      */
-    private String deviceAction;
+    private Integer deviceAction;
 
     /**
      * 设备名称
      */
     private String deviceName;
 
+    /**
+     * 设备MAC
+     * device_mac
+     */
+    private String deviceMac;
+
+    /**
+     * 设备IMEI
+     * device_imei
+     */
+    private String deviceImei;
+
     /**
      * 数据来源
      */
@@ -54,12 +67,12 @@ public class DeviceAlarmBo extends BaseEntity {
 
     /**
      * 设备类型
+     * device_type
      */
     private Long deviceType;
 
     /**
      * 经度
-
      */
     private Long longitude;
 
@@ -88,10 +101,18 @@ public class DeviceAlarmBo extends BaseEntity {
      */
     private Date durationTime;
 
+    /**
+     * 报警查询时间
+     */
+    private Date queryTime1;
+    private Date queryTime2;
+
+
+
     /**
      * 0已处理，1未处理
      */
-    private Long treatmentState;
+    private Integer treatmentState;
 
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceAlarmVo.java

@@ -44,15 +44,24 @@ public class DeviceAlarmVo implements Serializable {
 
     /**
      * 报警事项
+     * 0-强制报警，1-撞击闯入，2-手动报警，3-电子围栏告警，4-强制告警
      */
     @ExcelProperty(value = "报警事项")
-    private String deviceAction;
+    private Integer deviceAction;
 
     /**
      * 设备名称
      */
     @ExcelProperty(value = "设备名称")
     private String deviceName;
+    /**
+     * 设备MAC
+     */
+    private String deviceMac;
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
 
     /**
      * 数据来源
@@ -71,6 +80,7 @@ public class DeviceAlarmVo implements Serializable {
      */
     @ExcelProperty(value = "设备类型")
     private Long deviceType;
+    private String deviceTypeName;
 
     /**
      * 经度