From fe0b5c33f92e11f51574deb2c589a31b34a6e720 Mon Sep 17 00:00:00 2001
From: chenjialing <595168663@qq.com>
Date: 星期三, 02 三月 2022 09:18:17 +0800
Subject: [PATCH] 告警信息上报过程中，AlarmType存储失败的解决
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 5c8a6b5..424188d 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -204,7 +204,6 @@
}else {
ret.put("enableMP4", userSetup.isRecordPushLive());
}
- ret.put("enableMP4", userSetup.isRecordPushLive());
StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(stream);
// 褰曞儚鍥炴斁鏃朵笉杩涜褰曞儚涓嬭浇
@@ -359,6 +358,8 @@
if (mediaServerItem != null){
if (regist) {
StreamPushItem streamPushItem = null;
+ StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);
+ item.setStreamInfo(streamInfoByAppAndStream);
redisCatchStorage.addStream(mediaServerItem, type, app, streamId, item);
if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()
|| item.getOriginType() == OriginType.RTMP_PUSH.ordinal()
@@ -376,7 +377,7 @@
}
}
if (gbStreams.size() > 0) {
- eventPublisher.catalogEventPublishForStream(null, gbStreams.toArray(new GbStream[0]), CatalogEvent.ON);
+ eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);
}
}else {
--
Gitblit v1.8.0