From 18fa1385119350cebf6fb55a33a31fda263dba95 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 12 七月 2023 10:47:36 +0800
Subject: [PATCH] 增加通用光电报警查看

---
 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