From 8ee7211ba3f5dd53901e1be73db7c7c2199fe12e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 七月 2022 16:05:23 +0800
Subject: [PATCH] 更新mysql.sql
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java | 64 +++----------------------------
1 files changed, 7 insertions(+), 57 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 cefee3f..7f6f817 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
@@ -70,74 +70,24 @@
Element snElement = rootElement.element("SN");
String sn = snElement.getText();
// 鍑嗗鍥炲閫氶亾淇℃伅
- List<DeviceChannelInPlatform> deviceChannelInPlatforms = storager.queryChannelListInParentPlatform(parentPlatform.getServerGBId());
+ List<DeviceChannel> deviceChannelInPlatforms = storager.queryChannelWithCatalog(parentPlatform.getServerGBId());
// 鏌ヨ鍏宠仈鐨勭洿鎾�氶亾
- List<GbStream> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
+ List<DeviceChannel> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
// 鍥炲鐩綍淇℃伅
- List<PlatformCatalog> catalogs = storager.queryCatalogInPlatform(parentPlatform.getServerGBId());
+ List<DeviceChannel> catalogs = storager.queryCatalogInPlatform(parentPlatform.getServerGBId());
List<DeviceChannel> allChannels = new ArrayList<>();
+
if (catalogs.size() > 0) {
- for (PlatformCatalog catalog : catalogs) {
- if (catalog.getParentId().equals(catalog.getPlatformId())) {
- catalog.setParentId(parentPlatform.getDeviceGBId());
- }
- DeviceChannel deviceChannel = new DeviceChannel();
- // 閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝
- deviceChannel.setChannelType(2);
- deviceChannel.setChannelId(catalog.getId());
- deviceChannel.setName(catalog.getName());
- deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
- deviceChannel.setManufacture("wvp-pro");
- deviceChannel.setStatus(1);
- deviceChannel.setParental(1);
- deviceChannel.setParentId(catalog.getParentId());
- deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
- allChannels.add(deviceChannel);
- }
+ allChannels.addAll(catalogs);
}
// 鍥炲绾ц仈鐨勯�氶亾
if (deviceChannelInPlatforms.size() > 0) {
- for (DeviceChannelInPlatform channel : deviceChannelInPlatforms) {
- if (channel.getCatalogId().equals(parentPlatform.getServerGBId())) {
- channel.setCatalogId(parentPlatform.getDeviceGBId());
- }
- DeviceChannel deviceChannel = storage.queryChannel(channel.getDeviceId(), channel.getChannelId());
- // 閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝
- deviceChannel.setChannelType(0);
- deviceChannel.setParental(0);
- deviceChannel.setParentId(channel.getCatalogId());
- deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0, 6));
- allChannels.add(deviceChannel);
- }
+ allChannels.addAll(deviceChannelInPlatforms);
}
// 鍥炲鐩存挱鐨勯�氶亾
if (gbStreams.size() > 0) {
- for (GbStream gbStream : gbStreams) {
- if (gbStream.getCatalogId().equals(parentPlatform.getServerGBId())) {
- gbStream.setCatalogId(null);
- }
- DeviceChannel deviceChannel = new DeviceChannel();
- // 閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝
- deviceChannel.setChannelType(1);
- deviceChannel.setChannelId(gbStream.getGbId());
- deviceChannel.setName(gbStream.getName());
- deviceChannel.setLongitude(gbStream.getLongitude());
- deviceChannel.setLatitude(gbStream.getLatitude());
- deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
- deviceChannel.setManufacture("wvp-pro");
-// deviceChannel.setStatus(gbStream.isStatus()?1:0);
- deviceChannel.setStatus(1);
- deviceChannel.setParentId(gbStream.getCatalogId());
- deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
- deviceChannel.setModel("live");
- deviceChannel.setOwner("wvp-pro");
- deviceChannel.setParental(0);
- deviceChannel.setSecrecy("0");
- allChannels.add(deviceChannel);
- }
+ allChannels.addAll(gbStreams);
}
if (allChannels.size() > 0) {
cmderFroPlatform.catalogQuery(allChannels, parentPlatform, sn, fromHeader.getTag());
--
Gitblit v1.8.0