From dc20ccfce84d46f86209309ea70ba81d0360e070 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 05 一月 2022 15:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 d8a4465..06c8b73 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -34,6 +34,7 @@
* @return
*/
PageInfo<StreamPushItem> getPushList(Integer page, Integer count);
+ List<StreamPushItem> getPushList(String mediaSererId);
StreamPushItem transform(MediaItem item);
@@ -49,10 +50,10 @@
/**
* 鏂扮殑鑺傜偣鍔犲叆
- * @param zlmServerConfig
+ * @param mediaServerId
* @return
*/
- void zlmServerOnline(ZLMServerConfig zlmServerConfig);
+ void zlmServerOnline(String mediaServerId);
/**
* 鑺傜偣绂荤嚎
@@ -61,4 +62,7 @@
*/
void zlmServerOffline(String mediaServerId);
+ void clean();
+
+ boolean saveToRandomGB();
}
--
Gitblit v1.8.0