From ce035dbcdb38fc1f73ec82f54336f490a632b53b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 05 一月 2023 09:38:11 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
index 5dd45ef..cf6f0ed 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -1,17 +1,19 @@
package com.genersoft.iot.vmp.service;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
-import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.github.pagehelper.PageInfo;
import java.util.List;
import java.util.Map;
+/**
+ * @author lin
+ */
public interface IStreamPushService {
List<StreamPushItem> handleJSON(String json, MediaServerItem mediaServerItem);
@@ -37,7 +39,7 @@
List<StreamPushItem> getPushList(String mediaSererId);
- StreamPushItem transform(MediaItem item);
+ StreamPushItem transform(OnStreamChangedHookParam item);
StreamPushItem getPush(String app, String streamId);
@@ -96,4 +98,20 @@
*/
void online(List<StreamPushItemFromRedis> onlineStreams);
+ /**
+ * 澧炲姞鎺ㄦ祦
+ */
+ boolean add(StreamPushItem stream);
+
+ /**
+ * 鑾峰彇鍏ㄩ儴鐨刟pp+Streanm 鐢ㄤ簬鍒ゆ柇鎺ㄦ祦鍒楄〃鏄柊澧炶繕鏄慨鏀�
+ * @return
+ */
+ List<String> getAllAppAndStream();
+
+ /**
+ * 鑾峰彇缁熻淇℃伅
+ * @return
+ */
+ ResourceBaceInfo getOverview();
}
--
Gitblit v1.8.0