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

Merge remote-tracking branch 'origin/feature/REQ-1502' into feature/REQ-1502

Browse Source
This commit is contained in:
wangjibo 2023-10-21 15:02:42 +08:00
commit bea6d121e1
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java
View File

@ -2,7 +2,7 @@ package cn.axzo.tyr.client.feign;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserDTO;
import cn.axzo.tyr.client.model.roleuser.dto.SuperAdminInfoDTO;
import cn.axzo.tyr.client.model.roleuser.dto.SuperAminInfoResp;
import cn.axzo.tyr.client.model.roleuser.req.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@ -40,7 +40,7 @@ public interface TyrSaasRoleUserApi {
* 批量查询超管, 只能批量获取单个工作台台下的超管，业务系统需要根据返回的identityId和identityType查询identityProfile查询用户明细信息
*/
@PostMapping("/api/saas-role-user/super-admin-list")
ApiResult<List<SuperAdminInfoDTO>> superAdminList(@RequestBody @Valid SuperAdminParam param);
ApiResult<List<SuperAminInfoResp>> superAdminList(@RequestBody @Valid SuperAdminParam param);
/**
* 批量查询超管, 多工作台
@ -48,6 +48,6 @@ public interface TyrSaasRoleUserApi {
* @return
*/
@PostMapping("/api/saas-role-user/batch-super-admin-list")
ApiResult<List<SuperAdminInfoDTO>> batchSuperAdminList(@RequestBody @Valid List<SuperAdminParam> param);
ApiResult<List<SuperAminInfoResp>> batchSuperAdminList(@RequestBody @Valid List<SuperAdminParam> param);
}

14
tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SuperAdminInfoDTO.java → tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SuperAminInfoResp.java
View File

@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class SuperAdminInfoDTO {
public class SuperAminInfoResp {
/**
* 自然人id
@ -41,4 +41,16 @@ public class SuperAdminInfoDTO {
*/
private Long ouId;
/**
* 没有值需要自己从档案域查询
*/
@Deprecated
private String phone;
/**
* 没有值需要自己从档案域查询
*/
@Deprecated
private String realName;
}

6
tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java
View File

@ -3,7 +3,7 @@ package cn.axzo.tyr.server.controller.roleuser;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.tyr.client.feign.TyrSaasRoleUserApi;
import cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserDTO;
import cn.axzo.tyr.client.model.roleuser.dto.SuperAdminInfoDTO;
import cn.axzo.tyr.client.model.roleuser.dto.SuperAminInfoResp;
import cn.axzo.tyr.client.model.roleuser.req.*;
import cn.axzo.tyr.server.service.SaasRoleUserRelationService;
import cn.axzo.tyr.server.service.SaasRoleUserService;
@ -50,12 +50,12 @@ public class RoleUserController implements TyrSaasRoleUserApi {
* @return
*/
@Override
public ApiResult<List<SuperAdminInfoDTO>> superAdminList(SuperAdminParam param) {
public ApiResult<List<SuperAminInfoResp>> superAdminList(SuperAdminParam param) {
return ApiResult.ok(saasRoleUserService.superAdminList(param));
}
@Override
public ApiResult<List<SuperAdminInfoDTO>> batchSuperAdminList(List<SuperAdminParam> param) {
public ApiResult<List<SuperAminInfoResp>> batchSuperAdminList(List<SuperAdminParam> param) {
if (CollectionUtils.isEmpty(param)) {
return ApiResult.ok(Collections.EMPTY_LIST);
}

6
tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java
View File

@ -1,7 +1,7 @@
package cn.axzo.tyr.server.service;
import cn.axzo.tyr.client.model.enums.IdentityType;
import cn.axzo.tyr.client.model.roleuser.dto.SuperAdminInfoDTO;
import cn.axzo.tyr.client.model.roleuser.dto.SuperAminInfoResp;
import cn.axzo.tyr.client.model.roleuser.req.*;
import cn.axzo.tyr.server.repository.entity.SaasRoleUserRelation;
@ -53,7 +53,7 @@ public interface SaasRoleUserService {
* @param param
* @return
*/
List<SuperAdminInfoDTO> superAdminList(SuperAdminParam param);
List<SuperAminInfoResp> superAdminList(SuperAdminParam param);
/**
* 批量获取超管
@ -61,7 +61,7 @@ public interface SaasRoleUserService {
* @param param
* @return
*/
List<SuperAdminInfoDTO> batchSuperAdminList(List<SuperAdminParam> param);
List<SuperAminInfoResp> batchSuperAdminList(List<SuperAdminParam> param);
List<SaasRoleUserRelation> listByRoleIds(List<Long> matchedRoleIds);
}

10
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java
View File

@ -8,7 +8,7 @@ import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import cn.axzo.tyr.client.common.enums.RoleTypeEnum;
import cn.axzo.tyr.client.model.BaseWorkspaceModel;
import cn.axzo.tyr.client.model.enums.IdentityType;
import cn.axzo.tyr.client.model.roleuser.dto.SuperAdminInfoDTO;
import cn.axzo.tyr.client.model.roleuser.dto.SuperAminInfoResp;
import cn.axzo.tyr.client.model.roleuser.req.CreateAgencyAdminRoleParam;
import cn.axzo.tyr.client.model.roleuser.req.CreateSuperAdminRoleParam;
import cn.axzo.tyr.client.model.roleuser.req.RoleUserReq;
@ -166,7 +166,7 @@ public class RoleUserService implements SaasRoleUserService {
}
@Override
public List<SuperAdminInfoDTO> batchSuperAdminList(List<SuperAdminParam> param) {
public List<SuperAminInfoResp> batchSuperAdminList(List<SuperAdminParam> param) {
LambdaQueryChainWrapper<SaasRole> roleWrapper = saasRoleDao.lambdaQuery();
roleWrapper.and(w ->
param.forEach(c -> w.or()
@ -192,7 +192,7 @@ public class RoleUserService implements SaasRoleUserService {
if (CollectionUtils.isEmpty(relations)) {
return Collections.emptyList();
}
return relations.stream().map(r -> SuperAdminInfoDTO.builder()
return relations.stream().map(r -> SuperAminInfoResp.builder()
.workspaceId(r.getWorkspaceId())
.ouId(r.getOuId())
.identityId(r.getIdentityId())
@ -203,7 +203,7 @@ public class RoleUserService implements SaasRoleUserService {
}
@Override
public List<SuperAdminInfoDTO> superAdminList(SuperAdminParam param) {
public List<SuperAminInfoResp> superAdminList(SuperAdminParam param) {
if (param.getWorkspaceId() == null || Objects.isNull(param.getOuId())) {
return Collections.emptyList();
}
@ -218,7 +218,7 @@ public class RoleUserService implements SaasRoleUserService {
return Collections.emptyList();
}
return relations.stream().map(r -> {
SuperAdminInfoDTO superAdminInfo = new SuperAdminInfoDTO();
SuperAminInfoResp superAdminInfo = new SuperAminInfoResp();
superAdminInfo.setWorkspaceId(r.getWorkspaceId());
superAdminInfo.setOuId(r.getOuId());
superAdminInfo.setIdentityId(r.getIdentityId());