From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 11 +++++++----
1 files changed, 7 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 8a09de7..acf0d27 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -9,6 +9,7 @@
import com.github.pagehelper.PageInfo;
import java.util.List;
+import java.util.Map;
public interface IStreamPushService {
@@ -30,11 +31,9 @@
/**
* 鑾峰彇
- * @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);
@@ -68,4 +67,8 @@
boolean saveToRandomGB();
void batchAdd(List<StreamPushItem> streamPushExcelDtoList);
+
+ boolean batchStop(List<GbStream> streamPushItems);
+
+ void batchAddForUpload(List<StreamPushItem> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll);
}
--
Gitblit v1.8.0