From 8bd2f47c9a92ffcf5ae43fae965eaefd4748e263 Mon Sep 17 00:00:00 2001 From: lishuyuan <lishuyuan@inspur.com> Date: 星期四, 02 十一月 2023 10:17:47 +0800 Subject: [PATCH] bugfix:目录订阅收到更新事件时,sql字段update_time为空导致的报错 --- src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 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 old mode 100644 new mode 100755 index 9c5c32f..43f1a8a --- 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); /** @@ -35,6 +38,37 @@ /** * 绉婚櫎鍥芥爣鍏宠仈 * @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); + + List<GbStream> getGbChannelWithGbid(String gbId); } -- Gitblit v1.8.0