From 160a5d84c30f868b826939732f02af1789891b26 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Sat, 17 Aug 2024 22:49:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=AE=E5=BD=95=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/dao/PlatformChannelMapper.java | 2 +- .../vmp/gb28181/service/impl/GbChannelServiceImpl.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java index e1a2d5cde..06ba21fe9 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java @@ -89,7 +89,7 @@ public interface PlatformChannelMapper { "FROM " + "wvp_platform pp " + "left join wvp_platform_gb_channel pgc on " + - "pp.server_gb_id = pgc.platform_id " + + "pp.id = pgc.platform_id " + "left join wvp_device_channel dc on " + "dc.id = pgc.device_channel_id " + "WHERE " + diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java index 20631e5d8..f1a45c1ff 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java @@ -436,6 +436,14 @@ public class GbChannelServiceImpl implements IGbChannelService { } // 这个多加一个参数,为了防止将非国标的通道通过此方法清空内容,导致意外发生 commonGBChannelMapper.reset(id, channel.getGbDeviceDbId(), DateUtil.getNow()); + CommonGBChannel channelNew = getOne(id); + // 发送通过更新通知 + try { + // 发送通知 + eventPublisher.catalogEventPublish(null, channelNew, CatalogEvent.UPDATE); + } catch (Exception e) { + log.warn("[通道移除通知] 发送失败，{}", channelNew.getGbDeviceId(), e); + } } @Override