From bfc38cacac67f1bf2a5e857865d64cd49dc8175e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 21 六月 2023 15:53:44 +0800
Subject: [PATCH] 增加通用光电报警接收 增加报警类型配置
---
ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/domain/ArdAlarmStealelec.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/domain/ArdAlarmStealelec.java b/ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/domain/ArdAlarmStealelec.java
index f5e4b02..45a28a8 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/domain/ArdAlarmStealelec.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/stealAlarm/domain/ArdAlarmStealelec.java
@@ -1,5 +1,6 @@
package com.ruoyi.alarm.stealAlarm.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
@@ -45,11 +46,13 @@
* 鎶ヨ寮�濮嬫椂闂�
*/
@Excel(name = "鎶ヨ寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 鎶ヨ缁撴潫鏃堕棿
*/
@Excel(name = "鎶ヨ缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
@@ -79,11 +82,21 @@
@Excel(name = "绾害")
private double latitude;
/**
+ * 楂樺眰
+ */
+ @Excel(name = "楂樺眰")
+ private double altitude;
+ /**
* 鎶ヨ鎬绘暟
*/
- private String total;
+ private Integer total;
/**
* 鏈鎶ヨ鏁伴噺
*/
- private String count;
+ private Integer count;
+ /**
+ * 寮曞褰曞儚url
+ */
+ @Excel(name = "寮曞褰曞儚url")
+ private String recordUrl;
}
\ No newline at end of file
--
Gitblit v1.9.3