From 381b3d15caa30e99c75f58a366b3b75cbbf01450 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 07 十二月 2021 11:40:17 +0800 Subject: [PATCH] 修复未结束的推流无法下载 --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java index 97c3794..39dc5ad 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java @@ -1,17 +1,16 @@ package com.genersoft.iot.vmp.storager; -import java.util.List; - import com.genersoft.iot.vmp.gb28181.bean.*; -import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce; import com.github.pagehelper.PageInfo; +import java.util.List; + /** - * @Description:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛 + * @description:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛 * @author: swwheihei * @date: 2020骞�5鏈�6鏃� 涓嬪崍2:14:31 */ @@ -97,6 +96,13 @@ * @param channelId 閫氶亾ID */ public DeviceChannel queryChannel(String deviceId, String channelId); + + /** + * 鍒犻櫎閫氶亾 + * @param deviceId 璁惧ID + * @param channelId 閫氶亾ID + */ + public int delChannel(String deviceId, String channelId); /** * 鑾峰彇澶氫釜璁惧 @@ -321,7 +327,7 @@ * @param channelId * @return */ - GbStream queryStreamInParentPlatform(String platformId, String channelId); + List<GbStream> queryStreamInParentPlatform(String platformId, String channelId); /** * 鑾峰彇骞冲彴鍏宠仈鐨勭洿鎾祦 @@ -347,7 +353,7 @@ * @param app * @param stream */ - void removeMedia(String app, String stream); + int removeMedia(String app, String stream); /** @@ -360,7 +366,7 @@ * @param app * @param streamId */ - void mediaOutline(String app, String streamId); + int mediaOutline(String app, String streamId); /** * 璁剧疆骞冲彴鍦ㄧ嚎/绂荤嚎 @@ -374,5 +380,38 @@ */ void updateMediaServer(MediaServerItem mediaServerItem); + /** + * 鏍规嵁濯掍綋ID鑾峰彇鍚敤/涓嶅惎鐢ㄧ殑浠ｇ悊鍒楄〃 + * @param id 濯掍綋ID + * @param b 鍚敤/涓嶅惎鐢� + * @return + */ List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean b); + + /** + * 鏍规嵁閫氶亾ID鑾峰彇鍏舵墍鍦ㄨ澶� + * @param channelId 閫氶亾ID + * @return + */ + Device queryVideoDeviceByChannelId(String channelId); + + /** + * 閫氶亾涓婄嚎 + * @param channelId 閫氶亾ID + */ + void deviceChannelOnline(String deviceId, String channelId); + + /** + * 閫氶亾绂荤嚎 + * @param channelId 閫氶亾ID + */ + void deviceChannelOffline(String deviceId, String channelId); + + /** + * 閫氳繃app涓巗tream鑾峰彇StreamProxy + * @param app + * @param streamId + * @return + */ + StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId); } -- Gitblit v1.8.0