wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1465' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-10-18 10:24:14 +08:00
commit 076647df3f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageGroupNodeServiceImpl.java
View File

@ -79,8 +79,9 @@ public class MessageGroupNodeServiceImpl implements MessageGroupNodeService {
@Override @Override
public void addGroupNode(MessageGroupNodeSaveOrUpdateParam param) { public void addGroupNode(MessageGroupNodeSaveOrUpdateParam param) {
GroupTreeNodeDTO parent = messageGroupTreeNodeCacheService.queryNode(param.getParentNodeCode()) GroupTreeNodeDTO parent = StringUtils.isBlank(param.getParentNodeCode()) ? null :
.orElseThrow(() -> new ServiceException("parentNodeCode is invalid")); messageGroupTreeNodeCacheService.queryNode(param.getParentNodeCode())
.orElseThrow(() -> new ServiceException("parentNodeCode is invalid"));
// 合法性校验 // 合法性校验
checkCreateRule(parent, param); checkCreateRule(parent, param);
// 存储 // 存储
@ -148,7 +149,9 @@ public class MessageGroupNodeServiceImpl implements MessageGroupNodeService {
} }
private void checkCreateRule(GroupTreeNodeDTO parent, MessageGroupNodeSaveOrUpdateParam param) { private void checkCreateRule(GroupTreeNodeDTO parent, MessageGroupNodeSaveOrUpdateParam param) {
AssertUtil.isTrue(parent.getCategory().getLevel() < param.getCategory().getLevel(), "父节点的类型非法"); if (Objects.nonNull(parent)) {
AssertUtil.isTrue(parent.getCategory().getLevel() < param.getCategory().getLevel(), "父节点的类型非法");
}
} }
private void checkDeleteRule(String nodeCode) { private void checkDeleteRule(String nodeCode) {

11
msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/GroupTreeNodeDTO.java
View File

@ -63,22 +63,23 @@ public class GroupTreeNodeDTO implements IBaseTree<GroupTreeNodeDTO, String>, Se
private List<GroupTreeNodeDTO> nodeChildren = Collections.emptyList(); private List<GroupTreeNodeDTO> nodeChildren = Collections.emptyList();
public MessageGroupTreeNodeResponse toMessageGroupTreeNodeResponse() { public MessageGroupTreeNodeResponse toMessageGroupTreeNodeResponse() {
List<MessageGroupTreeNodeResponse> children = Optional.ofNullable(nodeChildren)
.map(v -> v.stream().map(GroupTreeNodeDTO::toMessageGroupTreeNodeResponse).collect(Collectors.toList()))
.orElseGet(Collections::emptyList);
return MessageGroupTreeNodeResponse.builder() return MessageGroupTreeNodeResponse.builder()
.category(category) .category(category)
.nodeName(nodeName) .nodeName(nodeName)
.nodeCode(nodeCode) .nodeCode(nodeCode)
.parentNodeCode(parentNodeCode) .parentNodeCode(parentNodeCode)
.children(nodeChildren.stream() .children(children)
.map(GroupTreeNodeDTO::toMessageGroupTreeNodeResponse)
.collect(Collectors.toList()))
.build(); .build();
} }
public Optional<GroupTreeNodeDTO> getChild(String treeNodeCode) { public Optional<GroupTreeNodeDTO> getChild(String treeNodeCode) {
if (StringUtils.isBlank(treeNodeCode)) { if (StringUtils.isBlank(treeNodeCode) || Objects.isNull(nodeChildren)) {
return Optional.empty(); return Optional.empty();
} }
return getNodeChildren().stream() return nodeChildren.stream()
.filter(e -> Objects.equals(e.getNodeCode(), treeNodeCode)) .filter(e -> Objects.equals(e.getNodeCode(), treeNodeCode))
.findFirst(); .findFirst();
} }