From 4bd4f50b4165953018a9f9174056d29d087fdaee Mon Sep 17 00:00:00 2001
From: szy833 <31844882+szy833@users.noreply.github.com>
Date: 星期日, 16 一月 2022 23:32:51 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 11 +++++++++--
1 files changed, 9 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..8a09de7 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -5,6 +5,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import com.github.pagehelper.PageInfo;
import java.util.List;
@@ -34,6 +35,7 @@
* @return
*/
PageInfo<StreamPushItem> getPushList(Integer page, Integer count);
+ List<StreamPushItem> getPushList(String mediaSererId);
StreamPushItem transform(MediaItem item);
@@ -49,10 +51,10 @@
/**
* 鏂扮殑鑺傜偣鍔犲叆
- * @param zlmServerConfig
+ * @param mediaServerId
* @return
*/
- void zlmServerOnline(ZLMServerConfig zlmServerConfig);
+ void zlmServerOnline(String mediaServerId);
/**
* 鑺傜偣绂荤嚎
@@ -61,4 +63,9 @@
*/
void zlmServerOffline(String mediaServerId);
+ void clean();
+
+ boolean saveToRandomGB();
+
+ void batchAdd(List<StreamPushItem> streamPushExcelDtoList);
}
--
Gitblit v1.8.0