From d340a37a00c8d5ea2605ca0f40a920efbeb9546f Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 17 十一月 2022 11:31:30 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network --- src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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 76561c7..a4b4cb7 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 @@ -18,7 +18,11 @@ 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=2) @@ -73,8 +77,6 @@ } }); - - // 鑾峰彇zlm淇℃伅 logger.info("[zlm] 绛夊緟榛樿zlm涓�..."); @@ -87,7 +89,7 @@ } for (MediaServerItem mediaServerItem : all) { if (startGetMedia == null) { - startGetMedia = new HashMap<>(); + startGetMedia = new ConcurrentHashMap<>(); } startGetMedia.put(mediaServerItem.getId(), true); connectZlmServer(mediaServerItem); @@ -95,7 +97,7 @@ } 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); -- Gitblit v1.8.0