From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/media/event/mediaServer/MediaServerStatusEventListener.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java b/src/main/java/com/genersoft/iot/vmp/media/event/mediaServer/MediaServerStatusEventListener.java
similarity index 70%
rename from src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java
rename to src/main/java/com/genersoft/iot/vmp/media/event/mediaServer/MediaServerStatusEventListener.java
index bad8e56..2413f56 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/event/mediaServer/MediaServerStatusEventListener.java
@@ -1,6 +1,5 @@
-package com.genersoft.iot.vmp.media.zlm.event;
+package com.genersoft.iot.vmp.media.event.mediaServer;
-import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.genersoft.iot.vmp.service.IStreamPushService;
@@ -20,9 +19,9 @@
* @date: 2020骞�5鏈�6鏃� 涓嬪崍1:51:23
*/
@Component
-public class ZLMStatusEventListener {
+public class MediaServerStatusEventListener {
- private final static Logger logger = LoggerFactory.getLogger(ZLMStatusEventListener.class);
+ private final static Logger logger = LoggerFactory.getLogger(MediaServerStatusEventListener.class);
@Autowired
private IStreamPushService streamPushService;
@@ -31,15 +30,12 @@
private IStreamProxyService streamProxyService;
@Autowired
- private IMediaServerService mediaServerService;
-
- @Autowired
private IPlayService playService;
@Async("taskExecutor")
@EventListener
- public void onApplicationEvent(ZLMOnlineEvent event) {
- logger.info("[ZLM] 涓婄嚎 ID锛�" + event.getMediaServerId());
+ public void onApplicationEvent(MediaServerOnlineEvent event) {
+ logger.info("[濯掍綋鑺傜偣] 涓婄嚎 ID锛�" + event.getMediaServerId());
streamPushService.zlmServerOnline(event.getMediaServerId());
streamProxyService.zlmServerOnline(event.getMediaServerId());
playService.zlmServerOnline(event.getMediaServerId());
@@ -47,11 +43,10 @@
@Async("taskExecutor")
@EventListener
- public void onApplicationEvent(ZLMOfflineEvent event) {
+ public void onApplicationEvent(MediaServerOfflineEvent event) {
- logger.info("[ZLM] 绂荤嚎锛孖D锛�" + event.getMediaServerId());
+ logger.info("[濯掍綋鑺傜偣] 绂荤嚎锛孖D锛�" + event.getMediaServerId());
// 澶勭悊ZLM绂荤嚎
- mediaServerService.zlmServerOffline(event.getMediaServerId());
streamProxyService.zlmServerOffline(event.getMediaServerId());
streamPushService.zlmServerOffline(event.getMediaServerId());
playService.zlmServerOffline(event.getMediaServerId());
--
Gitblit v1.8.0