From 2eb5b95c3009ce49de8a1385e634427a490afe65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=B5=B7=E6=B4=8B?= Date: Sat, 21 Oct 2023 14:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20SuperAminInfoResp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/tyr/client/feign/TyrSaasRoleUserApi.java | 6 +++--- ...perAdminInfoDTO.java => SuperAminInfoResp.java} | 14 +++++++++++++- .../controller/roleuser/RoleUserController.java | 6 +++--- .../tyr/server/service/SaasRoleUserService.java | 6 +++--- .../tyr/server/service/impl/RoleUserService.java | 10 +++++----- 5 files changed, 27 insertions(+), 15 deletions(-) rename tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/{SuperAdminInfoDTO.java => SuperAminInfoResp.java} (71%) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java index 71d3175e..ab98dbaa 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java @@ -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> superAdminList(@RequestBody @Valid SuperAdminParam param); + ApiResult> superAdminList(@RequestBody @Valid SuperAdminParam param); /** * 批量查询超管, 多工作台 @@ -48,6 +48,6 @@ public interface TyrSaasRoleUserApi { * @return */ @PostMapping("/api/saas-role-user/batch-super-admin-list") - ApiResult> batchSuperAdminList(@RequestBody @Valid List param); + ApiResult> batchSuperAdminList(@RequestBody @Valid List param); } diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SuperAdminInfoDTO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SuperAminInfoResp.java similarity index 71% rename from tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SuperAdminInfoDTO.java rename to tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SuperAminInfoResp.java index 892ba73e..ab6cb77a 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SuperAdminInfoDTO.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SuperAminInfoResp.java @@ -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; + } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java index fd05d47b..c5d34545 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java @@ -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; @@ -51,12 +51,12 @@ public class RoleUserController implements TyrSaasRoleUserApi { * @return */ @Override - public ApiResult> superAdminList(SuperAdminParam param) { + public ApiResult> superAdminList(SuperAdminParam param) { return ApiResult.ok(saasRoleUserService.superAdminList(param)); } @Override - public ApiResult> batchSuperAdminList(List param) { + public ApiResult> batchSuperAdminList(List param) { if (CollectionUtils.isEmpty(param)) { return ApiResult.ok(Collections.EMPTY_LIST); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java index ef683e0a..0172f791 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java @@ -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 superAdminList(SuperAdminParam param); + List superAdminList(SuperAdminParam param); /** * 批量获取超管 @@ -61,7 +61,7 @@ public interface SaasRoleUserService { * @param param * @return */ - List batchSuperAdminList(List param); + List batchSuperAdminList(List param); List listByRoleIds(List matchedRoleIds); } \ No newline at end of file diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java index 825d010e..b9cafe15 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java @@ -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; @@ -160,7 +160,7 @@ public class RoleUserService implements SaasRoleUserService { } @Override - public List batchSuperAdminList(List param) { + public List batchSuperAdminList(List param) { LambdaQueryChainWrapper roleWrapper = saasRoleDao.lambdaQuery(); roleWrapper.and(w -> param.forEach(c -> w.or() @@ -186,7 +186,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()) @@ -197,7 +197,7 @@ public class RoleUserService implements SaasRoleUserService { } @Override - public List superAdminList(SuperAdminParam param) { + public List superAdminList(SuperAdminParam param) { if (param.getWorkspaceId() == null || Objects.isNull(param.getOuId())) { return Collections.emptyList(); } @@ -212,7 +212,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());