648540858
2022-05-25 632630817b2d9c58b3c57574e88eb62a9b2714d1
Merge pull request #492 from mk1990/wvp-28181-2.0

解决海康设备在实时监控模块中无法获取到通道信息
1个文件已修改
3 ■■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -315,6 +315,9 @@
        List<DeviceChannel> all;
        if (catalogUnderDevice != null && catalogUnderDevice) {
            all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online);
            // 海康设备的parentId是SIP id
            List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, sipConfig.getId(), query, hasSubChannel, online);
            all.addAll(deviceChannels);
        }else {
            all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online);
        }