Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

This commit is contained in:
szy833
2022-01-16 23:32:51 +08:00
committed by GitHub
11 changed files with 286 additions and 8 deletions

View File

@@ -85,7 +85,7 @@ public class OnlineEventListener implements ApplicationListener<OnlineEvent> {
device.setOnline(1);
Device deviceInstore = storager.queryVideoDevice(device.getDeviceId());
if (deviceInstore.getOnline() == 0) {
if (deviceInstore != null && deviceInstore.getOnline() == 0) {
List<DeviceChannel> deviceChannelList = storager.queryOnlineChannelsByDeviceId(device.getDeviceId());
eventPublisher.catalogEventPublish(null, deviceChannelList, CatalogEvent.ON);
}