From f635f9c3003ae10f7be8e934b81bc480c82617ba Mon Sep 17 00:00:00 2001 From: xiaoxie <hotcoffie@163.com> Date: 星期三, 20 四月 2022 13:56:30 +0800 Subject: [PATCH] 修复录像列表:实测部分厂家(TP-Link IPC43AW)录像列表接口,返回的xml报文数据中有多余的空格,导致解析String为Integer失败,增加trim修复这个问题 --- src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java | 13 ++++++++++--- 1 files changed, 10 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..1a851d7 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java @@ -1,5 +1,6 @@ package com.genersoft.iot.vmp.service; +import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.gb28181.bean.GbStream; import com.github.pagehelper.PageInfo; @@ -16,7 +17,7 @@ * @param count * @return */ - PageInfo<GbStream> getAll(Integer page, Integer count); + PageInfo<GbStream> getAll(Integer page, Integer count, String platFormId, String catalogId,String query,Boolean pushing,String mediaServerId); /** @@ -30,11 +31,17 @@ * 淇濆瓨鍥芥爣鍏宠仈 * @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, String deviceGBId); + + void sendCatalogMsg(GbStream gbStream, String type); + void sendCatalogMsgs(List<GbStream> gbStreams, String type); } -- Gitblit v1.8.0