Commit b0e494b842448568b6c20c9fbc7baa1df106b595

Authored by 朱俊杰
1 parent ee490f5b

2个小bug

1、add update事件调用错误函数
2、在线的还发在线事件,如果别人正在给你推送目录就会不停的update设备表,设备表又没加锁,页面就无法更改设备信息了。。。
src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
@@ -165,7 +165,7 @@ public class CatalogEventLister implements ApplicationListener<CatalogEvent> { @@ -165,7 +165,7 @@ public class CatalogEventLister implements ApplicationListener<CatalogEvent> {
165 GbStream gbStream = storager.queryStreamInParentPlatform(platform.getServerGBId(), gbId); 165 GbStream gbStream = storager.queryStreamInParentPlatform(platform.getServerGBId(), gbId);
166 DeviceChannel deviceChannelByStream = gbStreamService.getDeviceChannelListByStream(gbStream, gbStream.getCatalogId(), platform.getDeviceGBId()); 166 DeviceChannel deviceChannelByStream = gbStreamService.getDeviceChannelListByStream(gbStream, gbStream.getCatalogId(), platform.getDeviceGBId());
167 deviceChannelList.add(deviceChannelByStream); 167 deviceChannelList.add(deviceChannelByStream);
168 - sipCommanderFroPlatform.sendNotifyForCatalogOther(event.getType(), platform, deviceChannelList, subscribeInfo, null); 168 + sipCommanderFroPlatform.sendNotifyForCatalogAddOrUpdate(event.getType(), platform, deviceChannelList, subscribeInfo, null);
169 } 169 }
170 } 170 }
171 } 171 }
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
@@ -309,7 +309,7 @@ public class NotifyRequestProcessor extends SIPRequestProcessorParent implements @@ -309,7 +309,7 @@ public class NotifyRequestProcessor extends SIPRequestProcessorParent implements
309 309
310 } 310 }
311 311
312 - if (offLineDetector.isOnline(deviceId)) { 312 + if (!offLineDetector.isOnline(deviceId)) {
313 publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE); 313 publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_MESSAGE);
314 } 314 }
315 } 315 }