From b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:35:11 +0800
Subject: [PATCH] Merge branch 'master' into dev/zlm
---
src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
old mode 100644
new mode 100755
index ac10000..f3b5162
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
@@ -1,14 +1,14 @@
package com.genersoft.iot.vmp.service;
-import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.GeneralCallback;
import com.genersoft.iot.vmp.common.StreamInfo;
-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.bean.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
+
+import java.util.Map;
public interface IStreamProxyService {
@@ -16,21 +16,23 @@
* 淇濆瓨瑙嗛浠ｇ悊
* @param param
*/
- WVPResult<StreamInfo> save(StreamProxyItem param);
+ void save(StreamProxyItem param, GeneralCallback<StreamInfo> callback);
/**
* 娣诲姞瑙嗛浠ｇ悊鍒皕lm
+ *
* @param param
* @return
*/
- JSONObject addStreamProxyToZlm(StreamProxyItem param);
+ WVPResult<String> addStreamProxyToZlm(StreamProxyItem param);
/**
* 浠巣lm绉婚櫎瑙嗛浠ｇ悊
+ *
* @param param
* @return
*/
- JSONObject removeStreamProxyFromZlm(StreamProxyItem param);
+ Boolean removeStreamProxyFromZlm(StreamProxyItem param);
/**
* 鍒嗛〉鏌ヨ
@@ -75,9 +77,10 @@
/**
* 鑾峰彇ffmpeg.cmd妯℃澘
+ *
* @return
*/
- JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem);
+ Map<String, String> getFFmpegCMDs(MediaServer mediaServerItem);
/**
* 鏍规嵁app涓巗tream鑾峰彇streamProxy
@@ -101,4 +104,16 @@
void zlmServerOffline(String mediaServerId);
void clean();
+
+ /**
+ * 鏇存柊浠ｇ悊娴�
+ */
+ boolean updateStreamProxy(StreamProxyItem streamProxyItem);
+
+ /**
+ * 鑾峰彇缁熻淇℃伅
+ * @return
+ */
+ ResourceBaseInfo getOverview();
+
}
--
Gitblit v1.8.0