From fbc6fc4e835c0249f8d5aaaec71e99d1817f08dd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 25 十二月 2023 09:18:08 +0800
Subject: [PATCH] 融云

---
 ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java |   67 +++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 20 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 453adc6..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,9 @@
 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;
@@ -10,63 +12,83 @@
 
 /**
  * 闆疯揪鎶芥补鏈哄仠鏈烘姤璀﹀璞� ard_alarm_radar_pump
- * 
+ *
  * @author ard
  * @date 2023-09-02
  */
 @Data
-public class ArdAlarmRadarPump extends BaseEntity
-{
+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 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 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;
 
-    /** 寮曞鏃堕棿 */
+    /**
+     * 寮曞鏃堕棿
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "寮曞鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date guideTime;
@@ -84,4 +106,9 @@
      * 闆疯揪ID
      */
     private String radarId;
+    /**
+     * 寮曞PTZ鍊�
+     */
+    private GuidePTZ guidePTZ;
+
 }

--
Gitblit v1.9.3