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

feat(REQ-3010): 请求方式调整

Browse Source
This commit is contained in:
chenwenjian 2024-10-14 19:57:26 +08:00
parent de0b6d1b80
commit d327cb7735
3 changed files with 60 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.SaasUserRoleExBO;
import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleByPhoneReq; import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleByPhoneReq;
import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleReq; 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.QuerySuperAdminReq;
import cn.axzo.tyr.client.model.req.UpdateUserJobReq; import cn.axzo.tyr.client.model.req.UpdateUserJobReq;
import cn.axzo.tyr.client.model.res.SuperAminInfoResp; 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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; import java.util.List;
/** /**
*
* 2022-06-13，高伟、陈亮、谭杰，评审了此API * 2022-06-13，高伟、陈亮、谭杰，评审了此API
* *
* @author : liuchuntao * @author : liuchuntao
@ -29,39 +30,36 @@ import java.util.List;
@Validated @Validated
public interface SaasRoleApi { public interface SaasRoleApi {
/** /**
* workpaceId + ownerOuId + roleId + identifyId 赋予角色（支持角色赋予的同时 角色创建） * workpaceId + ownerOuId + roleId + identifyId 赋予角色（支持角色赋予的同时 角色创建）
* work for: 组织 + 服务包 * work for: 组织 + 服务包
*/ */
@PostMapping("api/saas/role/grantAdminRole") @PostMapping("api/saas/role/grantAdminRole")
CommonResponse<Boolean> grantAdminRole(@RequestBody @Valid List<WorkspaceGrantAdminRoleReq> req); CommonResponse<Boolean> grantAdminRole(@RequestBody @Valid List<WorkspaceGrantAdminRoleReq> req);
/** /**
* workpaceId + ownerOuId + roleId + 手机号 + 姓名 赋予角色（支持角色赋予的同时 角色创建） * workpaceId + ownerOuId + roleId + 手机号 + 姓名 赋予角色（支持角色赋予的同时 角色创建）
* work for: 组织 + 服务包 * work for: 组织 + 服务包
*/ */
@PostMapping("api/saas/role/grantAdminRoleByPhone") @PostMapping("api/saas/role/grantAdminRoleByPhone")
CommonResponse<List<IdentityAndAccountResp>> grantAdminRoleByPhone(@RequestBody @Valid List<WorkspaceGrantAdminRoleByPhoneReq> req); CommonResponse<List<IdentityAndAccountResp>> grantAdminRoleByPhone(@RequestBody @Valid List<WorkspaceGrantAdminRoleByPhoneReq> req);
@PostMapping("api/saas/role/user/update") @PostMapping("api/saas/role/user/update")
CommonResponse<Boolean> updateUserRole(@RequestBody @Valid UpdateUserJobReq req); CommonResponse<Boolean> updateUserRole(@RequestBody @Valid UpdateUserJobReq req);
/** /**
* * @param adminReqs
* @param adminReqs * @return
* @return */
*/ @PostMapping("api/saas/role/batchFindSuperAdmin")
@PostMapping("api/saas/role/batchFindSuperAdmin") CommonResponse<List<SuperAminInfoResp>> batchFindSuperAdmin(@RequestBody @Valid List<QuerySuperAdminReq> adminReqs);
CommonResponse<List<SuperAminInfoResp>> batchFindSuperAdmin(@RequestBody @Valid List<QuerySuperAdminReq> adminReqs);
/** /**
* 根据 工作台id + 单位id 查询已关联的人员列表 work for: 工作流 * 根据 工作台id + 单位id 查询已关联的人员列表 work for: 工作流
*/ */
@PostMapping("api/saas/role/findSuperAdmin") @PostMapping("api/saas/role/findSuperAdmin")
CommonResponse<SuperAminInfoResp> findSuperAdmin(@RequestBody @Valid QuerySuperAdminReq req); CommonResponse<SuperAminInfoResp> findSuperAdmin(@RequestBody @Valid QuerySuperAdminReq req);
@GetMapping("api/saas/role/listUserRoleExByParams") @PostMapping("api/saas/role/listUserRoleExByParams")
CommonResponse<List<SaasUserRoleExBO>> getUserRoleExListMapByIdentityIdAndWorkspaceId(List<Long> identityIds, CommonResponse<List<SaasUserRoleExBO>> getUserRoleExListMapByIdentityIdAndWorkspaceId(@RequestBody @Valid ListUserRoleByParams req);
IdentityType identityType,
Long workspaceId);
} }

27
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListUserRoleByParams.java Normal file
View File

@ -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<Long> identityIds;
private IdentityType identityType;
private Long workspaceId;
}

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

@ -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.UpdateWorkspaceSupAdminDTO;
import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleByPhoneReq; import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleByPhoneReq;
import cn.axzo.tyr.client.model.permission.WorkspaceGrantAdminRoleReq; 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.QuerySuperAdminReq;
import cn.axzo.tyr.client.model.req.UpdateUserJobReq; import cn.axzo.tyr.client.model.req.UpdateUserJobReq;
import cn.axzo.tyr.client.model.res.SuperAminInfoResp; import cn.axzo.tyr.client.model.res.SuperAminInfoResp;
@ -241,7 +242,8 @@ public class SaasRoleApiImpl implements SaasRoleApi {
} }
@Override @Override
public CommonResponse<List<SaasUserRoleExBO>> getUserRoleExListMapByIdentityIdAndWorkspaceId(List<Long> identityIds, IdentityType identityType, Long workspaceId) { public CommonResponse<List<SaasUserRoleExBO>> getUserRoleExListMapByIdentityIdAndWorkspaceId(ListUserRoleByParams params) {
return CommonResponse.success(saasRoleUserRelationService.getUserRoleExListMapByIdentityIdAndWorkspaceId(identityIds, identityType, workspaceId)); return CommonResponse.success(
saasRoleUserRelationService.getUserRoleExListMapByIdentityIdAndWorkspaceId(params.getIdentityIds(), params.getIdentityType(), params.getWorkspaceId()));
} }
} }