From b90dc789b429c31674c26bb3ff309b987afaa77a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 21 三月 2024 23:39:32 +0800
Subject: [PATCH] 优化媒体节点服务的代码结构
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 6f97558..b2bfaf1 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
@@ -8,7 +8,7 @@
import com.genersoft.iot.vmp.media.event.MediaServerChangeEvent;
import com.genersoft.iot.vmp.media.event.MediaServerDeleteEvent;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
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;
@@ -36,8 +36,8 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMMediaServerStatusManger.class);
- private final Map<Object, MediaServerItem> offlineZlmPrimaryMap = new ConcurrentHashMap<>();
- private final Map<Object, MediaServerItem> offlineZlmsecondaryMap = new ConcurrentHashMap<>();
+ private final Map<Object, MediaServer> offlineZlmPrimaryMap = new ConcurrentHashMap<>();
+ private final Map<Object, MediaServer> offlineZlmsecondaryMap = new ConcurrentHashMap<>();
private final Map<Object, Long> offlineZlmTimeMap = new ConcurrentHashMap<>();
@Autowired
@@ -67,7 +67,7 @@
|| event.getMediaServerItemList().isEmpty()) {
return;
}
- for (MediaServerItem mediaServerItem : event.getMediaServerItemList()) {
+ for (MediaServer mediaServerItem : event.getMediaServerItemList()) {
if (!type.equals(mediaServerItem.getType())) {
continue;
}
@@ -85,7 +85,7 @@
|| event.getMediaServerItem().isStatus()) {
return;
}
- MediaServerItem serverItem = mediaServerService.getOne(event.getMediaServerItem().getId());
+ MediaServer serverItem = mediaServerService.getOne(event.getMediaServerItem().getId());
if (serverItem == null) {
return;
}
@@ -99,7 +99,7 @@
if (event.getMediaServerItem() == null) {
return;
}
- MediaServerItem serverItem = mediaServerService.getOne(event.getMediaServerItem().getId());
+ MediaServer serverItem = mediaServerService.getOne(event.getMediaServerItem().getId());
if (serverItem == null) {
return;
}
@@ -126,7 +126,7 @@
return;
}
if (!offlineZlmPrimaryMap.isEmpty()) {
- for (MediaServerItem mediaServerItem : offlineZlmPrimaryMap.values()) {
+ for (MediaServer mediaServerItem : offlineZlmPrimaryMap.values()) {
if (offlineZlmTimeMap.get(mediaServerItem.getId()) < System.currentTimeMillis() - 30*60*1000) {
offlineZlmsecondaryMap.put(mediaServerItem.getId(), mediaServerItem);
offlineZlmPrimaryMap.remove(mediaServerItem.getId());
@@ -150,7 +150,7 @@
}
}
if (!offlineZlmsecondaryMap.isEmpty()) {
- for (MediaServerItem mediaServerItem : offlineZlmsecondaryMap.values()) {
+ for (MediaServer mediaServerItem : offlineZlmsecondaryMap.values()) {
if (offlineZlmTimeMap.get(mediaServerItem.getId()) < System.currentTimeMillis() - 30*60*1000) {
continue;
}
@@ -175,7 +175,7 @@
}
}
- private void online(MediaServerItem mediaServerItem, ZLMServerConfig config) {
+ private void online(MediaServer mediaServerItem, ZLMServerConfig config) {
offlineZlmPrimaryMap.remove(mediaServerItem.getId());
offlineZlmsecondaryMap.remove(mediaServerItem.getId());
offlineZlmTimeMap.remove(mediaServerItem.getId());
@@ -209,7 +209,7 @@
mediaServerService.update(mediaServerItem);
}, (int)(mediaServerItem.getHookAliveInterval() * 2 * 1000));
}
- private void initPort(MediaServerItem mediaServerItem, ZLMServerConfig zlmServerConfig) {
+ private void initPort(MediaServer mediaServerItem, ZLMServerConfig zlmServerConfig) {
if (mediaServerItem.getHttpSSlPort() == 0) {
mediaServerItem.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
}
@@ -231,7 +231,7 @@
mediaServerItem.setHookAliveInterval(10F);
}
- public void setZLMConfig(MediaServerItem mediaServerItem, boolean restart) {
+ public void setZLMConfig(MediaServer mediaServerItem, boolean restart) {
logger.info("[濯掍綋鏈嶅姟鑺傜偣] 姝ｅ湪璁剧疆 锛歿} -> {}:{}",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
String protocol = sslEnabled ? "https" : "http";
--
Gitblit v1.8.0