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/media/service/impl/MediaServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
index b7242fd..694b3a5 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
@@ -35,7 +35,7 @@
@Slf4j(topic = "vtdu")
@Order(2)
public class MediaServiceImpl implements IMediaService, ApplicationRunner {
- private static List<String> mediaNameList = new ArrayList<>();
+ public static List<String> mediaNameList = new ArrayList<>();
@Resource
MediaClient mediaClient;
@@ -90,6 +90,7 @@
if (!checkNameExist(name)) {
mediaClient.addPath(name, conf);
+ mediaNameList.add(name);
}
map.put("rtspUrl", rtspUrl);
@@ -184,6 +185,7 @@
try {
if (checkNameExist(name)) {
mediaClient.removePath(name);
+ mediaNameList.remove(name);
}
} catch (ForestRuntimeException ex) {
log.error("绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
@@ -473,20 +475,19 @@
*/
@Override
public List<String> getNameList() {
- List<String> nameList = new ArrayList<>();
try {
String paths = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
for (Items item : items) {
- nameList.add(item.getName());
+ mediaNameList.add(item.getName());
}
} catch (ForestNetworkException ex) {
log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
} catch (ForestRuntimeException ex) {
log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
}
- return nameList;
+ return mediaNameList;
}
/**
--
Gitblit v1.9.3