From 7de73ebd2bc07a51f0f9db031d6f616bdcfe549c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期三, 11 十月 2023 01:36:12 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev --- src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 3 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 2f7388a..c4968a7 --- a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java @@ -1,7 +1,11 @@ package com.genersoft.iot.vmp.service; -import com.alibaba.fastjson.JSONObject; +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.zlm.dto.StreamProxyItem; +import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo; import com.github.pagehelper.PageInfo; public interface IStreamProxyService { @@ -10,7 +14,7 @@ * 淇濆瓨瑙嗛浠g悊 * @param param */ - String save(StreamProxyItem param); + void save(StreamProxyItem param, GeneralCallback<StreamInfo> callback); /** * 娣诲姞瑙嗛浠g悊鍒皕lm @@ -50,6 +54,16 @@ boolean start(String app, String stream); /** + * 鏇存柊鐘舵�� + * @param status 鐘舵�� + * @param app + * @param stream + */ + int updateStatus(boolean status, String app, String stream); + + + + /** * 鍋滅敤鐢ㄨ棰戜唬鐞� * @param app * @param stream @@ -61,5 +75,40 @@ * 鑾峰彇ffmpeg.cmd妯℃澘 * @return */ - JSONObject getFFmpegCMDs(); + JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem); + + /** + * 鏍规嵁app涓巗tream鑾峰彇streamProxy + * @return + */ + StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId); + + + /** + * 鏂扮殑鑺傜偣鍔犲叆 + * @param mediaServerId + * @return + */ + void zlmServerOnline(String mediaServerId); + + /** + * 鑺傜偣绂荤嚎 + * @param mediaServerId + * @return + */ + void zlmServerOffline(String mediaServerId); + + void clean(); + + /** + * 鏇存柊浠g悊娴� + */ + boolean updateStreamProxy(StreamProxyItem streamProxyItem); + + /** + * 鑾峰彇缁熻淇℃伅 + * @return + */ + ResourceBaseInfo getOverview(); + } -- Gitblit v1.8.0