648540858
2022-01-19 6ba8ab22b54e83d0e0edabb9d0fdc8870b86e98f
修复推流生成通道未通知上级平台的问题,添加注册时清楚脏数据。
2个文件已修改
13 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -90,8 +90,13 @@
            AddressImpl address = (AddressImpl) fromHeader.getAddress();
            SipUri uri = (SipUri) address.getURI();
            String deviceId = uri.getUser();
            Device device = redisCatchStorage.getDevice(deviceId);
            AuthorizationHeader authorhead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
            Device deviceInRedis = redisCatchStorage.getDevice(deviceId);
            Device device = storager.queryVideoDevice(deviceId);
            if (deviceInRedis != null && device == null) {
                // redis 存在脏数据
                redisCatchStorage.clearCatchByDeviceId(deviceId);
            }
            AuthorizationHeader authorhead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
            // 校验密码是否正确
            if (authorhead != null) {
                passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request,
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -814,9 +814,11 @@
                    streamPushItem.setCatalogId(parentPlatform.getCatalogId());
                    streamPushItem.setPlatformId(parentPlatform.getServerGBId());
                    String stream = streamPushItem.getStream();
                    StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(streamPushItem.getApp(), stream, parentPlatform.getServerGBId());
                    StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(streamPushItem.getApp(), stream,
                            parentPlatform.getServerGBId());
                    if (streamProxyItems == null) {
                        platformGbStreamMapper.add(streamPushItem);
                        eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), streamPushItem, CatalogEvent.ADD);
                    }
                }
            }