From 0de634cdf75fbc24d7bf9a4853730015f820076a Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期二, 29 三月 2022 12:17:54 +0800
Subject: [PATCH] 补充缺失的文件
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
index f21dfc0..a77179c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
@@ -64,10 +64,10 @@
Element snElement = rootElement.element("SN");
String sn = snElement.getText();
// 鍑嗗鍥炲閫氶亾淇℃伅
- List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
+ List<DeviceChannelInPlatform> deviceChannels = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
// 鏌ヨ鍏宠仈鐨勭洿鎾�氶亾
List<GbStream> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
- int size = channelReduces.size() + gbStreams.size();
+ int size = deviceChannels.size() + gbStreams.size();
// 鍥炲鐩綍淇℃伅
List<PlatformCatalog> catalogs = storager.queryCatalogInPlatform(parentPlatform.getServerGBId());
if (catalogs.size() > 0) {
@@ -96,14 +96,15 @@
}
}
// 鍥炲绾ц仈鐨勯�氶亾
- if (channelReduces.size() > 0) {
- for (ChannelReduce channelReduce : channelReduces) {
- if (channelReduce.getCatalogId().equals(parentPlatform.getServerGBId())) {
- channelReduce.setCatalogId(parentPlatform.getDeviceGBId());
+ if (deviceChannels.size() > 0) {
+ for (DeviceChannelInPlatform channel : deviceChannels) {
+ if (channel.getCatalogId().equals(parentPlatform.getServerGBId())) {
+ channel.setCatalogId(parentPlatform.getDeviceGBId());
}
- DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
+ DeviceChannel deviceChannel = storager.queryChannel(channel.getDeviceId(), channel.getChannelId());
deviceChannel.setParental(0);
- deviceChannel.setParentId(channelReduce.getCatalogId());
+ deviceChannel.setParentId(channel.getCatalogId());
+ deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0, 6));
cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
// 闃叉鍙戦�佽繃蹇�
Thread.sleep(100);
--
Gitblit v1.8.0