Browse Source
Merge pull request #492 from mk1990/wvp-28181-2.0
解决海康设备在实时监控模块中无法获取到通道信息
pull/490/merge
648540858
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files 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; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
import java.util.concurrent.ConcurrentHashMap; |
|
|
import java.util.concurrent.ConcurrentHashMap; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 视频设备数据存储-jdbc实现 |
|
|
* 视频设备数据存储-jdbc实现 |
|
|
* swwheihei |
|
|
* swwheihei |
|
|
* 2020年5月6日 下午2:31:42 |
|
|
* 2020年5月6日 下午2:31:42 |
|
|
@ -315,6 +315,9 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { |
|
|
List<DeviceChannel> all; |
|
|
List<DeviceChannel> all; |
|
|
if (catalogUnderDevice != null && catalogUnderDevice) { |
|
|
if (catalogUnderDevice != null && catalogUnderDevice) { |
|
|
all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online); |
|
|
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 { |
|
|
}else { |
|
|
all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online); |
|
|
all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online); |
|
|
} |
|
|
} |
|
|
|
