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

feat:(REQ-2186) 修改清洗菜单parentId的私有接口

Browse Source
This commit is contained in:
lilong 2024-05-16 11:14:41 +08:00
parent ed670622d2
commit edba988a3e
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tyr-server/src/main/java/cn/axzo/tyr/server/controller/PrivateController.java
View File

@ -1,11 +1,13 @@
package cn.axzo.tyr.server.controller;
import cn.axzo.basics.common.util.TreeUtil;
import cn.axzo.tyr.client.common.enums.FeatureResourceType;
import cn.axzo.tyr.client.model.req.CommonDictQueryReq;
import cn.axzo.tyr.client.model.req.FeatureResourceTreeSaveReq;
import cn.axzo.tyr.client.model.req.GetFeatureResourceTreeReq;
import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq;
import cn.axzo.tyr.client.model.res.CommonDictResp;
import cn.axzo.tyr.client.model.res.FeatureResourceDTO;
import cn.axzo.tyr.client.model.res.FeatureResourceTreeNode;
import cn.axzo.tyr.client.model.res.SaasRoleRes;
import cn.axzo.tyr.client.model.vo.SaasRoleGroupVO;
@ -37,6 +39,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
@ -179,7 +182,23 @@ public class PrivateController {
GetFeatureResourceTreeReq getFeatureResourceTreeReq = GetFeatureResourceTreeReq.builder()
.terminals(Lists.newArrayList(request.getTerminal()))
.build();
List<FeatureResourceTreeNode> tree = saasFeatureResourceService.getTree(getFeatureResourceTreeReq);
List<SaasFeatureResource> saasFeatureResources = saasFeatureResourceCacheService.getByResourceTreeParam(getFeatureResourceTreeReq);
if (CollectionUtils.isEmpty(saasFeatureResources)) {
return Collections.emptyList();
}
List<FeatureResourceTreeNode> tree = TreeUtil.buildTree(saasFeatureResources.stream()
.map(featureResource -> FeatureResourceTreeNode.builder()
.id(featureResource.getId())
.featureCode(featureResource.getFeatureCode())
.featureName(featureResource.getFeatureName())
.featureType(featureResource.getFeatureType())
.terminal(featureResource.getTerminal())
.parentId(featureResource.getParentId())
.displayOrder(featureResource.getDisplayOrder())
.build())
.sorted(Comparator.comparing(FeatureResourceDTO::getDisplayOrder))
.collect(Collectors.toList()));
if (CollectionUtils.isEmpty(tree)) {
log.info("not found featureResource,{}", request.getTerminal());