Merge pull request #492 from mk1990/wvp-28181-2.0

648540858

2022-05-25 632630817b2d9c58b3c57574e88eb62a9b2714d1

Merge pull request #492 from mk1990/wvp-28181-2.0

解决海康设备在实时监控模块中无法获取到通道信息

 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java

@@ -30,7 +30,7 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

/**    
/**
 * 视频设备数据存储-jdbc实现
 * swwheihei
 * 2020年5月6日 下午2:31:42
@@ -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);
        }