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/management3d/tiles3d/domain/ArdTiles3d.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
index 41c1eb8..9011c01 100644
--- a/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
+++ b/ard-work/src/main/java/com/ruoyi/management3d/tiles3d/domain/ArdTiles3d.java
@@ -65,15 +65,15 @@
 
     /** 鑷姩瓒呮竻鍖栨ā鍨� */
     @Excel(name = "鑷姩瓒呮竻鍖栨ā鍨�")
-    private Integer cullRequestsWhileMovingMultiplier;
+    private Double cullRequestsWhileMovingMultiplier;
 
     /** 妯″瀷鍔犺浇閫熷害 */
     @Excel(name = "妯″瀷鍔犺浇閫熷害")
-    private Integer dynamicScreenSpaceErrorDensity;
+    private Double dynamicScreenSpaceErrorDensity;
 
     /** 閮ㄩ棬id */
     @Excel(name = "閮ㄩ棬id")
-    private Integer deptId;
+    private Long deptId;
 
     /** 鐢ㄦ埛id */
     @Excel(name = "鐢ㄦ埛id")
@@ -187,30 +187,30 @@
     {
         return maximumMemoryUsage;
     }
-    public void setCullRequestsWhileMovingMultiplier(Integer cullRequestsWhileMovingMultiplier) 
+    public void setCullRequestsWhileMovingMultiplier(Double cullRequestsWhileMovingMultiplier)
     {
         this.cullRequestsWhileMovingMultiplier = cullRequestsWhileMovingMultiplier;
     }
 
-    public Integer getCullRequestsWhileMovingMultiplier() 
+    public Double getCullRequestsWhileMovingMultiplier()
     {
         return cullRequestsWhileMovingMultiplier;
     }
-    public void setDynamicScreenSpaceErrorDensity(Integer dynamicScreenSpaceErrorDensity) 
+    public void setDynamicScreenSpaceErrorDensity(Double dynamicScreenSpaceErrorDensity)
     {
         this.dynamicScreenSpaceErrorDensity = dynamicScreenSpaceErrorDensity;
     }
 
-    public Integer getDynamicScreenSpaceErrorDensity() 
+    public Double getDynamicScreenSpaceErrorDensity()
     {
         return dynamicScreenSpaceErrorDensity;
     }
-    public void setDeptId(Integer deptId) 
+    public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
     }
 
-    public Integer getDeptId() 
+    public Long getDeptId()
     {
         return deptId;
     }

--
Gitblit v1.9.3