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-08-21 17:40:01 +08:00
parent 88abf36d6f
commit a18fba8495
8 changed files with 239 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,37 +322,22 @@ public class GbChannelServiceImpl implements IGbChannelService {
CommonGBChannel channel = CommonGBChannel.build(platform);
channelList.add(channel);
}
// 是否包含行政区划信息
// 关联的行政区划信息
if (platform.getCatalogWithRegion()) {
Set<Region> regionChannelList = regionMapper.queryInChannelList(commonGBChannelList);
// 查询关联平台的行政区划信息
List<CommonGBChannel> regionChannelList = regionMapper.queryByPlatform(platform.getId());
if (!regionChannelList.isEmpty()) {
// 获取这些节点的所有父节点, 使用set滤重
Set<Region> allRegion = getAllRegion(regionChannelList);
allRegion.addAll(regionChannelList);
for (Region region : allRegion) {
channelList.add(CommonGBChannel.build(region));
}
channelList.addAll(regionChannelList);
}
}
// 是否包含分组信息
if (platform.getCatalogWithGroup()) {
// 虚拟组织
Set<Group> groupChannelList = groupMapper.queryInChannelList(commonGBChannelList);
// 业务分组
Set<Group> businessGroupChannelList = groupMapper.queryBusinessGroupInChannelList(commonGBChannelList);
// 关联的分组信息
List<CommonGBChannel> groupChannelList = groupMapper.queryForPlatform(platform.getId());
if (!groupChannelList.isEmpty()) {
// 获取这些节点的所有父节点
Set<Group> allGroup = getAllGroup(groupChannelList);
allGroup.addAll(groupChannelList);
if (!businessGroupChannelList.isEmpty()) {
allGroup.addAll(businessGroupChannelList);
}
for (Group group : allGroup) {
channelList.add(CommonGBChannel.build(group));
}
channelList.addAll(groupChannelList);
}
}
channelList.addAll(commonGBChannelList);
return channelList;
}
@@ -370,18 +355,7 @@ public class GbChannelServiceImpl implements IGbChannelService {
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;
}
@Override

104
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
View File

@@ -2,7 +2,10 @@ package com.genersoft.iot.vmp.gb28181.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
import com.genersoft.iot.vmp.gb28181.bean.Group;
import com.genersoft.iot.vmp.gb28181.bean.PlatformChannel;
import com.genersoft.iot.vmp.gb28181.dao.CommonGBChannelMapper;
import com.genersoft.iot.vmp.gb28181.dao.GroupMapper;
import com.genersoft.iot.vmp.gb28181.dao.PlatformChannelMapper;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
@@ -14,7 +17,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.beans.Transient;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* @author lin
@@ -28,7 +35,13 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
private PlatformChannelMapper platformChannelMapper;
@Autowired
EventPublisher eventPublisher;
private EventPublisher eventPublisher;
@Autowired
private GroupMapper groupMapper;
@Autowired
private CommonGBChannelMapper commonGBChannelMapper;
@Override
@@ -39,11 +52,21 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
}
@Override
@Transient
public int addAllChannel(Integer platformId) {
List<CommonGBChannel> channelListNotShare = platformChannelMapper.queryNotShare(platformId, null);
Assert.notEmpty(channelListNotShare, "所有通道已共享");
int result = platformChannelMapper.addChannels(platformId, channelListNotShare);
if (result > 0) {
// 查询通道相关的分组信息是否共享，如果没共享就添加
Set<Group> groupListNotShare = getGroupNotShareByChannelList(channelListNotShare, platformId);
int addGroupResult = platformChannelMapper.addPlatformGroup(new ArrayList<>(groupListNotShare), platformId);
if (addGroupResult > 0) {
for (Group group : groupListNotShare) {
// 分组信息排序时需要将顶层排在最后
channelListNotShare.add(0, CommonGBChannel.build(group));
}
}
// 发送消息
try {
// 发送catalog
@@ -55,12 +78,76 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
return result;
}
/**
* 获取通道使用的分组中未分享的
*/
private Set<Group> getGroupNotShareByChannelList(List<CommonGBChannel> channelList, Integer platformId) {
// 获取分组中未分享的节点
Set<Group> groupList = groupMapper.queryNotShareForPlatformByChannelList(channelList, platformId);
// 获取这些节点的所有父节点
if (groupList.isEmpty()) {
return new HashSet<>();
}
Set<Group> allGroup = getAllGroup(groupList);
// 获取全部节点中未分享的
return groupMapper.queryNotShareForPlatformByGroupList(allGroup, platformId);
}
/**
* 移除空的共享，并返回移除的分组
*/
private Set<Group> deleteEmptyGroup(Set<Group> groupSet, Integer platformId) {
for (Group group : groupSet) {
// 获取分组子节点
List<Group> children = platformChannelMapper.getShareChildrenGroup(group.getDeviceId(), platformId);
if (!children.isEmpty()) {
groupSet.remove(group);
continue;
}
// 获取分组关联的通道
List<CommonGBChannel> channelList = platformChannelMapper.queryShareChannelByParentId(group.getDeviceId(), platformId);
if (!channelList.isEmpty()) {
groupSet.remove(group);
continue;
}
platformChannelMapper.removePlatformGroupById(group.getId(), platformId);
}
if (!groupSet.isEmpty()) {
}
}
private Set<Group> getAllGroup(Set<Group> groupList ) {
if (groupList.isEmpty()) {
return new HashSet<>();
}
Set<Group> channelList = groupMapper.queryParentInChannelList(groupList);
if (channelList.isEmpty()) {
return channelList;
}
Set<Group> allParentRegion = getAllGroup(channelList);
channelList.addAll(allParentRegion);
return channelList;
}
@Override
@Transient
public int addChannels(Integer platformId, List<Integer> channelIds) {
List<CommonGBChannel> channelListNotShare = platformChannelMapper.queryNotShare(platformId, channelIds);
Assert.notEmpty(channelListNotShare, "通道已共享");
int result = platformChannelMapper.addChannels(platformId, channelListNotShare);
if (result > 0) {
// 查询通道相关的分组信息是否共享，如果没共享就添加
Set<Group> groupListNotShare = getGroupNotShareByChannelList(channelListNotShare, platformId);
int addGroupResult = platformChannelMapper.addPlatformGroup(new ArrayList<>(groupListNotShare), platformId);
if (addGroupResult > 0) {
for (Group group : groupListNotShare) {
// 分组信息排序时需要将顶层排在最后
channelListNotShare.add(0, CommonGBChannel.build(group));
}
}
// 发送消息
try {
// 发送catalog
@@ -78,6 +165,12 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
Assert.notEmpty(channelListNotShare, "未共享任何通道");
int result = platformChannelMapper.removeChannels(platformId, channelListNotShare);
if (result > 0) {
// 查询通道相关的分组信息是否共享，如果没共享就添加
Set<Group> groupSet = groupMapper.queryByChannelList(channelListNotShare);
Set<Group> deleteGroup = deleteEmptyGroup(groupSet, platformId);
if (!deleteGroup.isEmpty()) {
channelListNotShare.add(0, CommonGBChannel.build(group));
}
// 发送消息
try {
// 发送catalog
@@ -95,6 +188,15 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
Assert.notEmpty(channelList, "所选通道未共享");
int result = platformChannelMapper.removeChannels(platformId, channelList);
if (result > 0) {
// 查询通道相关的分组信息是否共享，如果没共享就添加
List<Group> groupListShareEmptyChannel = getGroupShareEmptyChannel(channelList, platformId);
int addGroupResult = platformChannelMapper.removePlatformGroup(groupListShareEmptyChannel, platformId);
if (addGroupResult > 0) {
for (Group group : groupListShareEmptyChannel) {
// 分组信息排序时需要将顶层排在最后
channelList.add(0, CommonGBChannel.build(group));
}
}
// 发送消息
try {
// 发送catalog