From 269ad8cedbb07ca207a6f33af23085894dab4aa6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 23 四月 2023 14:36:13 +0800
Subject: [PATCH] 修身目录刷新，优化公网下远程IP端口的获取
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 3dfb167..afbbafa 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -1,8 +1,8 @@
package com.genersoft.iot.vmp.media.zlm;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
@@ -18,10 +18,14 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
@Component
-@Order(value=1)
+@Order(value=12)
public class ZLMRunner implements CommandLineRunner {
private final static Logger logger = LoggerFactory.getLogger(ZLMRunner.class);
@@ -62,7 +66,7 @@
// 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
hookSubscribe.addSubscribe(hookSubscribeForServerStarted,
(MediaServerItem mediaServerItem, JSONObject response)->{
- ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class);
+ ZLMServerConfig zlmServerConfig = response.to(ZLMServerConfig.class);
if (zlmServerConfig !=null ) {
if (startGetMedia != null) {
startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
@@ -73,34 +77,40 @@
}
});
-
-
// 鑾峰彇zlm淇℃伅
logger.info("[zlm] 绛夊緟榛樿zlm涓�...");
// 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
+ Map<String, MediaServerItem> allMap = new HashMap<>();
mediaServerService.updateVmServer(all);
if (all.size() == 0) {
all.add(mediaConfig.getMediaSerItem());
}
for (MediaServerItem mediaServerItem : all) {
if (startGetMedia == null) {
- startGetMedia = new HashMap<>();
+ startGetMedia = new ConcurrentHashMap<>();
}
startGetMedia.put(mediaServerItem.getId(), true);
connectZlmServer(mediaServerItem);
+ allMap.put(mediaServerItem.getId(), mediaServerItem);
}
String taskKey = "zlm-connect-timeout";
dynamicTask.startDelay(taskKey, ()->{
- if (startGetMedia != null) {
+ if (startGetMedia != null && startGetMedia.size() > 0) {
Set<String> allZlmId = startGetMedia.keySet();
for (String id : allZlmId) {
logger.error("[ {} ]]涓诲姩杩炴帴澶辫触锛屼笉鍐嶅皾璇曡繛鎺�", id);
}
startGetMedia = null;
}
- // TODO 娓呯悊鏁版嵁搴撲腑涓巖edis涓嶅尮閰嶇殑zlm
+ // 鑾峰彇redis涓墍鏈夌殑zlm
+ List<MediaServerItem> allInRedis = mediaServerService.getAll();
+ for (MediaServerItem mediaServerItem : allInRedis) {
+ if (!allMap.containsKey(mediaServerItem.getId())) {
+ mediaServerService.delete(mediaServerItem.getId());
+ }
+ }
}, 60 * 1000 );
}
--
Gitblit v1.8.0