Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user