From d327cb7735521a616a63bee595ceae8a2f6c3ee3 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Mon, 14 Oct 2024 19:57:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3010):=20=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/client/feign/SaasRoleApi.java | 60 +++++++++---------- .../model/req/ListUserRoleByParams.java | 27 +++++++++ .../permission/SaasRoleApiImpl.java | 6 +- 3 files changed, 60 insertions(+), 33 deletions(-) create mode 100644 tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListUserRoleByParams.java diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleApi.java index b9220bdd..13ab8ede 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleApi.java @@ -5,6 +5,7 @@ import cn.axzo.tyr.client.model.permission.IdentityAndAccountResp; import cn.axzo.tyr.client.model.permission.SaasUserRoleExBO; import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleByPhoneReq; import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleReq; +import cn.axzo.tyr.client.model.req.ListUserRoleByParams; import cn.axzo.tyr.client.model.req.QuerySuperAdminReq; import cn.axzo.tyr.client.model.req.UpdateUserJobReq; import cn.axzo.tyr.client.model.res.SuperAminInfoResp; @@ -14,12 +15,12 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import javax.validation.Valid; import java.util.List; /** - * * 2022-06-13，高伟、陈亮、谭杰，评审了此API * * @author : liuchuntao @@ -29,39 +30,36 @@ import java.util.List; @Validated public interface SaasRoleApi { - /** - * workpaceId + ownerOuId + roleId + identifyId 赋予角色（支持角色赋予的同时 角色创建） - * work for: 组织 + 服务包 - */ - @PostMapping("api/saas/role/grantAdminRole") - CommonResponse grantAdminRole(@RequestBody @Valid List req); + /** + * workpaceId + ownerOuId + roleId + identifyId 赋予角色（支持角色赋予的同时 角色创建） + * work for: 组织 + 服务包 + */ + @PostMapping("api/saas/role/grantAdminRole") + CommonResponse grantAdminRole(@RequestBody @Valid List req); - /** - * workpaceId + ownerOuId + roleId + 手机号 + 姓名 赋予角色（支持角色赋予的同时 角色创建） - * work for: 组织 + 服务包 - */ - @PostMapping("api/saas/role/grantAdminRoleByPhone") - CommonResponse> grantAdminRoleByPhone(@RequestBody @Valid List req); + /** + * workpaceId + ownerOuId + roleId + 手机号 + 姓名 赋予角色（支持角色赋予的同时 角色创建） + * work for: 组织 + 服务包 + */ + @PostMapping("api/saas/role/grantAdminRoleByPhone") + CommonResponse> grantAdminRoleByPhone(@RequestBody @Valid List req); - @PostMapping("api/saas/role/user/update") - CommonResponse updateUserRole(@RequestBody @Valid UpdateUserJobReq req); + @PostMapping("api/saas/role/user/update") + CommonResponse updateUserRole(@RequestBody @Valid UpdateUserJobReq req); - /** - * - * @param adminReqs - * @return - */ - @PostMapping("api/saas/role/batchFindSuperAdmin") - CommonResponse> batchFindSuperAdmin(@RequestBody @Valid List adminReqs); + /** + * @param adminReqs + * @return + */ + @PostMapping("api/saas/role/batchFindSuperAdmin") + CommonResponse> batchFindSuperAdmin(@RequestBody @Valid List adminReqs); - /** - * 根据 工作台id + 单位id 查询已关联的人员列表 work for: 工作流 - */ - @PostMapping("api/saas/role/findSuperAdmin") - CommonResponse findSuperAdmin(@RequestBody @Valid QuerySuperAdminReq req); + /** + * 根据 工作台id + 单位id 查询已关联的人员列表 work for: 工作流 + */ + @PostMapping("api/saas/role/findSuperAdmin") + CommonResponse findSuperAdmin(@RequestBody @Valid QuerySuperAdminReq req); - @GetMapping("api/saas/role/listUserRoleExByParams") - CommonResponse> getUserRoleExListMapByIdentityIdAndWorkspaceId(List identityIds, - IdentityType identityType, - Long workspaceId); + @PostMapping("api/saas/role/listUserRoleExByParams") + CommonResponse> getUserRoleExListMapByIdentityIdAndWorkspaceId(@RequestBody @Valid ListUserRoleByParams req); } diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListUserRoleByParams.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListUserRoleByParams.java new file mode 100644 index 00000000..43b57a03 --- /dev/null +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListUserRoleByParams.java @@ -0,0 +1,27 @@ +package cn.axzo.tyr.client.model.req; + +import cn.axzo.basics.profiles.common.enums.IdentityType; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2024/10/14 19:54 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ListUserRoleByParams { + + private List identityIds; + + private IdentityType identityType; + + private Long workspaceId; +} diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/SaasRoleApiImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/SaasRoleApiImpl.java index 8025c27b..49b99085 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/SaasRoleApiImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/SaasRoleApiImpl.java @@ -26,6 +26,7 @@ import cn.axzo.tyr.client.model.permission.SaasUserRoleExBO; import cn.axzo.tyr.client.model.permission.UpdateWorkspaceSupAdminDTO; import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleByPhoneReq; import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleReq; +import cn.axzo.tyr.client.model.req.ListUserRoleByParams; import cn.axzo.tyr.client.model.req.QuerySuperAdminReq; import cn.axzo.tyr.client.model.req.UpdateUserJobReq; import cn.axzo.tyr.client.model.res.SuperAminInfoResp; @@ -241,7 +242,8 @@ public class SaasRoleApiImpl implements SaasRoleApi { } @Override - public CommonResponse> getUserRoleExListMapByIdentityIdAndWorkspaceId(List identityIds, IdentityType identityType, Long workspaceId) { - return CommonResponse.success(saasRoleUserRelationService.getUserRoleExListMapByIdentityIdAndWorkspaceId(identityIds, identityType, workspaceId)); + public CommonResponse> getUserRoleExListMapByIdentityIdAndWorkspaceId(ListUserRoleByParams params) { + return CommonResponse.success( + saasRoleUserRelationService.getUserRoleExListMapByIdentityIdAndWorkspaceId(params.getIdentityIds(), params.getIdentityType(), params.getWorkspaceId())); } }