From 8fdd10d1c2723ead1d2c3b232f64f292ba3ce1cc Mon Sep 17 00:00:00 2001 From: che_shuai <che_shuai@massclouds> Date: 星期一, 24 七月 2023 14:10:46 +0800 Subject: [PATCH] 修复在国标级联选择通道时,如果添加通道到跟平台根目录(即平台本身),无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958 --- src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java b/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java index 49ba7b7..314a389 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java @@ -1,6 +1,9 @@ package com.genersoft.iot.vmp.service; +import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.gb28181.bean.GbStream; +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; +import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; import com.github.pagehelper.PageInfo; import java.util.List; @@ -16,7 +19,7 @@ * @param count * @return */ - PageInfo<GbStream> getAll(Integer page, Integer count); + PageInfo<GbStream> getAll(Integer page, Integer count, String platFormId, String catalogId,String query,String mediaServerId); /** @@ -30,11 +33,40 @@ * 淇濆瓨鍥芥爣鍏宠仈 * @param gbStreams */ - boolean addPlatformInfo(List<GbStream> gbStreams, String platformId); + boolean addPlatformInfo(List<GbStream> gbStreams, String platformId, String catalogId); /** * 绉婚櫎鍥芥爣鍏宠仈 * @param gbStreams + * @param platformId */ - boolean delPlatformInfo(List<GbStream> gbStreams); + boolean delPlatformInfo(String platformId, List<GbStream> gbStreams); + + DeviceChannel getDeviceChannelListByStream(GbStream gbStream, String catalogId, ParentPlatform platform); + + void sendCatalogMsg(GbStream gbStream, String type); + void sendCatalogMsgs(List<GbStream> gbStreams, String type); + + /** + * 淇敼gbId鎴杗ame + * @param streamPushItemForUpdate + * @return + */ + int updateGbIdOrName(List<StreamPushItem> streamPushItemForUpdate); + + DeviceChannel getDeviceChannelListByStreamWithStatus(GbStream gbStream, String catalogId, ParentPlatform platform); + + /** + * 鏌ヨ鎵�鏈夋湭鍒嗛厤鐨勯�氶亾 + * @param platformId + * @return + */ + List<GbStream> getAllGBChannels(String platformId); + + /** + * 绉婚櫎鎵�鏈夊叧鑱旂殑閫氶亾 + * @param platformId + * @param catalogId + */ + void delAllPlatformInfo(String platformId, String catalogId); } -- Gitblit v1.8.0