From 6e4fc1e79b7b4b91d6eb36f6b5638fa902665a50 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:34:36 +0800
Subject: [PATCH] 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖） 1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因） 2.调整滚动条美化样式到app.vue中，使其真正全局生效
---
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 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 899da98..acf0d27 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -1,11 +1,15 @@
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.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;
+import java.util.Map;
public interface IStreamPushService {
@@ -27,9 +31,44 @@
/**
* 鑾峰彇
- * @param page
- * @param count
+ */
+ PageInfo<StreamPushItem> getPushList(Integer page, Integer count, String query, Boolean pushing, String mediaServerId);
+
+ List<StreamPushItem> getPushList(String mediaSererId);
+
+ StreamPushItem transform(MediaItem item);
+
+ StreamPushItem getPush(String app, String streamId);
+
+ /**
+ * 鍋滄涓�璺帹娴�
+ * @param app 搴旂敤鍚�
+ * @param streamId 娴両D
* @return
*/
- PageInfo<StreamPushItem> getPushList(Integer page, Integer count);
+ 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);
}
--
Gitblit v1.8.0