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

临时提交

Browse Source
This commit is contained in:
panlinlin
2024-08-17 07:01:40 +08:00
parent aeb3cd6a22
commit 635458d19a
4 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
View File

@@ -20,10 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.*;
@Slf4j
@Service
@@ -328,10 +325,10 @@ public class GbChannelServiceImpl implements IGbChannelService {
// 是否包含行政区划信息
if (platform.getCatalogWithRegion()) {
List<Region> regionChannelList = regionMapper.queryInChannelList(commonGBChannelList);
Set<Region> regionChannelList = regionMapper.queryInChannelList(commonGBChannelList);
if (!regionChannelList.isEmpty()) {
// 获取这些节点的所有父节点
List<Region> allRegion = getAllRegion(regionChannelList);
// 获取这些节点的所有父节点, 使用set滤重
Set<Region> allRegion = getAllRegion(regionChannelList);
for (Region region : allRegion) {
channelList.add(CommonGBChannel.build(region));
}
@@ -339,25 +336,41 @@ public class GbChannelServiceImpl implements IGbChannelService {
}
// 是否包含分组信息
if (platform.getCatalogWithGroup()) {
List<CommonGBChannel> groupChannelList = groupMapper.queryInChannelList(commonGBChannelList);
Set<Group> groupChannelList = groupMapper.queryInChannelList(commonGBChannelList);
if (!groupChannelList.isEmpty()) {
// 获取这些节点的所有父节点
channelList.addAll(groupChannelList);
Set<Group> allGroup = getAllGroup(groupChannelList);
for (Group group : allGroup) {
channelList.add(CommonGBChannel.build(group));
}
}
}
channelList.addAll(commonGBChannelList);
return channelList;
}
private List<Region> getAllRegion(List<Region> regionChannelList ) {
private Set<Region> getAllRegion(Set<Region> regionChannelList ) {
if (regionChannelList.isEmpty()) {
return new ArrayList<>();
return new HashSet<>();
}
List<Region> channelList = regionMapper.queryParentInChannelList(regionChannelList);
Set<Region> channelList = regionMapper.queryParentInChannelList(regionChannelList);
if (channelList.isEmpty()) {
return channelList;
}
List<Region> allParentRegion = getAllRegion(channelList);
Set<Region> allParentRegion = getAllRegion(channelList);
channelList.addAll(allParentRegion);
return channelList;
}
private Set<Group> getAllGroup(Set<Group> regionChannelList ) {
if (regionChannelList.isEmpty()) {
return new HashSet<>();
}
Set<Group> channelList = groupMapper.queryParentInChannelList(regionChannelList);
if (channelList.isEmpty()) {
return channelList;
}
Set<Group> allParentRegion = getAllGroup(channelList);
channelList.addAll(allParentRegion);
return channelList;
}