roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复国标设备/设备列表中行政区划的子节点查看

Browse Source
This commit is contained in:
648540858
2024-10-22 16:27:53 +08:00
parent 1671716480
commit 4c497ef411
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
View File

@@ -599,7 +599,14 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
@Override
public PageInfo<DeviceChannel> getSubChannels(int deviceDbId, String channelId, String query, Boolean channelType, Boolean online, int page, int count) {
PageHelper.startPage(page, count);
List<DeviceChannel> all = channelMapper.queryChannels(deviceDbId, channelId, query, channelType, online,null);
String civilCode = null;
String parentId = null;
if (channelId.length() <= 8) {
civilCode = channelId;
}else {
parentId = channelId;
}
List<DeviceChannel> all = channelMapper.queryChannels(deviceDbId, civilCode, parentId, query, channelType, online,null);
return new PageInfo<>(all);
}
@@ -616,7 +623,7 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
}
// 获取到所有正在播放的流
PageHelper.startPage(page, count);
List<DeviceChannel> all = channelMapper.queryChannels(device.getId(), null, query, hasSubChannel, online,null);
List<DeviceChannel> all = channelMapper.queryChannels(device.getId(), null,null, query, hasSubChannel, online,null);
return new PageInfo<>(all);
}