From 70d17d90cef5985dbc572e5be79ed7041a0476ff Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Wed, 19 Jul 2023 11:46:02 +0800
Subject: [PATCH] app接口里用户list增加关联角色
---
ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/domain/ArdAlarmTube.java | 231 +++++++++++++++++++--------------------------------------
1 files changed, 78 insertions(+), 153 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/domain/ArdAlarmTube.java b/ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/domain/ArdAlarmTube.java
index 0912d84..ef5eb9c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/domain/ArdAlarmTube.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/domain/ArdAlarmTube.java
@@ -1,7 +1,10 @@
package com.ruoyi.alarm.tubeAlarm.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.ToString;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -9,202 +12,124 @@
/**
* 管线泄露报警对象 ard_alarm_tube
- *
+ *
* @author 刘苏义
* @date 2023-06-06
*/
-public class ArdAlarmTube extends BaseEntity
-{
+@Data
+@ToString
+public class ArdAlarmTube extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 主键 */
+ /**
+ * 主键
+ */
private String id;
- /** 报警主机 */
+ /**
+ * 报警主机
+ */
@Excel(name = "报警主机")
private String host;
- /** 管线id */
+ /**
+ * 管线id
+ */
@Excel(name = "管线id")
private String tubeId;
- /** 管线名称 */
+ /**
+ * 管线名称
+ */
@Excel(name = "管线名称")
private String tubeName;
- /** 管线类型-油管-水管 */
+ /**
+ * 管线类型-油管-水管
+ */
@Excel(name = "管线类型-油管-水管")
private String tubeType;
- /** 管径 */
+ /**
+ * 管径
+ */
@Excel(name = "管径")
private String pipeDiameter;
- /** 颜色 */
+ /**
+ * 颜色
+ */
@Excel(name = "颜色")
private String color;
- /** 位置 */
+ /**
+ * 位置
+ */
@Excel(name = "位置")
- private String position;
+ private Integer position;
- /** 类型GXALARM */
+ /**
+ * 经度
+ */
+ @Excel(name = "经度")
+ private Double longitude;
+
+ /**
+ * 纬度
+ */
+ @Excel(name = "纬度")
+ private Double latitude;
+
+ /**
+ * 高层
+ */
+ @Excel(name = "高层")
+ private Double altitude;
+
+ /**
+ * 类型GXALARM
+ */
@Excel(name = "类型GXALARM")
private String type;
- /** 类型中文 */
+ /**
+ * 类型中文
+ */
@Excel(name = "类型中文")
private String alarmType;
- /** 报警时间 */
+ /**
+ * 报警时间
+ */
@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 String watcher;
- /** 查看时间 */
+ /**
+ * 查看时间
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "查看时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date viewTime;
- public void setId(String id)
- {
- this.id = id;
- }
+ /**
+ * 报警总数
+ */
+ private Integer total;
+ /**
+ * 未读报警数量
+ */
+ private Integer count;
- public String getId()
- {
- return id;
- }
- public void setHost(String host)
- {
- this.host = host;
- }
-
- public String getHost()
- {
- return host;
- }
- public void setTubeId(String tubeId)
- {
- this.tubeId = tubeId;
- }
-
- public String getTubeId()
- {
- return tubeId;
- }
- public void setTubeName(String tubeName)
- {
- this.tubeName = tubeName;
- }
-
- public String getTubeName()
- {
- return tubeName;
- }
- public void setTubeType(String tubeType)
- {
- this.tubeType = tubeType;
- }
-
- public String getTubeType()
- {
- return tubeType;
- }
- public void setPipeDiameter(String pipeDiameter)
- {
- this.pipeDiameter = pipeDiameter;
- }
-
- public String getPipeDiameter()
- {
- return pipeDiameter;
- }
- public void setColor(String color)
- {
- this.color = color;
- }
-
- public String getColor()
- {
- return color;
- }
- public void setPosition(String position)
- {
- this.position = position;
- }
-
- public String getPosition()
- {
- return position;
- }
- public void setType(String type)
- {
- this.type = type;
- }
-
- public String getType()
- {
- return type;
- }
- 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 setWatcher(String watcher)
- {
- this.watcher = watcher;
- }
-
- public String getWatcher()
- {
- return watcher;
- }
- public void setViewTime(Date viewTime)
- {
- this.viewTime = viewTime;
- }
-
- public Date getViewTime()
- {
- return viewTime;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("host", getHost())
- .append("tubeId", getTubeId())
- .append("tubeName", getTubeName())
- .append("tubeType", getTubeType())
- .append("pipeDiameter", getPipeDiameter())
- .append("color", getColor())
- .append("position", getPosition())
- .append("type", getType())
- .append("alarmType", getAlarmType())
- .append("alarmTime", getAlarmTime())
- .append("watcher", getWatcher())
- .append("createTime", getCreateTime())
- .append("viewTime", getViewTime())
- .toString();
- }
+ /**
+ * 引导录像url
+ */
+ @Excel(name = "引导录像url")
+ private String recordUrl;
}
--
Gitblit v1.9.3