From 47783946fe62819317f73eecc377d0c0316e0154 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 27 十月 2023 15:41:26 +0800
Subject: [PATCH] Merge pull request #1105 from lunasaw/dev-wvp-1011
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 1 +
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 15 +++++++++++++++
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index 84e9e7e..52bc902 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -215,6 +215,21 @@
}
}
+ public JSONObject isMediaOnline(MediaServerItem mediaServerItem, String app, String stream, String schema){
+ Map<String, Object> param = new HashMap<>();
+ if (app != null) {
+ param.put("app",app);
+ }
+ if (stream != null) {
+ param.put("stream",stream);
+ }
+ if (schema != null) {
+ param.put("schema",schema);
+ }
+ param.put("vhost","__defaultVhost__");
+ return sendPost(mediaServerItem, "isMediaOnline", param, null);
+ }
+
public JSONObject getMediaList(MediaServerItem mediaServerItem, String app, String stream, String schema, RequestCallback callback){
Map<String, Object> param = new HashMap<>();
if (app != null) {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 6e59402..4a781f3 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -9,6 +9,7 @@
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.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index 7fbe769..eac543a 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -35,15 +35,19 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 瑙嗛浠ｇ悊涓氬姟
@@ -560,4 +564,43 @@
return new ResourceBaseInfo(total, online);
}
+
+
+ @Scheduled(cron = "* 0/10 * * * ?")
+ public void asyncCheckStreamProxyStatus() {
+
+ List<MediaServerItem> all = mediaServerService.getAllOnline();
+
+ if (CollectionUtils.isEmpty(all)){
+ return;
+ }
+
+ Map<String, MediaServerItem> serverItemMap = all.stream().collect(Collectors.toMap(MediaServerItem::getId, Function.identity(), (m1, m2) -> m1));
+
+ List<StreamProxyItem> list = videoManagerStorager.getStreamProxyListForEnable(true);
+
+ if (CollectionUtils.isEmpty(list)){
+ return;
+ }
+
+ for (StreamProxyItem streamProxyItem : list) {
+
+ MediaServerItem mediaServerItem = serverItemMap.get(streamProxyItem.getMediaServerId());
+
+ // TODO 鏀寔鍏朵粬 schema
+ JSONObject mediaInfo = zlmresTfulUtils.isMediaOnline(mediaServerItem, streamProxyItem.getApp(), streamProxyItem.getStream(), "rtsp");
+
+ if (mediaInfo == null){
+ streamProxyItem.setStatus(false);
+ } else {
+ if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
+ streamProxyItem.setStatus(true);
+ } else {
+ streamProxyItem.setStatus(false);
+ }
+ }
+
+ updateStreamProxy(streamProxyItem);
+ }
+ }
}
--
Gitblit v1.8.0