From e861c9dfab7d74444593b3cfa866544d648dca7f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 22 二月 2022 11:55:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-pro-record
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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..1d57d46 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;
@@ -29,11 +30,10 @@
/**
* 鑾峰彇
- * @param page
- * @param count
- * @return
*/
- PageInfo<StreamPushItem> getPushList(Integer page, Integer count);
+ PageInfo<StreamPushItem> getPushList(Integer page, Integer count, String query, Boolean pushing, String mediaServerId);
+
+ List<StreamPushItem> getPushList(String mediaSererId);
StreamPushItem transform(MediaItem item);
@@ -49,10 +49,10 @@
/**
* 鏂扮殑鑺傜偣鍔犲叆
- * @param zlmServerConfig
+ * @param mediaServerId
* @return
*/
- void zlmServerOnline(ZLMServerConfig zlmServerConfig);
+ void zlmServerOnline(String mediaServerId);
/**
* 鑺傜偣绂荤嚎
@@ -61,4 +61,13 @@
*/
void zlmServerOffline(String mediaServerId);
+ void clean();
+
+ boolean saveToRandomGB();
+
+ void batchAdd(List<StreamPushItem> streamPushExcelDtoList);
+
+ boolean batchStop(List<GbStream> streamPushItems);
+
+ void batchAddForUpload(String platformId, String catalogId, List<StreamPushItem> streamPushItems);
}
--
Gitblit v1.8.0