wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:[REQ-3282] 将通用能力放在foundation层中

Browse Source
This commit is contained in:
liuyang 2024-12-26 10:30:33 +08:00
parent 8e95bafe08
commit 54c88183d3
3 changed files with 137 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/foundation/NodeFoundationService.java
View File

@ -1,15 +1,18 @@
package cn.axzo.orgmanax.server.node.foundation;
import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO;
import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
import cn.axzo.orgmanax.server.node.foundation.req.NodeCreate;
import cn.axzo.orgmanax.server.node.foundation.req.NodeUpdate;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
public interface NodeFoundationService {
/**
@ -30,6 +33,7 @@ public interface NodeFoundationService {
@Transactional(rollbackFor = Throwable.class)
OrganizationalNode update(NodeUpdate req);
/**
* 提取祖级的数据
* @param list
@ -60,4 +64,37 @@ public interface NodeFoundationService {
* @return
*/
<R, T extends OrganizationalNode> Set<R> extract(List<T> currentNodeList, Function<T, R> function);
/**
* 聚合祖父节点
*
* @param nodes
* @param ancestorNodes
*/
void assembleAncestorNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> ancestorNodes);
/**
* 聚合上级节点
*
* @param nodes
* @param parentNodes
*/
void assembleParentNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> parentNodes);
/**
* 聚合子孙节点
*
* @param nodes
* @param descendantNodes
*/
void assembleDescendantNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> descendantNodes);
/**
* 聚合子节点
*
* @param nodes
* @param childrenNodes
*/
void assembleChildrenNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> childrenNodes);
}

89
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/foundation/impl/NodeFoundationServiceImpl.java
View File

@ -3,6 +3,7 @@ package cn.axzo.orgmanax.server.node.foundation.impl;
import cn.axzo.foundation.event.support.Event;
import cn.axzo.foundation.event.support.producer.EventProducer;
import cn.axzo.orgmanax.common.config.BizResultCode;
import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO;
import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
@ -121,4 +122,92 @@ public class NodeFoundationServiceImpl implements NodeFoundationService {
public <R, T extends OrganizationalNode> Set<R> extract(List<T> list, Function<T, R> function) {
return list.stream().map(function).collect(Collectors.toSet());
}
/**
* 聚合祖父节点
*
* @param nodes
* @param ancestorNodes
*/
@Override
public void assembleAncestorNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> ancestorNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(ancestorNodes)) {
return;
}
Map<Long, OrganizationalNode> parentNodeMap = ancestorNodes.stream().collect(Collectors.toMap(OrganizationalNode::getId, Function.identity()));
nodes.forEach(e -> {
String[] parentIds = e.getPath().split(",");
e.setAncestorNodes(Arrays.stream(parentIds)
.map(Long::valueOf)
.map(parentNodeMap::get)
.map(t -> BeanUtil.copyProperties(t, OrgNodeDTO.class))
.filter(Objects::nonNull)
.collect(Collectors.toList()));
});
}
/**
* 聚合祖父节点
*
* @param nodes
* @param parentNodes
*/
@Override
public void assembleParentNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> parentNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(parentNodes)) {
return;
}
Map<Long, OrganizationalNode> parentNodeMap = parentNodes.stream().collect(Collectors.toMap(OrganizationalNode::getId, Function.identity()));
nodes.forEach(e -> {
Long parentId = e.getParentId();
if (Objects.isNull(parentId) || parentId == 0) {
return;
}
OrganizationalNode nodeResp = parentNodeMap.get(parentId);
e.setParentNode(BeanUtil.copyProperties(nodeResp, OrgNodeDTO.class));
});
}
/**
* 聚合祖父节点
*
* @param nodes
* @param descendantNodes
*/
@Override
public void assembleDescendantNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> descendantNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(descendantNodes)) {
return;
}
nodes.forEach(e -> {
e.setDescendantNodes(descendantNodes.stream()
.filter(t -> t.getPath().startsWith(e.getPath()))
.map(t -> BeanUtil.copyProperties(t, OrgNodeDTO.class))
.filter(Objects::nonNull)
.collect(Collectors.toList()));
});
}
/**
* 聚合祖父节点
*
* @param nodes
* @param childrenNodes
*/
@Override
public void assembleChildrenNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> childrenNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(childrenNodes)) {
return;
}
Map<Long, List<OrgNodeDTO>> childrenNodeMap = childrenNodes
.stream()
.map(t -> BeanUtil.copyProperties(t, OrgNodeDTO.class))
.collect(Collectors.groupingBy(OrgNodeDTO::getParentId));
nodes.forEach(e -> {
List<OrgNodeDTO> orgNodeDTOS = childrenNodeMap.get(e.getId());
e.setChildrenNodes(CollUtil.emptyIfNull(orgNodeDTOS));
});
}
}

95
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java
View File

@ -144,7 +144,7 @@ public class NodeServiceImpl implements NodeService {
List<OrgNodeDTO> records = page.getData().stream().map(e -> BeanUtil.toBean(e, OrgNodeDTO.class)).collect(Collectors.toList());
// 是否包含协同关系
if (req.getIncludeCooperateShip()) {
if (BooleanUtil.isTrue(req.getIncludeCooperateShip())) {
assembleCooperateShip(records, req.getIncludeCooperateTypes());
}
@ -153,7 +153,7 @@ public class NodeServiceImpl implements NodeService {
if (BooleanUtil.isTrue(req.getIncludeParent())) {
Set<Long> parentIds = nodeFoundationService.extractParentIds(page.getData());
List<OrganizationalNode> parentNodes = nodeQueryRepository.list(NodeQueryRepository.ListReq.builder().ids(parentIds).build());
assembleParentNodes(records, parentNodes);
nodeFoundationService.assembleParentNodes(records, parentNodes);
}
// 是否查询祖父节点
@ -161,8 +161,8 @@ public class NodeServiceImpl implements NodeService {
Set<Long> ancestorIds = nodeFoundationService.extractAncestorIds(page.getData());
List<OrganizationalNode> parentNodes = nodeQueryRepository.list(NodeQueryRepository.ListReq.builder().ids(ancestorIds).build());
if (CollUtil.isNotEmpty(parentNodes)) {
assembleParentNodes(records, parentNodes);
assembleAncestorNodes(records, parentNodes);
nodeFoundationService.assembleParentNodes(records, parentNodes);
nodeFoundationService.assembleAncestorNodes(records, parentNodes);
}
}
@ -172,8 +172,8 @@ public class NodeServiceImpl implements NodeService {
List<OrganizationalNode> descendantsNodes = nodeQueryRepository.list(
NodeQueryRepository.ListReq.builder()
.pathsRight(paths).build());
assembleChildrenNodes(records, descendantsNodes);
assembleDescendantNodes(records, descendantsNodes);
nodeFoundationService.assembleChildrenNodes(records, descendantsNodes);
nodeFoundationService.assembleDescendantNodes(records, descendantsNodes);
}
// 是否查询子节点
@ -182,94 +182,17 @@ public class NodeServiceImpl implements NodeService {
List<OrganizationalNode> childrenNodes = nodeQueryRepository.list(
NodeQueryRepository.ListReq.builder()
.parentIds(ids).build());
assembleChildrenNodes(records, childrenNodes);
nodeFoundationService.assembleChildrenNodes(records, childrenNodes);
}
return new PageResp<>(page.getTotal(), page.getSize(), page.getCurrent(), records);
}
/**
* 聚合祖父节点
*
* 聚合协同关系
* @param nodes
* @param ancestorNodes
* @param cooperateTypes
*/
public void assembleAncestorNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> ancestorNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(ancestorNodes)) {
return;
}
Map<Long, OrganizationalNode> parentNodeMap = ancestorNodes.stream().collect(Collectors.toMap(OrganizationalNode::getId, Function.identity()));
nodes.forEach(e -> {
String[] parentIds = e.getPath().split(",");
e.setAncestorNodes(Arrays.stream(parentIds)
.map(Long::valueOf)
.map(parentNodeMap::get)
.map(t -> BeanUtil.copyProperties(t, OrgNodeDTO.class))
.filter(Objects::nonNull)
.collect(Collectors.toList()));
});
}
/**
* 聚合祖父节点
*
* @param nodes
* @param parentNodes
*/
public void assembleParentNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> parentNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(parentNodes)) {
return;
}
Map<Long, OrganizationalNode> parentNodeMap = parentNodes.stream().collect(Collectors.toMap(OrganizationalNode::getId, Function.identity()));
nodes.forEach(e -> {
Long parentId = e.getParentId();
if (Objects.isNull(parentId) || parentId == 0) {
return;
}
OrganizationalNode nodeResp = parentNodeMap.get(parentId);
e.setParentNode(BeanUtil.copyProperties(nodeResp, OrgNodeDTO.class));
});
}
/**
* 聚合祖父节点
*
* @param nodes
* @param descendantNodes
*/
public void assembleDescendantNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> descendantNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(descendantNodes)) {
return;
}
nodes.forEach(e -> {
e.setDescendantNodes(descendantNodes.stream()
.filter(t -> t.getPath().startsWith(e.getPath()))
.map(t -> BeanUtil.copyProperties(t, OrgNodeDTO.class))
.filter(Objects::nonNull)
.collect(Collectors.toList()));
});
}
/**
* 聚合祖父节点
*
* @param nodes
* @param childrenNodes
*/
public void assembleChildrenNodes(List<OrgNodeDTO> nodes, List<OrganizationalNode> childrenNodes) {
if (CollUtil.isEmpty(nodes) || CollUtil.isEmpty(childrenNodes)) {
return;
}
Map<Long, List<OrgNodeDTO>> childrenNodeMap = childrenNodes
.stream()
.map(t -> BeanUtil.copyProperties(t, OrgNodeDTO.class))
.collect(Collectors.groupingBy(OrgNodeDTO::getParentId));
nodes.forEach(e -> {
List<OrgNodeDTO> orgNodeDTOS = childrenNodeMap.get(e.getId());
e.setChildrenNodes(CollUtil.emptyIfNull(orgNodeDTOS));
});
}
private void assembleCooperateShip(List<OrgNodeDTO> nodes, Set<Integer> cooperateTypes) {
List<Long> nodeTopNodeIds = nodes.stream().map(OrgNodeDTO::getTopNodeId).distinct().collect(Collectors.toList());
Map<Long, SaasCooperateShip> cooperateShips = cooperateShipQueryRepository.list(CooperateShipQueryRepository.ListReq.builder()