From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 298 +++++++++++++++++++++++++++++------------------------------
1 files changed, 147 insertions(+), 151 deletions(-)
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 3869f0b..d3f69d6 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
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.service.impl;
-import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.genersoft.iot.vmp.common.GeneralCallback;
@@ -9,17 +8,17 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
-import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
-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.HookSubscribeForStreamChange;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.event.hook.Hook;
+import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
+import com.genersoft.iot.vmp.media.event.hook.HookType;
+import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
+import com.genersoft.iot.vmp.media.event.media.MediaDepartureEvent;
+import com.genersoft.iot.vmp.media.event.media.MediaNotFoundEvent;
+import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import com.genersoft.iot.vmp.service.IGbStreamService;
-import com.genersoft.iot.vmp.service.IMediaServerService;
-import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -29,11 +28,14 @@
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
@@ -61,15 +63,6 @@
private IVideoManagerStorage videoManagerStorager;
@Autowired
- private IMediaService mediaService;
-
- @Autowired
- private ZLMRESTfulUtils zlmresTfulUtils;
-
- @Autowired
- private ZLMServerFactory zlmServerFactory;
-
- @Autowired
private StreamProxyMapper streamProxyMapper;
@Autowired
@@ -94,7 +87,7 @@
private IMediaServerService mediaServerService;
@Autowired
- private ZlmHttpHookSubscribe hookSubscribe;
+ private HookSubscribe hookSubscribe;
@Autowired
private DynamicTask dynamicTask;
@@ -105,31 +98,62 @@
@Autowired
TransactionDefinition transactionDefinition;
+ /**
+ * 娴佸埌鏉ョ殑澶勭悊
+ */
+ @Async("taskExecutor")
+ @org.springframework.context.event.EventListener
+ public void onApplicationEvent(MediaArrivalEvent event) {
+ if ("rtsp".equals(event.getSchema())) {
+ updateStatus(true, event.getApp(), event.getStream());
+ }
+ }
+
+ /**
+ * 娴佺寮�鐨勫鐞�
+ */
+ @Async("taskExecutor")
+ @EventListener
+ public void onApplicationEvent(MediaDepartureEvent event) {
+ if ("rtsp".equals(event.getSchema())) {
+ updateStatus(false, event.getApp(), event.getStream());
+ }
+ }
+
+ /**
+ * 娴佺寮�鐨勫鐞�
+ */
+ @Async("taskExecutor")
+ @EventListener
+ public void onApplicationEvent(MediaNotFoundEvent event) {
+ if ("rtp".equals(event.getApp())) {
+ return;
+ }
+ // 鎷夋祦浠ｇ悊
+ StreamProxyItem streamProxyByAppAndStream = getStreamProxyByAppAndStream(event.getApp(), event.getStream());
+ if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnableDisableNoneReader()) {
+ start(event.getApp(), event.getStream());
+ }
+ }
+
@Override
public void save(StreamProxyItem param, GeneralCallback<StreamInfo> callback) {
- MediaServerItem mediaInfo;
+ MediaServer mediaServer;
if (ObjectUtils.isEmpty(param.getMediaServerId()) || "auto".equals(param.getMediaServerId())){
- mediaInfo = mediaServerService.getMediaServerForMinimumLoad(null);
+ mediaServer = mediaServerService.getMediaServerForMinimumLoad(null);
}else {
- mediaInfo = mediaServerService.getOne(param.getMediaServerId());
+ mediaServer = mediaServerService.getOne(param.getMediaServerId());
}
- if (mediaInfo == null) {
+ if (mediaServer == null) {
logger.warn("淇濆瓨浠ｇ悊鏈壘鍒板湪绾跨殑ZLM...");
throw new ControllerException(ErrorCode.ERROR100.getCode(), "淇濆瓨浠ｇ悊鏈壘鍒板湪绾跨殑ZLM");
}
String dstUrl;
if ("ffmpeg".equalsIgnoreCase(param.getType())) {
- JSONObject jsonObject = zlmresTfulUtils.getMediaServerConfig(mediaInfo);
- if (jsonObject.getInteger("code") != 0) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "鑾峰彇娴佸獟浣撻厤缃け璐�");
- }
- JSONArray dataArray = jsonObject.getJSONArray("data");
- JSONObject mediaServerConfig = dataArray.getJSONObject(0);
- if (ObjectUtils.isEmpty(param.getFfmpegCmdKey())) {
- param.setFfmpegCmdKey("ffmpeg.cmd");
- }
- String ffmpegCmd = mediaServerConfig.getString(param.getFfmpegCmdKey());
+
+ String ffmpegCmd = mediaServerService.getFfmpegCmd(mediaServer, param.getFfmpegCmdKey());
+
if (ffmpegCmd == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "ffmpeg鎷夋祦浠ｇ悊鏃犳硶鑾峰彇ffmpeg cmd");
}
@@ -140,25 +164,25 @@
int port;
String schemaForUri;
if (schema.equalsIgnoreCase("rtsp")) {
- port = mediaInfo.getRtspPort();
+ port = mediaServer.getRtspPort();
schemaForUri = schema;
}else if (schema.equalsIgnoreCase("flv")) {
- port = mediaInfo.getRtmpPort();
+ port = mediaServer.getRtmpPort();
schemaForUri = schema;
}else {
- port = mediaInfo.getRtmpPort();
+ port = mediaServer.getRtmpPort();
schemaForUri = schema;
}
dstUrl = String.format("%s://%s:%s/%s/%s", schemaForUri, "127.0.0.1", port, param.getApp(),
param.getStream());
}else {
- dstUrl = String.format("rtsp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtspPort(), param.getApp(),
+ dstUrl = String.format("rtsp://%s:%s/%s/%s", "127.0.0.1", mediaServer.getRtspPort(), param.getApp(),
param.getStream());
}
param.setDstUrl(dstUrl);
logger.info("[鎷夋祦浠ｇ悊] 杈撳嚭鍦板潃涓猴細{}", dstUrl);
- param.setMediaServerId(mediaInfo.getId());
+ param.setMediaServerId(mediaServer.getId());
boolean saveResult;
// 鏇存柊
if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) {
@@ -170,21 +194,17 @@
callback.run(ErrorCode.ERROR100.getCode(), "淇濆瓨澶辫触", null);
return;
}
-
+ Hook hook = Hook.getInstance(HookType.on_media_arrival, param.getApp(), param.getStream(), mediaServer.getId());
+ hookSubscribe.addSubscribe(hook, (hookData) -> {
+ StreamInfo streamInfo = mediaServerService.getStreamInfoByAppAndStream(
+ mediaServer, param.getApp(), param.getStream(), null, null);
+ callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
+ });
if (param.isEnable()) {
String talkKey = UUID.randomUUID().toString();
String delayTalkKey = UUID.randomUUID().toString();
- HookSubscribeForStreamChange hookSubscribeForStreamChange = HookSubscribeFactory.on_stream_changed(param.getApp(), param.getStream(), true, "rtsp", mediaInfo.getId());
- hookSubscribe.addSubscribe(hookSubscribeForStreamChange, (mediaServerItem, response) -> {
- dynamicTask.stop(delayTalkKey);
- hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
- mediaInfo, param.getApp(), param.getStream(), null, null);
- callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
- });
-
dynamicTask.startDelay(delayTalkKey, ()->{
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaInfo.getId(), false);
+ StreamInfo streamInfo = mediaServerService.getStreamInfoByAppAndStreamWithCheck(param.getApp(), param.getStream(), mediaServer.getId(), false);
if (streamInfo != null) {
callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
}else {
@@ -192,12 +212,12 @@
callback.run(ErrorCode.ERROR100.getCode(), "瓒呮椂", null);
}
}, 7000);
- JSONObject jsonObject = addStreamProxyToZlm(param);
- if (jsonObject != null && jsonObject.getInteger("code") == 0) {
- hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
+ WVPResult<String> result = addStreamProxyToZlm(param);
+ if (result != null && result.getCode() == 0) {
+ hookSubscribe.removeSubscribe(hook);
dynamicTask.stop(talkKey);
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
- mediaInfo, param.getApp(), param.getStream(), null, null);
+ StreamInfo streamInfo = mediaServerService.getStreamInfoByAppAndStream(
+ mediaServer, param.getApp(), param.getStream(), null, null);
callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
}else {
param.setEnable(false);
@@ -207,16 +227,16 @@
}else {
updateStreamProxy(param);
}
- if (jsonObject == null){
+ if (result == null){
callback.run(ErrorCode.ERROR100.getCode(), "璁板綍宸蹭繚瀛橈紝鍚敤澶辫触", null);
}else {
- callback.run(ErrorCode.ERROR100.getCode(), jsonObject.getString("msg"), null);
+ callback.run(ErrorCode.ERROR100.getCode(), result.getMsg(), null);
}
}
}
else{
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
- mediaInfo, param.getApp(), param.getStream(), null, null);
+ StreamInfo streamInfo = mediaServerService.getStreamInfoByAppAndStream(
+ mediaServer, param.getApp(), param.getStream(), null, null);
callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), streamInfo);
}
}
@@ -312,41 +332,37 @@
}
@Override
- public JSONObject addStreamProxyToZlm(StreamProxyItem param) {
- JSONObject result = null;
- MediaServerItem mediaServerItem = null;
+ public WVPResult<String> addStreamProxyToZlm(StreamProxyItem param) {
+ WVPResult<String> result = null;
+ MediaServer mediaServer = null;
if (param.getMediaServerId() == null) {
logger.warn("娣诲姞浠ｇ悊鏃禡ediaServerId 涓簄ull");
return null;
}else {
- mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
+ mediaServer = mediaServerService.getOne(param.getMediaServerId());
}
- if (mediaServerItem == null) {
+ if (mediaServer == null) {
return null;
}
- if (zlmServerFactory.isStreamReady(mediaServerItem, param.getApp(), param.getStream())) {
- zlmresTfulUtils.closeStreams(mediaServerItem, param.getApp(), param.getStream());
+ if (mediaServerService.isStreamReady(mediaServer, param.getApp(), param.getStream())) {
+ mediaServerService.closeStreams(mediaServer, param.getApp(), param.getStream());
}
+ String msgResult;
if ("ffmpeg".equalsIgnoreCase(param.getType())){
if (param.getTimeoutMs() == 0) {
param.setTimeoutMs(15);
}
- result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrcUrl().trim(), param.getDstUrl(),
- param.getTimeoutMs() + "", param.isEnableAudio(), param.isEnableMp4(),
+ result = mediaServerService.addFFmpegSource(mediaServer, param.getSrcUrl().trim(), param.getDstUrl(),
+ param.getTimeoutMs(), param.isEnableAudio(), param.isEnableMp4(),
param.getFfmpegCmdKey());
}else {
- result = zlmresTfulUtils.addStreamProxy(mediaServerItem, param.getApp(), param.getStream(), param.getUrl().trim(),
+ result = mediaServerService.addStreamProxy(mediaServer, param.getApp(), param.getStream(), param.getUrl().trim(),
param.isEnableAudio(), param.isEnableMp4(), param.getRtpType());
}
- if (result != null && result.getInteger("code") == 0) {
- JSONObject data = result.getJSONObject("data");
- if (data == null) {
- logger.warn("[鑾峰彇鎷夋祦浠ｇ悊鐨勭粨鏋滄暟鎹瓺ata] 澶辫触锛� {}", result );
- return result;
- }
- String key = data.getString("key");
+ if (result != null && result.getCode() == 0) {
+ String key = result.getData();
if (key == null) {
- logger.warn("[鑾峰彇鎷夋祦浠ｇ悊鐨勭粨鏋滄暟鎹瓺ata涓殑KEY] 澶辫触锛� {}", result );
+ logger.warn("[鑾峰彇鎷夋祦浠ｇ悊鐨勭粨鏋滄暟鎹瓺ata] 澶辫触锛� {}", result );
return result;
}
param.setStreamKey(key);
@@ -356,16 +372,23 @@
}
@Override
- public JSONObject removeStreamProxyFromZlm(StreamProxyItem param) {
+ public Boolean removeStreamProxyFromZlm(StreamProxyItem param) {
if (param ==null) {
return null;
}
- MediaServerItem mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
- JSONObject result = null;
+ MediaServer mediaServer = mediaServerService.getOne(param.getMediaServerId());
+ if (mediaServer == null) {
+ return null;
+ }
+ List<StreamInfo> mediaList = mediaServerService.getMediaList(mediaServer, param.getApp(), param.getStream(), null);
+ if (mediaList == null || mediaList.isEmpty()) {
+ return true;
+ }
+ Boolean result = false;
if ("ffmpeg".equalsIgnoreCase(param.getType())){
- result = zlmresTfulUtils.delFFmpegSource(mediaServerItem, param.getStreamKey());
+ result = mediaServerService.delFFmpegSource(mediaServer, param.getStreamKey());
}else {
- result = zlmresTfulUtils.delStreamProxy(mediaServerItem, param.getStreamKey());
+ result = mediaServerService.delStreamProxy(mediaServer, param.getStreamKey());
}
return result;
}
@@ -387,8 +410,8 @@
videoManagerStorager.deleteStreamProxy(app, stream);
redisCatchStorage.removeStream(streamProxyItem.getMediaServerId(), "PULL", app, stream);
redisCatchStorage.removeStream(streamProxyItem.getMediaServerId(), "PUSH", app, stream);
- JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyItem);
- if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ Boolean result = removeStreamProxyFromZlm(streamProxyItem);
+ if (result != null && result) {
logger.info("[绉婚櫎浠ｇ悊]锛� 浠ｇ悊锛� {}/{}, 浠巣lm绉婚櫎鎴愬姛", app, stream);
}else {
logger.info("[绉婚櫎浠ｇ悊]锛� 浠ｇ悊锛� {}/{}, 浠巣lm绉婚櫎澶辫触", app, stream);
@@ -401,16 +424,16 @@
boolean result = false;
StreamProxyItem streamProxy = videoManagerStorager.queryStreamProxy(app, stream);
if (streamProxy != null && !streamProxy.isEnable() ) {
- JSONObject jsonObject = addStreamProxyToZlm(streamProxy);
- if (jsonObject == null) {
+ WVPResult<String> wvpResult = addStreamProxyToZlm(streamProxy);
+ if (wvpResult == null) {
return false;
}
- if (jsonObject.getInteger("code") == 0) {
+ if (wvpResult.getCode() == 0) {
result = true;
streamProxy.setEnable(true);
updateStreamProxy(streamProxy);
}else {
- logger.info("鍚敤浠ｇ悊澶辫触锛� {}/{}->{}({})", app, stream, jsonObject.getString("msg"),
+ logger.info("鍚敤浠ｇ悊澶辫触锛� {}/{}->{}({})", app, stream, wvpResult.getMsg(),
streamProxy.getSrcUrl() == null? streamProxy.getUrl():streamProxy.getSrcUrl());
}
} else if (streamProxy != null && streamProxy.isEnable()) {
@@ -424,8 +447,8 @@
boolean result = false;
StreamProxyItem streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream);
if (streamProxyDto != null && streamProxyDto.isEnable()) {
- JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto);
- if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ Boolean removed = removeStreamProxyFromZlm(streamProxyDto);
+ if (removed != null && removed) {
streamProxyDto.setEnable(false);
result = updateStreamProxy(streamProxyDto);
}
@@ -434,20 +457,8 @@
}
@Override
- public JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem) {
- JSONObject result = new JSONObject();
- JSONObject mediaServerConfigResuly = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
- if (mediaServerConfigResuly != null && mediaServerConfigResuly.getInteger("code") == 0
- && mediaServerConfigResuly.getJSONArray("data").size() > 0){
- JSONObject mediaServerConfig = mediaServerConfigResuly.getJSONArray("data").getJSONObject(0);
-
- for (String key : mediaServerConfig.keySet()) {
- if (key.startsWith("ffmpeg.cmd")){
- result.put(key, mediaServerConfig.getString(key));
- }
- }
- }
- return result;
+ public Map<String, String> getFFmpegCMDs(MediaServer mediaServer) {
+ return mediaServerService.getFFmpegCMDs(mediaServer);
}
@@ -473,8 +484,8 @@
mediaServerId, true);
for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
- JSONObject jsonObject = addStreamProxyToZlm(streamProxyDto);
- if (jsonObject == null) {
+ WVPResult<String> wvpResult = addStreamProxyToZlm(streamProxyDto);
+ if (wvpResult == null) {
// 璁剧疆涓虹绾�
logger.info("鎭㈠娴佷唬鐞嗗け璐�" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
updateStatus(false, streamProxyDto.getApp(), streamProxyDto.getStream());
@@ -497,18 +508,18 @@
String type = "PULL";
// 鍙戦�乺edis娑堟伅
- List<OnStreamChangedHookParam> onStreamChangedHookParams = redisCatchStorage.getStreams(mediaServerId, type);
- if (onStreamChangedHookParams.size() > 0) {
- for (OnStreamChangedHookParam onStreamChangedHookParam : onStreamChangedHookParams) {
+ List<MediaInfo> mediaInfoList = redisCatchStorage.getStreams(mediaServerId, type);
+ if (mediaInfoList.size() > 0) {
+ for (MediaInfo mediaInfo : mediaInfoList) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("serverId", userSetting.getServerId());
- jsonObject.put("app", onStreamChangedHookParam.getApp());
- jsonObject.put("stream", onStreamChangedHookParam.getStream());
+ jsonObject.put("app", mediaInfo.getApp());
+ jsonObject.put("stream", mediaInfo.getStream());
jsonObject.put("register", false);
jsonObject.put("mediaServerId", mediaServerId);
redisCatchStorage.sendStreamChangeMsg(type, jsonObject);
// 绉婚櫎redis鍐呮祦鐨勪俊鎭�
- redisCatchStorage.removeStream(mediaServerId, type, onStreamChangedHookParam.getApp(), onStreamChangedHookParam.getStream());
+ redisCatchStorage.removeStream(mediaServerId, type, mediaInfo.getApp(), mediaInfo.getStream());
}
}
}
@@ -524,44 +535,30 @@
}
private void syncPullStream(String mediaServerId){
- MediaServerItem mediaServer = mediaServerService.getOne(mediaServerId);
+ MediaServer mediaServer = mediaServerService.getOne(mediaServerId);
if (mediaServer != null) {
- List<OnStreamChangedHookParam> allPullStream = redisCatchStorage.getStreams(mediaServerId, "PULL");
- if (allPullStream.size() > 0) {
- zlmresTfulUtils.getMediaList(mediaServer, jsonObject->{
- Map<String, StreamInfo> stringStreamInfoMap = new HashMap<>();
- if (jsonObject.getInteger("code") == 0) {
- JSONArray data = jsonObject.getJSONArray("data");
- if(data != null && data.size() > 0) {
- for (int i = 0; i < data.size(); i++) {
- JSONObject streamJSONObj = data.getJSONObject(i);
- if ("rtsp".equals(streamJSONObj.getString("schema"))) {
- StreamInfo streamInfo = new StreamInfo();
- String app = streamJSONObj.getString("app");
- String stream = streamJSONObj.getString("stream");
- streamInfo.setApp(app);
- streamInfo.setStream(stream);
- stringStreamInfoMap.put(app+stream, streamInfo);
- }
- }
+ List<MediaInfo> mediaInfoList = redisCatchStorage.getStreams(mediaServerId, "PULL");
+ if (!mediaInfoList.isEmpty()) {
+ List<StreamInfo> mediaList = mediaServerService.getMediaList(mediaServer, null, null, null);
+ Map<String, StreamInfo> stringStreamInfoMap = new HashMap<>();
+ if (mediaList != null && !mediaList.isEmpty()) {
+ for (StreamInfo streamInfo : mediaList) {
+ stringStreamInfoMap.put(streamInfo.getApp() + streamInfo.getStream(), streamInfo);
+ }
+ }
+ if (stringStreamInfoMap.isEmpty()) {
+ redisCatchStorage.removeStream(mediaServerId, "PULL");
+ }else {
+ for (String key : stringStreamInfoMap.keySet()) {
+ StreamInfo streamInfo = stringStreamInfoMap.get(key);
+ if (stringStreamInfoMap.get(streamInfo.getApp() + streamInfo.getStream()) == null) {
+ redisCatchStorage.removeStream(mediaServerId, "PULL", streamInfo.getApp(),
+ streamInfo.getStream());
}
}
- if (stringStreamInfoMap.size() == 0) {
- redisCatchStorage.removeStream(mediaServerId, "PULL");
- }else {
- for (String key : stringStreamInfoMap.keySet()) {
- StreamInfo streamInfo = stringStreamInfoMap.get(key);
- if (stringStreamInfoMap.get(streamInfo.getApp() + streamInfo.getStream()) == null) {
- redisCatchStorage.removeStream(mediaServerId, "PULL", streamInfo.getApp(),
- streamInfo.getStream());
- }
- }
- }
- });
+ }
}
-
}
-
}
@Override
@@ -577,13 +574,13 @@
@Scheduled(cron = "* 0/10 * * * ?")
public void asyncCheckStreamProxyStatus() {
- List<MediaServerItem> all = mediaServerService.getAllOnline();
+ List<MediaServer> all = mediaServerService.getAllOnline();
if (CollectionUtils.isEmpty(all)){
return;
}
- Map<String, MediaServerItem> serverItemMap = all.stream().collect(Collectors.toMap(MediaServerItem::getId, Function.identity(), (m1, m2) -> m1));
+ Map<String, MediaServer> serverItemMap = all.stream().collect(Collectors.toMap(MediaServer::getId, Function.identity(), (m1, m2) -> m1));
List<StreamProxyItem> list = videoManagerStorager.getStreamProxyListForEnable(true);
@@ -593,15 +590,14 @@
for (StreamProxyItem streamProxyItem : list) {
- MediaServerItem mediaServerItem = serverItemMap.get(streamProxyItem.getMediaServerId());
+ MediaServer mediaServerItem = serverItemMap.get(streamProxyItem.getMediaServerId());
- // TODO 鏀寔鍏朵粬 schema
- JSONObject mediaInfo = zlmresTfulUtils.isMediaOnline(mediaServerItem, streamProxyItem.getApp(), streamProxyItem.getStream(), "rtsp");
+ MediaInfo mediaInfo = mediaServerService.getMediaInfo(mediaServerItem, streamProxyItem.getApp(), streamProxyItem.getStream());
if (mediaInfo == null){
streamProxyItem.setStatus(false);
} else {
- if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
+ if (mediaInfo.getOnline() != null && mediaInfo.getOnline()) {
streamProxyItem.setStatus(true);
} else {
streamProxyItem.setStatus(false);
--
Gitblit v1.8.0