From a42dda2bd3cc1cf8c20cc61e7ad9211eadecbaf3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 24 二月 2022 16:55:06 +0800
Subject: [PATCH] 规范数据库，添加必要约束，优化通道批量导入功能
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
index 5f0d14d..c0de8de 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
@@ -35,6 +35,9 @@
@Autowired
private IVideoManagerStorager storager;
+
+ @Autowired
+ private IDeviceService deviceService;
@Autowired
private RedisUtil redis;
@@ -57,6 +60,7 @@
logger.debug("璁惧涓婄嚎浜嬩欢瑙﹀彂锛宒eviceId锛�" + event.getDevice().getDeviceId() + ",from:" + event.getFrom());
}
Device device = event.getDevice();
+ if (device == null) return;
String key = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_" + event.getDevice().getDeviceId();
switch (event.getFrom()) {
@@ -84,15 +88,18 @@
}
device.setOnline(1);
- Device deviceInstore = storager.queryVideoDevice(device.getDeviceId());
- if (deviceInstore != null && deviceInstore.getOnline() == 0) {
+ Device deviceInStore = storager.queryVideoDevice(device.getDeviceId());
+ if (deviceInStore != null && deviceInStore.getOnline() == 0) {
List<DeviceChannel> deviceChannelList = storager.queryOnlineChannelsByDeviceId(device.getDeviceId());
eventPublisher.catalogEventPublish(null, deviceChannelList, CatalogEvent.ON);
}
// 澶勭悊涓婄嚎鐩戝惉
storager.updateDevice(device);
- // TODO 涓婄嚎娣诲姞璁㈤槄
+ // 涓婄嚎娣诲姞璁㈤槄
+ if (device.getSubscribeCycleForCatalog() > 0) {
+ deviceService.addCatalogSubscribe(device);
+ }
}
}
--
Gitblit v1.8.0