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

feat(REQ-3010): 新增getUserRoleExListMapByIdentityIdAndWorkspaceId接口

Browse Source 
cn.axzo.tyr.client.feign.SaasRoleApi#getUserRoleExListMapByIdentityIdAndWorkspaceId
This commit is contained in:
chenwenjian 2024-10-14 18:09:10 +08:00
parent 7a43be540c
commit 3eaa81f435
8 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<SuperAminInfoResp> findSuperAdmin(@RequestBody @Valid QuerySuperAdminReq req);
@PostMapping("api/saas/role/listUserRoleExByParams")
CommonResponse<List<SaasUserRoleExBO>> getUserRoleExListMapByIdentityIdAndWorkspaceId(List<Long> identityIds,
IdentityType identityType,
Long workspaceId);
}

2
tyr-server/src/main/java/cn/axzo/tyr/server/model/SaasUserRoleExBO.java → tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/SaasUserRoleExBO.java
View File

@ -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;

6
tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/SaasRoleApiImpl.java
View File

@ -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<List<SaasUserRoleExBO>> getUserRoleExListMapByIdentityIdAndWorkspaceId(List<Long> identityIds, IdentityType identityType, Long workspaceId) {
return CommonResponse.success(saasRoleUserRelationService.getUserRoleExListMapByIdentityIdAndWorkspaceId(identityIds, identityType, workspaceId));
}
}

6
tyr-server/src/main/java/cn/axzo/tyr/server/repository/dao/SaasRoleUserRelationDao.java
View File

@ -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<SaasRoleUserRelationMap
public List<IdentityKey> listIdentityKeysByParams(QueryUserRoleReq req) {
return saasRoleUserRelationMapper.listIdentityKeysByParams(req);
}
public List<SaasUserRoleExBO> listUserRoleExByIdentityIdsAndWorkspaceId(List<Long> identityIds, cn.axzo.basics.profiles.common.enums.IdentityType identityType, Long workspaceId) {
return saasRoleUserRelationMapper.listUserRoleExByParams(QueryUserRoleReq.builder().identityIds(identityIds).identityType(identityType).workspaceId(workspaceId).build());
}
}

2
tyr-server/src/main/java/cn/axzo/tyr/server/repository/mapper/SaasRoleUserRelationMapper.java
View File

@ -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;

3
tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserRelationService.java
View File

@ -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<SaasRoleUserRelati
List<SuperAminInfoResp> findBathSuperAdmin(List<QuerySuperAdminReq> req);
List<IdentityKey> getSuperAdminIdsByWorkspaceAndOu(Long workspaceId, Long ouId);
List<SaasUserRoleExBO> getUserRoleExListMapByIdentityIdAndWorkspaceId(List<Long> identityIds, IdentityType identityType, Long workspaceId);
}

7
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
View File

@ -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<SaasRoleUserRel
.roleTypes(Arrays.asList(RoleTypeEnum.SUPER_ADMIN.getValue()))
.build());
}
@Override
public List<SaasUserRoleExBO> getUserRoleExListMapByIdentityIdAndWorkspaceId(List<Long> identityIds, IdentityType identityType, Long workspaceId) {
return saasRoleUserRelationDao.listUserRoleExByIdentityIdsAndWorkspaceId(identityIds, identityType, workspaceId);
}
}

2
tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml
View File

@ -34,7 +34,7 @@
<select id="listUserRoleExByParams"
resultType="cn.axzo.tyr.server.model.SaasUserRoleExBO">
resultType="cn.axzo.tyr.client.model.permission.SaasUserRoleExBO">
select rel.id id,
rel.identity_id identityId,
rel.role_id roleId,