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比对，仅由优先级和接收时间作为比较器条件；
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java
index f8abd28..173bc1e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelectWell.java
@@ -7,6 +7,7 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -25,18 +26,7 @@
private String label;
/** 瀛愯妭鐐� */
- @JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List<TreeSelectWell> children;
-
- public List<HealthVo> getWell() {
- return well;
- }
-
- public void setWell(List<HealthVo> well) {
- this.well = well;
- }
-
- private List<HealthVo> well = new ArrayList<>();
+ private List<TreeSelectWell> children = new ArrayList<>();
public TreeSelectWell()
{
@@ -47,7 +37,6 @@
{
this.id = dept.getDeptId();
this.label = dept.getDeptName();
- this.well = dept.getWell();
this.children = dept.getChildren().stream().map(TreeSelectWell::new).collect(Collectors.toList());
}
--
Gitblit v1.9.3