From e8d53b7555595df35bd2fe03a5c5cf449c38859c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 14 十二月 2023 13:30:49 +0800
Subject: [PATCH] 增加PTZ引导优先; 井管理增加可见光和热红外ptz设置; 雷达报警引导只需要引导雷达塔上的光电,通道根据日夜切换自动选择; 引导优先按井配置的ptz进行引导,当未配置时按经纬度进行引导; 相机优先级队列排序取消报警次数num比对,仅由优先级和接收时间作为比较器条件;

---
 ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
index e2279ec..e52e26e 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java
@@ -68,13 +68,36 @@
 
     /** app浠诲姟璇︽儏鍥剧墖淇℃伅 */
     private List<ArdAppTaskDetailPic> ardAppTaskDetailPic;
-    /** 棣栨鏌ョ湅鏃堕棿 */
-    @Excel(name = "棣栨鏌ョ湅鏃堕棿")
+    /** 鏌ョ湅鏃堕棿 */
+    @Excel(name = "鏌ョ湅鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date viewTime;
-    /** 棣栨鏌ョ湅浣嶇疆 */
-    @Excel(name = "棣栨鏌ョ湅浣嶇疆")
+    /** 鏌ョ湅浣嶇疆 */
+    @Excel(name = "鏌ョ湅浣嶇疆")
     private String viewPosition;
+    /** 寮圭獥鏍囪 */
+    @Excel(name = "寮圭獥鏍囪")
+    private String viewFlag;
+    /** 鎵撳崱鏃堕棿*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鎵撳崱鏃堕棿")
+    private Date clockInTime;
+
+    public String getViewFlag() {
+        return viewFlag;
+    }
+
+    public void setViewFlag(String viewFlag) {
+        this.viewFlag = viewFlag;
+    }
+
+    public Date getClockInTime() {
+        return clockInTime;
+    }
+
+    public void setClockInTime(Date clockInTime) {
+        this.clockInTime = clockInTime;
+    }
 
     public Date getViewTime() {
         return viewTime;

--
Gitblit v1.9.3