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

调整api list返回结构

Browse Source
This commit is contained in:
chenweiwei 2023-09-10 15:23:47 +08:00
parent b2a18a7776
commit 3054198020
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleApi.java
View File

@ -1,6 +1,5 @@
package cn.axzo.tyr.client.feign;
import cn.axzo.framework.domain.web.result.ApiListResult;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.model.req.QuerySaasRoleReq;
import cn.axzo.tyr.client.model.vo.SaasRoleVO;
@ -10,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* 角色
*/
@ -32,14 +33,16 @@ public interface SaasRoleApi {
/**
* 获取角色列表
* @return
*/
@PostMapping("/api/saasRole/query")
ApiListResult<SaasRoleVO> query(@RequestBody QuerySaasRoleReq req);
ApiResult<List<SaasRoleVO>> query(@RequestBody QuerySaasRoleReq req);
/**
* 根据身份id 身份类型查询权限列表
* @return
*/
@GetMapping("/api/saasRole/queryByIdentityIdType")
ApiListResult<SaasRoleVO> queryByIdentityIdType(@RequestParam(required = true) Long identityId,@RequestParam(required = true) Integer identityType);
ApiResult<List<SaasRoleVO>> queryByIdentityIdType(@RequestParam(required = true) Long identityId,@RequestParam(required = true) Integer identityType);
}

2
tyr-api/src/main/java/cn/axzo/tyr/client/model/vo/SaasRoleVO.java
View File

@ -63,7 +63,7 @@ public class SaasRoleVO {
* @return
*/
public List<PermissionPointTreeNode> getFeature(){
return this.permissionGroup.stream().map(SaasPermissionGroupVO::getFeature).flatMap(List::stream).collect(Collectors.toList());
return this.permissionGroup.stream().map(SaasPermissionGroupVO::getFeature).flatMap(List::stream).distinct().collect(Collectors.toList());
}
}

15
tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java
View File

@ -1,16 +1,9 @@
package cn.axzo.tyr.server.controller.role;
import cn.axzo.framework.domain.web.result.ApiListResult;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.feign.PermissionPointApi;
import cn.axzo.tyr.client.feign.SaasRoleApi;
import cn.axzo.tyr.client.model.enums.IdentityType;
import cn.axzo.tyr.client.model.permission.PermissionPointDTO;
import cn.axzo.tyr.client.model.permission.PermissionPointTreeNode;
import cn.axzo.tyr.client.model.permission.PermissionPointTreeQueryReq;
import cn.axzo.tyr.client.model.req.QuerySaasRoleReq;
import cn.axzo.tyr.client.model.vo.SaasRoleVO;
import cn.axzo.tyr.server.service.PermissionPointService;
import cn.axzo.tyr.server.service.RoleService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -45,12 +38,12 @@ public class SaasRoleController implements SaasRoleApi {
}
@Override
public ApiListResult<SaasRoleVO> query(QuerySaasRoleReq req) {
return ApiListResult.ok(roleService.query(req));
public ApiResult<List<SaasRoleVO>> query(QuerySaasRoleReq req) {
return ApiResult.ok(roleService.query(req));
}
@Override
public ApiListResult<SaasRoleVO> queryByIdentityIdType(Long identityId, Integer identityType) {
return ApiListResult.ok(roleService.queryByIdentityIdType(identityId, identityType));
public ApiResult<List<SaasRoleVO>> queryByIdentityIdType(Long identityId, Integer identityType) {
return ApiResult.ok(roleService.queryByIdentityIdType(identityId, identityType));
}
}