From c2c38da7834d3571d79a36821eba5243335815d3 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 19 十月 2023 14:06:06 +0800
Subject: [PATCH] RTU
---
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java | 170 ++++----------------------------------------------------
1 files changed, 14 insertions(+), 156 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java
index 3f44d8c..661231e 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java
@@ -2,6 +2,7 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -13,6 +14,7 @@
* @author ard
* @date 2023-09-02
*/
+@Data
public class ArdAlarmRadarFire extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -33,8 +35,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 +54,8 @@
@Excel(name = "寮曞褰曞儚1")
private String recordUrl1;
/** 鏌ョ湅鏃堕棿 */
- @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 */
@@ -64,9 +66,10 @@
@Excel(name = "閮ㄩ棬ID")
private Long deptId;
- /** 寮曞鏍囪 */
- @Excel(name = "寮曞鏍囪")
- private Integer guideFlag;
+ /** 寮曞鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "寮曞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date guideTime;
/**
* 鎶ヨ鎬绘暟
@@ -77,156 +80,11 @@
*/
private Integer count;
- public Integer getTotal() {
- return total;
- }
+ /**
+ * 闆疯揪ID
+ */
+ private String radarId;
- public void setTotal(Integer total) {
- this.total = total;
- }
- public Integer getCount() {
- return count;
- }
- public void setCount(Integer count) {
- this.count = count;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public String getId()
- {
- return id;
- }
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
- public void setTargetId(String targetId)
- {
- this.targetId = targetId;
- }
-
- public String getTargetId()
- {
- return targetId;
- }
- public void setAlarmType(String alarmType)
- {
- this.alarmType = alarmType;
- }
-
- public String getAlarmType()
- {
- return alarmType;
- }
- public void setAlarmTime(Date alarmTime)
- {
- this.alarmTime = alarmTime;
- }
-
- public Date getAlarmTime()
- {
- return alarmTime;
- }
- public void setLongitude(Double longitude)
- {
- this.longitude = longitude;
- }
-
- public Double getLongitude()
- {
- return longitude;
- }
- public void setLatitude(Double latitude)
- {
- this.latitude = latitude;
- }
-
- public Double getLatitude()
- {
- return latitude;
- }
- public void setRecordUrl1(String recordUrl1)
- {
- this.recordUrl1 = recordUrl1;
- }
-
- public String getRecordUrl1()
- {
- return recordUrl1;
- }
- public void setViewTime(Date viewTime)
- {
- this.viewTime = viewTime;
- }
-
- public Date getViewTime()
- {
- return viewTime;
- }
- public void setUserId(String userId)
- {
- this.userId = userId;
- }
-
- public String getUserId()
- {
- return userId;
- }
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- public Long getDeptId()
- {
- return deptId;
- }
- public void setGuideFlag(Integer guideFlag)
- {
- this.guideFlag = guideFlag;
- }
-
- public Integer getGuideFlag()
- {
- return guideFlag;
- }
-
- public String getRecordUrl2() {
- return recordUrl2;
- }
-
- public void setRecordUrl2(String recordUrl2) {
- this.recordUrl2 = recordUrl2;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("name", getName())
- .append("targetId", getTargetId())
- .append("alarmType", getAlarmType())
- .append("alarmTime", getAlarmTime())
- .append("longitude", getLongitude())
- .append("latitude", getLatitude())
- .append("recordUrl1", getRecordUrl1())
- .append("viewTime", getViewTime())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("userId", getUserId())
- .append("deptId", getDeptId())
- .append("guideFlag", getGuideFlag())
- .toString();
- }
}
--
Gitblit v1.9.3