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/query/cmd/CatalogQueryMessageHandler.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
index 925a21e..40e5297 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
@@ -67,12 +67,12 @@
Element snElement = rootElement.element("SN");
String sn = snElement.getText();
// 鍑嗗鍥炲閫氶亾淇℃伅
- List<ChannelReduce> channelReduces = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
+ List<DeviceChannelInPlatform> deviceChannelInPlatforms = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
// 鏌ヨ鍏宠仈鐨勭洿鎾�氶亾
List<GbStream> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
// 鍥炲鐩綍淇℃伅
List<PlatformCatalog> catalogs = storager.queryCatalogInPlatform(parentPlatform.getServerGBId());
- int size = catalogs.size() + channelReduces.size() + gbStreams.size();
+ int size = catalogs.size() + deviceChannelInPlatforms.size() + gbStreams.size();
if (catalogs.size() > 0) {
for (PlatformCatalog catalog : catalogs) {
if (catalog.getParentId().equals(parentPlatform.getServerGBId())) {
@@ -89,7 +89,7 @@
deviceChannel.setParental(1);
deviceChannel.setParentId(catalog.getParentId());
deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(config.getDomain().substring(0, config.getDomain().length() - 2));
+ deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
deviceChannel.setSecrecy("0");
@@ -99,14 +99,15 @@
}
}
// 鍥炲绾ц仈鐨勯�氶亾
- if (channelReduces.size() > 0) {
- for (ChannelReduce channelReduce : channelReduces) {
- if (channelReduce.getCatalogId().equals(parentPlatform.getServerGBId())) {
- channelReduce.setCatalogId(parentPlatform.getDeviceGBId());
+ if (deviceChannelInPlatforms.size() > 0) {
+ for (DeviceChannelInPlatform channel : deviceChannelInPlatforms) {
+ 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);
@@ -128,7 +129,7 @@
deviceChannel.setStatus(gbStream.isStatus()?1:0);
deviceChannel.setParentId(gbStream.getCatalogId());
deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(config.getDomain().substring(0, config.getDomain().length() - 2));
+ deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
deviceChannel.setParental(0);
--
Gitblit v1.8.0