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 | 83 ++++++++++++++++++++++++++++++++---------
1 files changed, 64 insertions(+), 19 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 d3a1e74..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,6 +1,7 @@
package com.ruoyi.alarm.tubeAlarm.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.ToString;
@@ -11,80 +12,124 @@
/**
* 管线泄露报警对象 ard_alarm_tube
- *
+ *
* @author 刘苏义
* @date 2023-06-06
*/
@Data
@ToString
-public class ArdAlarmTube extends BaseEntity
-{
+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 Integer position;
- /** 经度 */
+ /**
+ * 经度
+ */
@Excel(name = "经度")
private Double longitude;
- /** 纬度 */
+ /**
+ * 纬度
+ */
@Excel(name = "纬度")
private Double latitude;
- /** 高层 */
+ /**
+ * 高层
+ */
@Excel(name = "高层")
private Double altitude;
- /** 类型GXALARM */
+ /**
+ * 类型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;
+ /**
+ * 报警总数
+ */
+ private Integer total;
+ /**
+ * 未读报警数量
+ */
+ private Integer count;
+ /**
+ * 引导录像url
+ */
+ @Excel(name = "引导录像url")
+ private String recordUrl;
}
--
Gitblit v1.9.3