From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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
index c4968a7..f3b5162 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
@@ -1,12 +1,14 @@
package com.genersoft.iot.vmp.service;
-import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.GeneralCallback;
import com.genersoft.iot.vmp.common.StreamInfo;
-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.vmanager.bean.ResourceBaseInfo;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
+
+import java.util.Map;
public interface IStreamProxyService {
@@ -18,17 +20,19 @@
/**
* 娣诲姞瑙嗛浠ｇ悊鍒皕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);
/**
* 鍒嗛〉鏌ヨ
@@ -73,9 +77,10 @@
/**
* 鑾峰彇ffmpeg.cmd妯℃澘
+ *
* @return
*/
- JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem);
+ Map<String, String> getFFmpegCMDs(MediaServer mediaServerItem);
/**
* 鏍规嵁app涓巗tream鑾峰彇streamProxy
--
Gitblit v1.8.0