From aed45e0f0dfa02e633c126b2e6d437b4db8769d4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 28 十月 2022 16:40:12 +0800
Subject: [PATCH] 优化多网卡
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 da4bb76..f385918 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
@@ -21,7 +21,7 @@
import java.util.*;
@Component
-@Order(value=1)
+@Order(value=2)
public class ZLMRunner implements CommandLineRunner {
private final static Logger logger = LoggerFactory.getLogger(ZLMRunner.class);
@@ -80,6 +80,7 @@
// 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
+ Map<String, MediaServerItem> allMap = new HashMap<>();
mediaServerService.updateVmServer(all);
if (all.size() == 0) {
all.add(mediaConfig.getMediaSerItem());
@@ -90,6 +91,7 @@
}
startGetMedia.put(mediaServerItem.getId(), true);
connectZlmServer(mediaServerItem);
+ allMap.put(mediaServerItem.getId(), mediaServerItem);
}
String taskKey = "zlm-connect-timeout";
dynamicTask.startDelay(taskKey, ()->{
@@ -100,11 +102,17 @@
}
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 );
}
- @Async
+ @Async("taskExecutor")
public void connectZlmServer(MediaServerItem mediaServerItem){
String connectZlmServerTaskKey = "connect-zlm-" + mediaServerItem.getId();
ZLMServerConfig zlmServerConfigFirst = getMediaServerConfig(mediaServerItem);
--
Gitblit v1.8.0