From 19e10d0d6a54b2b0c1a8d4f52c84a18c089d0025 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 三月 2024 10:33:43 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java
index e578f03..4217e14 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java
@@ -6,8 +6,8 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import com.genersoft.iot.vmp.media.event.MediaServerChangeEvent;
+import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForServerStarted;
@@ -17,6 +17,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
@@ -35,8 +36,8 @@
private Map<String, Boolean> startGetMedia;
-// @Autowired
-// private ZLMRESTfulUtils zlmresTfulUtils;
+ @Autowired
+ private ApplicationEventPublisher applicationEventPublisher;
@Autowired
private ZlmHttpHookSubscribe hookSubscribe;
@@ -56,20 +57,24 @@
@Override
public void run(String... strings) throws Exception {
+ // TODO 鑾峰彇鎵�鏈夌殑绂荤嚎鑺傜偣淇℃伅
mediaServerService.clearMediaServerForOnline();
MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
if (defaultMediaServer == null) {
mediaServerService.addToDatabase(mediaConfig.getMediaSerItem());
- // 鍙戦�佸獟浣撹妭鐐瑰鍔犱簨浠�
}else {
MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
mediaServerService.updateToDatabase(mediaSerItem);
- // 鍙戦�佸獟浣撹妭鐐规洿鏂颁簨浠�
-
}
+ // 鍙戦�佸獟浣撹妭鐐瑰彉鍖栦簨浠�
mediaServerService.syncCatchFromDatabase();
+ // 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
+ List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
-
+ MediaServerChangeEvent event = new MediaServerChangeEvent(this);
+ event.setMediaServerItem();
+ applicationEventPublisher.publishEvent(event);
+ // TODO 姝ゅ浠ヤ笅浠ｇ爜寮冪敤
HookSubscribeForServerStarted hookSubscribeForServerStarted = HookSubscribeFactory.on_server_started();
--
Gitblit v1.8.0