From b0e494b842448568b6c20c9fbc7baa1df106b595 Mon Sep 17 00:00:00 2001
From: 朱俊杰 <502612493@qq.com>
Date: 星期二, 29 三月 2022 17:31:41 +0800
Subject: [PATCH] 2个小bug
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 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 c6c1ab9..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
@@ -1,10 +1,7 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-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.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;
@@ -67,20 +64,58 @@
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();
- // 鍥炲绾ц仈鐨勯�氶亾
- if (channelReduces.size() > 0) {
- for (ChannelReduce channelReduce : channelReduces) {
- DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
+ int size = deviceChannels.size() + gbStreams.size();
+ // 鍥炲鐩綍淇℃伅
+ List<PlatformCatalog> catalogs = storager.queryCatalogInPlatform(parentPlatform.getServerGBId());
+ if (catalogs.size() > 0) {
+ for (PlatformCatalog catalog : catalogs) {
+ if (catalog.getParentId().equals(catalog.getPlatformId())) {
+ catalog.setParentId(parentPlatform.getDeviceGBId());
+ }
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(catalog.getId());
+ deviceChannel.setName(catalog.getName());
+ deviceChannel.setLongitude(0.0);
+ deviceChannel.setLatitude(0.0);
+ deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
+ deviceChannel.setManufacture("wvp-pro");
+ deviceChannel.setStatus(1);
+ deviceChannel.setParental(1);
+ deviceChannel.setParentId(catalog.getParentId());
+ deviceChannel.setRegisterWay(1);
+ deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
+ deviceChannel.setModel("live");
+ deviceChannel.setOwner("wvp-pro");
+ deviceChannel.setSecrecy("0");
cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
+ // 闃叉鍙戦�佽繃蹇�
+ Thread.sleep(100);
+ }
+ }
+ // 鍥炲绾ц仈鐨勯�氶亾
+ if (deviceChannels.size() > 0) {
+ for (DeviceChannelInPlatform channel : deviceChannels) {
+ if (channel.getCatalogId().equals(parentPlatform.getServerGBId())) {
+ channel.setCatalogId(parentPlatform.getDeviceGBId());
+ }
+ DeviceChannel deviceChannel = storager.queryChannel(channel.getDeviceId(), channel.getChannelId());
+ deviceChannel.setParental(0);
+ deviceChannel.setParentId(channel.getCatalogId());
+ deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0, 6));
+ cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
+ // 闃叉鍙戦�佽繃蹇�
+ Thread.sleep(100);
}
}
// 鍥炲鐩存挱鐨勯�氶亾
if (gbStreams.size() > 0) {
for (GbStream gbStream : gbStreams) {
+ if (gbStream.getCatalogId().equals(parentPlatform.getServerGBId())) {
+ gbStream.setCatalogId(null);
+ }
DeviceChannel deviceChannel = new DeviceChannel();
deviceChannel.setChannelId(gbStream.getGbId());
deviceChannel.setName(gbStream.getName());
@@ -89,16 +124,16 @@
deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro");
deviceChannel.setStatus(gbStream.isStatus()?1:0);
- // deviceChannel.setParentId(parentPlatform.getDeviceGBId());
+ deviceChannel.setParentId(gbStream.getCatalogId());
deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(config.getDomain());
+ deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
deviceChannel.setParental(0);
deviceChannel.setSecrecy("0");
- deviceChannel.setSecrecy("0");
-
cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
+ // 闃叉鍙戦�佽繃蹇�
+ Thread.sleep(100);
}
}
if (size == 0) {
@@ -111,6 +146,8 @@
e.printStackTrace();
} catch (ParseException e) {
e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
}
}
--
Gitblit v1.8.0