From 6246ce6ba84fd2b4e7ce7768bfa1fb56c159cad3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 二月 2023 16:24:02 +0800
Subject: [PATCH] Merge pull request #736 from kunlong-luo/fix-null-point-and-cast-exception
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
index 81f3691..15b6d80 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -5,9 +5,9 @@
import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.media.zlm.dto.*;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
-import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
@@ -131,7 +131,7 @@
* @param app
* @param streamId
*/
- void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem item);
+ void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, OnStreamChangedHookParam item);
/**
* 绉婚櫎娴佷俊鎭粠redis
@@ -165,7 +165,7 @@
*/
ThirdPartyGB queryMemberNoGBId(String queryKey);
- List<MediaItem> getStreams(String mediaServerId, String pull);
+ List<OnStreamChangedHookParam> getStreams(String mediaServerId, String pull);
/**
* 灏哾evice淇℃伅鍐欏叆redis
@@ -191,7 +191,7 @@
void resetAllSN();
- MediaItem getStreamInfo(String app, String streamId, String mediaServerId);
+ OnStreamChangedHookParam getStreamInfo(String app, String streamId, String mediaServerId);
void addCpuInfo(double cpuInfo);
@@ -233,6 +233,8 @@
*/
StreamAuthorityInfo getStreamAuthorityInfo(String app, String stream);
+ List<StreamAuthorityInfo> getAllStreamAuthorityInfo();
+
/**
* 鍙戦�乺edis娑堟伅 鏌ヨ鎵�鏈夋帹娴佽澶囩殑鐘舵��
*/
--
Gitblit v1.8.0