From 03bdf8738729b6055b0c5594628b261a3ebaaced Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 16:50:20 +0800
Subject: [PATCH] 设备健康
---
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java
index 1d69f22..1efb263 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java
@@ -33,8 +33,8 @@
private String alarmType;
/** 鎶ヨ鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鎶ヨ鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎶ヨ鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date alarmTime;
/** 缁忓害 */
@@ -52,8 +52,8 @@
@Excel(name = "寮曞褰曞儚2")
private String recordUrl2;
/** 鏌ョ湅鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏌ョ湅鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏌ョ湅鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date viewTime;
/** 鐢ㄦ埛ID */
@@ -68,7 +68,6 @@
@Excel(name = "寮曞鏍囪")
private Integer guideFlag;
-
/**
* 鎶ヨ鎬绘暟
*/
@@ -77,6 +76,19 @@
* 鏈鎶ヨ鏁伴噺
*/
private Integer count;
+ /**
+ * 闆疯揪ID
+ */
+ private String RadarId;
+
+
+ public String getRadarId() {
+ return RadarId;
+ }
+
+ public void setRadarId(String radarId) {
+ RadarId = radarId;
+ }
public Integer getTotal() {
return total;
--
Gitblit v1.9.3