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 17:21:08 +08:00
parent 4c497ef411
commit 53f2f36f37
7 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.GbCode;
import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
import com.genersoft.iot.vmp.gb28181.controller.bean.ChannelReduce;
import com.genersoft.iot.vmp.gb28181.dao.DeviceChannelMapper;
@@ -601,12 +602,18 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
PageHelper.startPage(page, count);
String civilCode = null;
String parentId = null;
String businessGroupId = null;
if (channelId.length() <= 8) {
civilCode = channelId;
}else {
parentId = channelId;
GbCode decode = GbCode.decode(channelId);
if (Integer.parseInt(decode.getTypeCode()) == 215) {
businessGroupId = channelId;
}else {
parentId = channelId;
}
}
List<DeviceChannel> all = channelMapper.queryChannels(deviceDbId, civilCode, parentId, query, channelType, online,null);
List<DeviceChannel> all = channelMapper.queryChannels(deviceDbId, civilCode, businessGroupId, parentId, query, channelType, online,null);
return new PageInfo<>(all);
}
@@ -623,7 +630,7 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
}
// 获取到所有正在播放的流
PageHelper.startPage(page, count);
List<DeviceChannel> all = channelMapper.queryChannels(device.getId(), null,null, query, hasSubChannel, online,null);
List<DeviceChannel> all = channelMapper.queryChannels(device.getId(), null,null, null, query, hasSubChannel, online,null);
return new PageInfo<>(all);
}