From f513f5ef67409a0db26d85a95a5e3b127595aaca Mon Sep 17 00:00:00 2001 From: mk1990 <153958232@qq.com> Date: Wed, 25 May 2022 14:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B5=B7=E5=BA=B7=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=9C=A8=E5=AE=9E=E6=97=B6=E7=9B=91=E6=8E=A7=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=B8=AD=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=88=B0?= =?UTF-8?q?=E9=80=9A=E9=81=93=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/storager/impl/VideoManagerStorageImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java index 1f359114..3bb3d9f0 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java +++ b/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.concurrent.ConcurrentHashMap; -/** +/** * 视频设备数据存储-jdbc实现 * swwheihei * 2020年5月6日 下午2:31:42 @@ -315,6 +315,9 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { List all; if (catalogUnderDevice != null && catalogUnderDevice) { all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online); + // 海康设备的parentId是SIP id + List deviceChannels = deviceChannelMapper.queryChannels(deviceId, sipConfig.getId(), query, hasSubChannel, online); + all.addAll(deviceChannels); }else { all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online); }