From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Sat, 13 Jan 2024 10:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java | 236 ++++++++++++++--------------------------------------------
1 files changed, 59 insertions(+), 177 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java
index be0ceda..07a03c0 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java
@@ -1,7 +1,10 @@
package com.ruoyi.alarm.radar.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.alarm.global.domain.GuidePTZ;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -9,64 +12,86 @@
/**
* 雷达抽油机停机报警对象 ard_alarm_radar_pump
- *
+ *
* @author ard
* @date 2023-09-02
*/
-public class ArdAlarmRadarPump extends BaseEntity
-{
+@Data
+public class ArdAlarmRadarPump extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 记录ID */
+ /**
+ * 记录ID
+ */
private String id;
- /** 兴趣点名称 */
+ /**
+ * 兴趣点名称
+ */
@Excel(name = "兴趣点名称")
private String name;
- /** 目标ID */
+ /**
+ * 目标ID
+ */
@Excel(name = "目标ID")
private String targetId;
- /** 报警类型 */
+ /**
+ * 报警类型
+ */
@Excel(name = "报警类型")
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;
- /** 经度 */
+ /**
+ * 经度
+ */
@Excel(name = "经度")
private Double longitude;
- /** 纬度 */
+ /**
+ * 纬度
+ */
@Excel(name = "纬度")
private Double latitude;
- /** 引导录像1 */
- @Excel(name = "引导录像1")
- private String recordUrl1;
- /** 引导录像2 */
- @Excel(name = "引导录像2")
- private String recordUrl2;
+ /**
+ * 引导录像
+ */
+ @Excel(name = "引导录像")
+ private String recordUrl;
- /** 查看时间 */
- @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 */
+ /**
+ * 用户ID
+ */
@Excel(name = "用户ID")
private String userId;
- /** 部门ID */
+ /**
+ * 部门ID
+ */
@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 +102,13 @@
* 未读报警数量
*/
private Integer count;
+ /**
+ * 雷达ID
+ */
+ private String radarId;
+ /**
+ * 引导PTZ值
+ */
+ private GuidePTZ guidePTZ;
- public Integer getTotal() {
- return total;
- }
-
- 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