From 8ae17764fd61c1013eb874018ad078480c025d09 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 三月 2024 11:07:08 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
index ef0c67a..0637b53 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java
@@ -10,7 +10,6 @@
import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.event.HookZlmServerKeepaliveEvent;
import com.genersoft.iot.vmp.media.zlm.event.HookZlmServerStartEvent;
-import org.checkerframework.checker.units.qual.A;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,14 +47,18 @@
@Async("taskExecutor")
@EventListener
public void onApplicationEvent(MediaServerChangeEvent event) {
- if (event.getMediaServerItem() == null
- || !type.equals(event.getMediaServerItem().getType())
- || event.getMediaServerItem().isStatus()) {
+ if (event.getMediaServerItemList() == null
+ || event.getMediaServerItemList().isEmpty()) {
return;
}
- logger.info("[ZLM-娣诲姞寰呬笂绾胯妭鐐筣 ID锛�" + event.getMediaServerItem().getId());
- offlineZlmPrimaryMap.put(event.getMediaServerItem().getId(), event.getMediaServerItem());
- offlineZlmTimeMap.put(event.getMediaServerItem().getId(), System.currentTimeMillis());
+ for (MediaServerItem mediaServerItem : event.getMediaServerItemList()) {
+ if (!type.equals(mediaServerItem.getType())) {
+ continue;
+ }
+ logger.info("[ZLM-娣诲姞寰呬笂绾胯妭鐐筣 ID锛�" + mediaServerItem.getId());
+ offlineZlmPrimaryMap.put(mediaServerItem.getId(), mediaServerItem);
+ offlineZlmTimeMap.put(mediaServerItem.getId(), System.currentTimeMillis());
+ }
}
@Async("taskExecutor")
@@ -147,11 +150,11 @@
}
private void online(MediaServerItem mediaServerItem) {
- logger.info("[ZLM-杩炴帴鎴愬姛] ID锛歿}, 鍦板潃锛� {}:{}", mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
offlineZlmPrimaryMap.remove(mediaServerItem.getId());
offlineZlmsecondaryMap.remove(mediaServerItem.getId());
offlineZlmTimeMap.remove(mediaServerItem.getId());
if (!mediaServerItem.isStatus()) {
+ logger.info("[ZLM-杩炴帴鎴愬姛] ID锛歿}, 鍦板潃锛� {}:{}", mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
mediaServerItem.setStatus(true);
mediaServerService.update(mediaServerItem);
}
--
Gitblit v1.8.0