From f6320c7dd3dfd25e98bb63f41d79a33af5009a93 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:02:16 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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 acf0d27..5dbba92 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.service.bean.StreamPushItemFromRedis;
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import com.github.pagehelper.PageInfo;
@@ -44,31 +45,65 @@
* 鍋滄涓�璺帹娴�
* @param app 搴旂敤鍚�
* @param streamId 娴両D
- * @return
*/
boolean stop(String app, String streamId);
/**
* 鏂扮殑鑺傜偣鍔犲叆
- * @param mediaServerId
- * @return
*/
void zlmServerOnline(String mediaServerId);
/**
* 鑺傜偣绂荤嚎
- * @param mediaServerId
- * @return
*/
void zlmServerOffline(String mediaServerId);
+ /**
+ * 娓呯┖
+ */
void clean();
+
boolean saveToRandomGB();
+ /**
+ * 鎵归噺娣诲姞
+ */
void batchAdd(List<StreamPushItem> streamPushExcelDtoList);
+ /**
+ * 涓澶氫釜鎺ㄦ祦
+ */
boolean batchStop(List<GbStream> streamPushItems);
+ /**
+ * 瀵煎叆鏃舵壒閲忓鍔�
+ */
void batchAddForUpload(List<StreamPushItem> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll);
+
+ /**
+ * 鍏ㄩ儴绂荤嚎
+ */
+ void allStreamOffline();
+
+ /**
+ * 鎺ㄦ祦绂荤嚎
+ */
+ void offline(List<StreamPushItemFromRedis> offlineStreams);
+
+ /**
+ * 鎺ㄦ祦涓婄嚎
+ */
+ void online(List<StreamPushItemFromRedis> onlineStreams);
+
+ /**
+ * 澧炲姞鎺ㄦ祦
+ */
+ boolean add(StreamPushItem stream);
+
+ /**
+ * 鑾峰彇鍏ㄩ儴鐨刟pp+Streanm 鐢ㄤ簬鍒ゆ柇鎺ㄦ祦鍒楄〃鏄柊澧炶繕鏄慨鏀�
+ * @return
+ */
+ List<String> getAllAppAndStream();
}
--
Gitblit v1.8.0