From 59f0210d04f302cb13a3dd7ec849ae541aa3a81d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 11 二月 2022 09:47:26 +0800
Subject: [PATCH] Merge pull request #324 from SaltFish001/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java |    8 ++++----
 1 files changed, 4 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..53ca6c4 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -30,11 +30,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 +66,6 @@
     boolean saveToRandomGB();
 
     void batchAdd(List<StreamPushItem> streamPushExcelDtoList);
+
+    boolean batchStop(List<GbStream> streamPushItems);
 }

--
Gitblit v1.8.0