From 7e48d847402d2ea4da85af582529de676f30dc38 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 五月 2023 17:56:56 +0800
Subject: [PATCH] Merge pull request #844 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 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..cf6f0ed 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -1,15 +1,19 @@
package com.genersoft.iot.vmp.service;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
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.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.github.pagehelper.PageInfo;
import java.util.List;
+import java.util.Map;
+/**
+ * @author lin
+ */
public interface IStreamPushService {
List<StreamPushItem> handleJSON(String json, MediaServerItem mediaServerItem);
@@ -30,14 +34,12 @@
/**
* 鑾峰彇
- * @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);
+ StreamPushItem transform(OnStreamChangedHookParam item);
StreamPushItem getPush(String app, String streamId);
@@ -45,27 +47,71 @@
* 鍋滄涓�璺帹娴�
* @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();
+
+ /**
+ * 鑾峰彇缁熻淇℃伅
+ * @return
+ */
+ ResourceBaceInfo getOverview();
}
--
Gitblit v1.8.0