设备告警

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

@@ -153,6 +153,7 @@ public class Device extends TenantEntity {
      */
     @Schema(title = "出厂日期")
     private Date productionDate;
+
     /**
      * 在线状态(0离线，1在线)
      */

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

@@ -88,7 +88,7 @@ public class DeviceAlarm extends TenantEntity {
     /**
      * 报警持续时间
      */
-    private Date durationTime;
+    private Long durationTime;
 
     /**
      * 0已处理，1未处理

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

@@ -99,15 +99,13 @@ public class DeviceAlarmBo extends BaseEntity {
     /**
      * 报警持续时间
      */
-    private Date durationTime;
+    private Long durationTime;
 
     /**
      * 报警查询时间
      */
-    private Date queryTime1;
-    private Date queryTime2;
-
-
+    private String queryTime1;
+    private String queryTime2;
 
     /**
      * 0已处理，1未处理

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

@@ -54,10 +54,12 @@ public class DeviceAlarmVo implements Serializable {
      */
     @ExcelProperty(value = "设备名称")
     private String deviceName;
+
     /**
      * 设备MAC
      */
     private String deviceMac;
+
     /**
      * 设备IMEI
      */
@@ -116,13 +118,13 @@ public class DeviceAlarmVo implements Serializable {
      * 报警持续时间
      */
     @ExcelProperty(value = "报警持续时间")
-    private Date durationTime;
+    private Long durationTime;
 
     /**
      * 0已处理，1未处理
      */
     @ExcelProperty(value = "0已处理，1未处理")
-    private Long treatmentState;
+    private Integer treatmentState;
 
 
 }