From 3eaa81f435754e846525a5ebd74f1d7508c5bd8a Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Mon, 14 Oct 2024 18:09:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3010):=20=E6=96=B0=E5=A2=9EgetUserRole?= =?UTF-8?q?ExListMapByIdentityIdAndWorkspaceId=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cn.axzo.tyr.client.feign.SaasRoleApi#getUserRoleExListMapByIdentityIdAndWorkspaceId --- .../main/java/cn/axzo/tyr/client/feign/SaasRoleApi.java | 7 +++++++ .../tyr/client/model/permission}/SaasUserRoleExBO.java | 2 +- .../tyr/server/controller/permission/SaasRoleApiImpl.java | 6 ++++++ .../tyr/server/repository/dao/SaasRoleUserRelationDao.java | 6 +++++- .../repository/mapper/SaasRoleUserRelationMapper.java | 2 +- .../tyr/server/service/SaasRoleUserRelationService.java | 3 +++ .../service/impl/SaasRoleUserRelationServiceImpl.java | 7 ++++++- .../main/resources/mapper/SaasRoleUserRelationMapper.xml | 2 +- 8 files changed, 30 insertions(+), 5 deletions(-) rename {tyr-server/src/main/java/cn/axzo/tyr/server/model => tyr-api/src/main/java/cn/axzo/tyr/client/model/permission}/SaasUserRoleExBO.java (98%) 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 5b28092a..18bac4a6 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 @@ -1,6 +1,8 @@ package cn.axzo.tyr.client.feign; +import cn.axzo.basics.profiles.common.enums.IdentityType; 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.QuerySuperAdminReq; @@ -56,4 +58,9 @@ public interface SaasRoleApi { */ @PostMapping("api/saas/role/findSuperAdmin") CommonResponse findSuperAdmin(@RequestBody @Valid QuerySuperAdminReq req); + + @PostMapping("api/saas/role/listUserRoleExByParams") + CommonResponse> getUserRoleExListMapByIdentityIdAndWorkspaceId(List identityIds, + IdentityType identityType, + Long workspaceId); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/model/SaasUserRoleExBO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/SaasUserRoleExBO.java similarity index 98% rename from tyr-server/src/main/java/cn/axzo/tyr/server/model/SaasUserRoleExBO.java rename to tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/SaasUserRoleExBO.java index a1e94938..8e116008 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/model/SaasUserRoleExBO.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/SaasUserRoleExBO.java @@ -1,4 +1,4 @@ -package cn.axzo.tyr.server.model; +package cn.axzo.tyr.client.model.permission; import cn.axzo.basics.common.constant.enums.OrganizationalNodeTypeEnum; import cn.axzo.basics.common.constant.enums.OrganizationalUnitTypeEnum; 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 b704447c..8025c27b 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 @@ -22,6 +22,7 @@ import cn.axzo.braum.client.request.AccountUserReq; import cn.axzo.framework.domain.ServiceException; import cn.axzo.tyr.client.feign.SaasRoleApi; import cn.axzo.tyr.client.model.permission.IdentityAndAccountResp; +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; @@ -238,4 +239,9 @@ public class SaasRoleApiImpl implements SaasRoleApi { return resp; } + + @Override + public CommonResponse> getUserRoleExListMapByIdentityIdAndWorkspaceId(List identityIds, IdentityType identityType, Long workspaceId) { + return CommonResponse.success(saasRoleUserRelationService.getUserRoleExListMapByIdentityIdAndWorkspaceId(identityIds, identityType, workspaceId)); + } } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java index 7e449534..906329f3 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java @@ -14,7 +14,7 @@ import cn.axzo.tyr.client.model.roleuser.dto.IdentityInfo; import cn.axzo.tyr.server.job.UserRoleRelationCleanJob; import cn.axzo.tyr.server.model.QueryUserRoleReq; import cn.axzo.tyr.server.model.RoleUserInfo; -import cn.axzo.tyr.server.model.SaasUserRoleExBO; +import cn.axzo.tyr.client.model.permission.SaasUserRoleExBO; import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation; import cn.axzo.tyr.server.repository.mapper.SaasRoleUserRelationMapper; import cn.hutool.core.collection.CollUtil; @@ -239,5 +239,9 @@ public class SaasRoleUserRelationDao extends ServiceImpl listIdentityKeysByParams(QueryUserRoleReq req) { return saasRoleUserRelationMapper.listIdentityKeysByParams(req); } + + public List listUserRoleExByIdentityIdsAndWorkspaceId(List identityIds, cn.axzo.basics.profiles.common.enums.IdentityType identityType, Long workspaceId) { + return saasRoleUserRelationMapper.listUserRoleExByParams(QueryUserRoleReq.builder().identityIds(identityIds).identityType(identityType).workspaceId(workspaceId).build()); + } } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java index 3b042492..ed085a42 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java @@ -7,7 +7,7 @@ import cn.axzo.tyr.client.model.permission.IdentityAndAccountDTO; import cn.axzo.tyr.client.model.permission.IdentityKey; import cn.axzo.tyr.client.model.permission.QueryIdentityByPermissionDTO; import cn.axzo.tyr.server.model.QueryUserRoleReq; -import cn.axzo.tyr.server.model.SaasUserRoleExBO; +import cn.axzo.tyr.client.model.permission.SaasUserRoleExBO; import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserRelationService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserRelationService.java index 1c7c79bd..884c5f1e 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserRelationService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserRelationService.java @@ -5,6 +5,7 @@ import cn.axzo.framework.domain.page.PageResp; import cn.axzo.tyr.client.model.permission.IdentityAndAccountDTO; import cn.axzo.tyr.client.model.permission.IdentityKey; import cn.axzo.tyr.client.model.permission.QueryIdentityByPermissionDTO; +import cn.axzo.tyr.client.model.permission.SaasUserRoleExBO; import cn.axzo.tyr.client.model.req.QuerySuperAdminReq; import cn.axzo.tyr.client.model.req.UpdateUserJobReq; import cn.axzo.tyr.client.model.res.SuperAminInfoResp; @@ -50,4 +51,6 @@ public interface SaasRoleUserRelationService extends IService findBathSuperAdmin(List req); List getSuperAdminIdsByWorkspaceAndOu(Long workspaceId, Long ouId); + + List getUserRoleExListMapByIdentityIdAndWorkspaceId(List identityIds, IdentityType identityType, Long workspaceId); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java index a396c5d1..cfabf283 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java @@ -36,7 +36,7 @@ import cn.axzo.tyr.client.model.roleuser.req.PageRoleUserRelationParam; import cn.axzo.tyr.client.model.roleuser.req.RoleUserParam; import cn.axzo.tyr.server.common.util.NumUtil; import cn.axzo.tyr.server.model.QueryUserRoleReq; -import cn.axzo.tyr.server.model.SaasUserRoleExBO; +import cn.axzo.tyr.client.model.permission.SaasUserRoleExBO; import cn.axzo.tyr.server.repository.dao.SaasRoleDao; import cn.axzo.tyr.server.repository.dao.SaasRoleUserRelationDao; import cn.axzo.tyr.server.repository.entity.SaasRole; @@ -590,4 +590,9 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl getUserRoleExListMapByIdentityIdAndWorkspaceId(List identityIds, IdentityType identityType, Long workspaceId) { + return saasRoleUserRelationDao.listUserRoleExByIdentityIdsAndWorkspaceId(identityIds, identityType, workspaceId); + } } diff --git a/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml b/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml index b20c4c74..7da9a5b0 100644 --- a/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml +++ b/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml @@ -34,7 +34,7 @@