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/MediaServerConfig.java | 145 +----------------------------------
src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java | 21 ++++-
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManger.java | 19 ++--
src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java | 24 ------
4 files changed, 34 insertions(+), 175 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 4217e14..3be8e4c 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/MediaServerConfig.java
@@ -1,49 +1,30 @@
package com.genersoft.iot.vmp.media;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-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.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;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.slf4j.Logger;
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;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
+/**
+ * 鍚姩鏄粠閰嶇疆鏂囦欢鍔犺浇鑺傜偣淇℃伅锛屼互鍙婂彂閫佷釜鑺傜偣鐘舵�佺鐞嗗幓鎺у埗鑺傜偣鐘舵��
+ */
@Component
@Order(value=12)
public class MediaServerConfig implements CommandLineRunner {
private final static Logger logger = LoggerFactory.getLogger(MediaServerConfig.class);
- private Map<String, Boolean> startGetMedia;
-
@Autowired
private ApplicationEventPublisher applicationEventPublisher;
-
- @Autowired
- private ZlmHttpHookSubscribe hookSubscribe;
-
- @Autowired
- private EventPublisher publisher;
@Autowired
private IMediaServerService mediaServerService;
@@ -51,13 +32,10 @@
@Autowired
private MediaConfig mediaConfig;
- @Autowired
- private DynamicTask dynamicTask;
-
@Override
public void run(String... strings) throws Exception {
- // TODO 鑾峰彇鎵�鏈夌殑绂荤嚎鑺傜偣淇℃伅
+ // 娓呯悊鎵�鏈夊湪绾胯妭鐐圭殑缂撳瓨淇℃伅
mediaServerService.clearMediaServerForOnline();
MediaServerItem defaultMediaServer = mediaServerService.getDefaultMediaServer();
if (defaultMediaServer == null) {
@@ -70,118 +48,9 @@
mediaServerService.syncCatchFromDatabase();
// 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
-
+ logger.info("[濯掍綋鑺傜偣] 鍔犺浇鑺傜偣鍒楄〃锛� 鍏眥}涓妭鐐�", all.size());
MediaServerChangeEvent event = new MediaServerChangeEvent(this);
- event.setMediaServerItem();
+ event.setMediaServerItemList(all);
applicationEventPublisher.publishEvent(event);
- // TODO 姝ゅ浠ヤ笅浠ｇ爜寮冪敤
-
-
- HookSubscribeForServerStarted hookSubscribeForServerStarted = HookSubscribeFactory.on_server_started();
- // 璁㈤槄 濯掍綋鑺傜偣鍚姩浜嬩欢, 鏂扮殑濯掍綋鑺傜偣涔熶細浠庤繖閲岃繘鍏ョ郴缁�
- hookSubscribe.addSubscribe(hookSubscribeForServerStarted,
- (mediaServerItem, hookParam)->{
- ZLMServerConfig zlmServerConfig = (ZLMServerConfig)hookParam;
- if (zlmServerConfig !=null ) {
- if (startGetMedia != null) {
- startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
- if (startGetMedia.isEmpty()) {
- hookSubscribe.removeSubscribe(HookSubscribeFactory.on_server_started());
- }
- }
- }
- });
-
- // 鑾峰彇zlm淇℃伅
- logger.info("[zlm] 绛夊緟榛樿zlm涓�...");
-
- // 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
- List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
- Map<String, MediaServerItem> allMap = new HashMap<>();
- mediaServerService.updateVmServer(all);
- if (all.size() == 0) {
- all.add(mediaConfig.getMediaSerItem());
- }
- for (MediaServerItem mediaServerItem : all) {
- if (startGetMedia == null) {
- startGetMedia = new ConcurrentHashMap<>();
- }
- startGetMedia.put(mediaServerItem.getId(), true);
- connectZlmServer(mediaServerItem);
- allMap.put(mediaServerItem.getId(), mediaServerItem);
- }
- String taskKey = "zlm-connect-timeout";
- dynamicTask.startDelay(taskKey, ()->{
- if (startGetMedia != null && startGetMedia.size() > 0) {
- Set<String> allZlmId = startGetMedia.keySet();
- for (String id : allZlmId) {
- logger.error("[ {} ]]涓诲姩杩炴帴澶辫触锛屼笉鍐嶅皾璇曡繛鎺�", id);
- }
- startGetMedia = null;
- }
- // 鑾峰彇redis涓墍鏈夌殑zlm
- List<MediaServerItem> allInRedis = mediaServerService.getAll();
- for (MediaServerItem mediaServerItem : allInRedis) {
- if (!allMap.containsKey(mediaServerItem.getId())) {
- mediaServerService.delete(mediaServerItem.getId());
- }
- }
- }, 60 * 1000 );
- }
-
- @Async("taskExecutor")
- public void connectZlmServer(MediaServerItem mediaServerItem){
- String connectZlmServerTaskKey = "connect-zlm-" + mediaServerItem.getId();
- ZLMServerConfig zlmServerConfigFirst = getMediaServerConfig(mediaServerItem);
- if (zlmServerConfigFirst != null) {
- zlmServerConfigFirst.setIp(mediaServerItem.getIp());
- zlmServerConfigFirst.setHttpPort(mediaServerItem.getHttpPort());
- startGetMedia.remove(mediaServerItem.getId());
- if (startGetMedia.size() == 0) {
- hookSubscribe.removeSubscribe(HookSubscribeFactory.on_server_started());
- }
- mediaServerService.zlmServerOnline(zlmServerConfigFirst);
- }else {
- logger.info("[ {} ]-[ {}:{} ]涓诲姩杩炴帴澶辫触, 娓呯悊鐩稿叧璧勬簮锛� 寮�濮嬪皾璇曢噸璇曡繛鎺�",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- publisher.zlmOfflineEventPublish(mediaServerItem.getId());
- }
-
- dynamicTask.startCron(connectZlmServerTaskKey, ()->{
- ZLMServerConfig zlmServerConfig = getMediaServerConfig(mediaServerItem);
- if (zlmServerConfig != null) {
- dynamicTask.stop(connectZlmServerTaskKey);
- zlmServerConfig.setIp(mediaServerItem.getIp());
- zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort());
- startGetMedia.remove(mediaServerItem.getId());
- if (startGetMedia.size() == 0) {
- hookSubscribe.removeSubscribe(HookSubscribeFactory.on_server_started());
- }
- mediaServerService.zlmServerOnline(zlmServerConfig);
- }
- }, 2000);
- }
-
- public ZLMServerConfig getMediaServerConfig(MediaServerItem mediaServerItem) {
- if (startGetMedia == null) { return null;}
- if (!mediaServerItem.isDefaultServer() && mediaServerService.getOne(mediaServerItem.getId()) == null) {
- return null;
- }
- if ( startGetMedia.get(mediaServerItem.getId()) == null || !startGetMedia.get(mediaServerItem.getId())) {
- return null;
- }
- JSONObject responseJson = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
- ZLMServerConfig zlmServerConfig = null;
- if (responseJson != null) {
- JSONArray data = responseJson.getJSONArray("data");
- if (data != null && data.size() > 0) {
- zlmServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
- }
- } else {
- logger.error("[ {} ]-[ {}:{} ]涓诲姩杩炴帴澶辫触, 2s鍚庨噸璇�",
- mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
- }
- return zlmServerConfig;
-
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java b/src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java
index 6cf8bbf..e1d2a94 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/event/MediaServerChangeEvent.java
@@ -3,19 +3,30 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.context.ApplicationEvent;
+import java.util.Arrays;
+import java.util.List;
+
public class MediaServerChangeEvent extends ApplicationEvent {
public MediaServerChangeEvent(Object source) {
super(source);
}
- private MediaServerItem mediaServerItem;
+ private List<MediaServerItem> mediaServerItemList;
- public MediaServerItem getMediaServerItem() {
- return mediaServerItem;
+ public List<MediaServerItem> getMediaServerItemList() {
+ return mediaServerItemList;
}
- public void setMediaServerItem(MediaServerItem mediaServerItem) {
- this.mediaServerItem = mediaServerItem;
+ public void setMediaServerItemList(List<MediaServerItem> mediaServerItemList) {
+ this.mediaServerItemList = mediaServerItemList;
+ }
+
+ public void setMediaServerItemList(MediaServerItem... mediaServerItemArray) {
+ this.mediaServerItemList.addAll(Arrays.asList(mediaServerItemArray));
+ }
+
+ public void setMediaServerItem(List<MediaServerItem> mediaServerItemList) {
+ this.mediaServerItemList = mediaServerItemList;
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
index b483e6b..be090ec 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
@@ -462,30 +462,6 @@
zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
}
- class KeepAliveTimeoutRunnable implements Runnable{
-
- private MediaServerItem serverItem;
-
- public KeepAliveTimeoutRunnable(MediaServerItem serverItem) {
- this.serverItem = serverItem;
- }
-
- @Override
- public void run() {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣蹇冭烦鍒版湡]锛�" + serverItem.getId());
- // 鍙戣捣http璇锋眰楠岃瘉zlm鏄惁纭疄鏃犳硶杩炴帴锛屽鏋滅‘瀹炴棤娉曡繛鎺ュ垯鍙戦�佺绾夸簨浠讹紝鍚﹀垯涓嶄綔澶勭悊
- JSONObject mediaServerConfig = zlmresTfulUtils.getMediaServerConfig(serverItem);
- if (mediaServerConfig != null && mediaServerConfig.getInteger("code") == 0) {
- logger.info("[濯掍綋鏈嶅姟鑺傜偣蹇冭烦鍒版湡]锛歿}楠岃瘉鍚庡獟浣撴湇鍔¤妭鐐逛粛鍦ㄧ嚎锛屾仮澶嶅績璺充俊鎭�,璇锋鏌ュ獟浣撴湇鍔¤妭鐐规槸鍚﹀彲浠ユ甯稿悜wvp鍙戦�佸績璺�", serverItem.getId());
- // 娣诲姞濯掍綋鏈嶅姟鑺傜偣淇℃伅
- updateMediaServerKeepalive(serverItem.getId(), null);
- }else {
- publisher.zlmOfflineEventPublish(serverItem.getId());
- }
- }
- }
-
-
@Override
public void zlmServerOffline(String mediaServerId) {
delete(mediaServerId);
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