Commit f513f5ef67409a0db26d85a95a5e3b127595aaca
1 parent
4e134893
解决海康设备在实时监控模块中无法获取到通道信息
Showing
1 changed file
with
4 additions
and
1 deletions
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
| @@ -30,7 +30,7 @@ import org.springframework.util.StringUtils; | @@ -30,7 +30,7 @@ import org.springframework.util.StringUtils; | ||
| 30 | import java.util.*; | 30 | import java.util.*; |
| 31 | import java.util.concurrent.ConcurrentHashMap; | 31 | import java.util.concurrent.ConcurrentHashMap; |
| 32 | 32 | ||
| 33 | -/** | 33 | +/** |
| 34 | * 视频设备数据存储-jdbc实现 | 34 | * 视频设备数据存储-jdbc实现 |
| 35 | * swwheihei | 35 | * swwheihei |
| 36 | * 2020年5月6日 下午2:31:42 | 36 | * 2020年5月6日 下午2:31:42 |
| @@ -315,6 +315,9 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { | @@ -315,6 +315,9 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { | ||
| 315 | List<DeviceChannel> all; | 315 | List<DeviceChannel> all; |
| 316 | if (catalogUnderDevice != null && catalogUnderDevice) { | 316 | if (catalogUnderDevice != null && catalogUnderDevice) { |
| 317 | all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online); | 317 | all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online); |
| 318 | + // 海康设备的parentId是SIP id | ||
| 319 | + List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, sipConfig.getId(), query, hasSubChannel, online); | ||
| 320 | + all.addAll(deviceChannels); | ||
| 318 | }else { | 321 | }else { |
| 319 | all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online); | 322 | all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online); |
| 320 | } | 323 | } |