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 | 80 ++++++++++------------------------------
1 files changed, 20 insertions(+), 60 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 6ca608c..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
@@ -8,8 +8,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.QueryMessageHandler;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -23,6 +22,7 @@
import javax.sip.header.FromHeader;
import javax.sip.message.Response;
import java.text.ParseException;
+import java.util.ArrayList;
import java.util.List;
@Component
@@ -35,7 +35,7 @@
private QueryMessageHandler queryMessageHandler;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private SIPCommanderFroPlatform cmderFroPlatform;
@@ -45,6 +45,9 @@
@Autowired
private EventPublisher publisher;
+
+ @Autowired
+ private IVideoManagerStorage storage;
@Override
public void afterPropertiesSet() throws Exception {
@@ -67,79 +70,36 @@
Element snElement = rootElement.element("SN");
String sn = snElement.getText();
// 鍑嗗鍥炲閫氶亾淇℃伅
- List<ChannelReduce> channelReduces = 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());
- int size = catalogs.size() + channelReduces.size() + gbStreams.size();
+ List<DeviceChannel> catalogs = storager.queryCatalogInPlatform(parentPlatform.getServerGBId());
+
+ List<DeviceChannel> allChannels = new ArrayList<>();
+
if (catalogs.size() > 0) {
- for (PlatformCatalog catalog : catalogs) {
- 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(config.getDomain());
- deviceChannel.setModel("live");
- deviceChannel.setOwner("wvp-pro");
- deviceChannel.setSecrecy("0");
- cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
- // 闃叉鍙戦�佽繃蹇�
- Thread.sleep(10);
- }
+ allChannels.addAll(catalogs);
}
// 鍥炲绾ц仈鐨勯�氶亾
- if (channelReduces.size() > 0) {
- for (ChannelReduce channelReduce : channelReduces) {
- DeviceChannel deviceChannel = storager.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
- // TODO 鐩墠鏆傛椂璁や负杩欓噷鍙敤閫氶亾娌℃湁鐩綍
- deviceChannel.setParental(0);
- deviceChannel.setParentId(channelReduce.getCatalogId());
- cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
- // 闃叉鍙戦�佽繃蹇�
- Thread.sleep(10);
- }
+ if (deviceChannelInPlatforms.size() > 0) {
+ allChannels.addAll(deviceChannelInPlatforms);
}
// 鍥炲鐩存挱鐨勯�氶亾
if (gbStreams.size() > 0) {
- for (GbStream gbStream : gbStreams) {
- DeviceChannel deviceChannel = new DeviceChannel();
- 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.setParentId(gbStream.getCatalogId());
- deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(config.getDomain());
- deviceChannel.setModel("live");
- deviceChannel.setOwner("wvp-pro");
- deviceChannel.setParental(0);
- deviceChannel.setSecrecy("0");
-
- cmderFroPlatform.catalogQuery(deviceChannel, parentPlatform, sn, fromHeader.getTag(), size);
- }
+ allChannels.addAll(gbStreams);
}
- if (size == 0) {
+ if (allChannels.size() > 0) {
+ cmderFroPlatform.catalogQuery(allChannels, parentPlatform, sn, fromHeader.getTag());
+ }else {
// 鍥炲鏃犻�氶亾
- cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), size);
+ cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), 0);
}
} catch (SipException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
e.printStackTrace();
} catch (ParseException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0