From c85d2b9e7eb2b36a84be0265b08a1c5b78bc75d9 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Sun, 14 Nov 2021 16:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87=E7=94=A8?= =?UTF-8?q?=E6=88=B7ID=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/IDepartmentUserBaseService.java | 9 +++++++++ .../ink/wgink/common/component/SecurityComponent.java | 8 +++++++- .../remote/department/IDepartmentUserRemoteService.java | 3 +++ .../department/impl/DepartmentUserServiceImpl.java | 7 +++++++ .../resources/DepartmentUserResourceController.java | 7 +++++++ .../service/impl/DepartmentUserServiceImpl.java | 7 +++++++ 6 files changed, 40 insertions(+), 1 deletion(-) diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java index a0746a97..f609859b 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/department/IDepartmentUserBaseService.java @@ -43,6 +43,14 @@ public interface IDepartmentUserBaseService { */ List list(List departmentIds); + /** + * 机构用户列表 + * + * @param userIds + * @return + */ + List listByUserIds(List userIds); + /** * 用户ID列表 * @@ -102,4 +110,5 @@ public interface IDepartmentUserBaseService { * @param departmentUserDTOs */ void setUser(List departmentUserDTOs); + } diff --git a/common/src/main/java/ink/wgink/common/component/SecurityComponent.java b/common/src/main/java/ink/wgink/common/component/SecurityComponent.java index 655f7eeb..8a4172c3 100644 --- a/common/src/main/java/ink/wgink/common/component/SecurityComponent.java +++ b/common/src/main/java/ink/wgink/common/component/SecurityComponent.java @@ -1,5 +1,6 @@ package ink.wgink.common.component; +import com.alibaba.fastjson.JSON; import ink.wgink.interfaces.manager.IAppManager; import ink.wgink.pojo.app.AppToken; import ink.wgink.pojo.app.AppTokenUser; @@ -151,7 +152,12 @@ public class SecurityComponent { * @return */ public T getExpandData(Class clazz) { - return (T) getExpandData(); + Object expandData = getExpandData(); + if (expandData == null) { + return null; + } + return JSON.parseObject(JSON.toJSONString(expandData), clazz); +// return (T) getExpandData(); } /** diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java index e3979001..d4afb8c0 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/remote/department/IDepartmentUserRemoteService.java @@ -30,6 +30,9 @@ public interface IDepartmentUserRemoteService { @RemotePostMethod("/list/department-ids") List listByDepartmentIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO); + @RemotePostMethod("list/user-ids") + List listByUserIds(@RemoteServerParams String userCenter, @RemoteQueryParams("access_token") String accessToken, @RemoteJsonBodyParams IdsVO idsVO); + @RemoteGetMethod("/list-user-id/{departmentId}") List listUserId(@RemoteServerParams String userCenter, @RemotePathParams("departmentId") String departmentId, @RemoteQueryParams("access_token") String accessToken); diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java index 46200d39..a54a3e16 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/department/impl/DepartmentUserServiceImpl.java @@ -51,6 +51,13 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe return departmentUserRemoteService.listByDepartmentIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO); } + @Override + public List listByUserIds(List userIds) { + IdsVO idsVO = new IdsVO(); + idsVO.setIds(userIds); + return departmentUserRemoteService.listByUserIds(apiPathProperties.getUserCenter(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), idsVO); + } + @Override public List listUserId(String departmentId) { return departmentUserRemoteService.listUserId(apiPathProperties.getUserCenter(), departmentId, OAuth2ClientTokenManager.getInstance().getToken().getAccessToken()); diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentUserResourceController.java b/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentUserResourceController.java index eabb162a..eca0d1af 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentUserResourceController.java +++ b/service-department/src/main/java/ink/wgink/service/department/controller/resources/DepartmentUserResourceController.java @@ -59,6 +59,13 @@ public class DepartmentUserResourceController extends DefaultBaseController { return departmentUserService.list(idsVO.getIds()); } + @ApiOperation(value = "组织部门用户列表", notes = "通过用户ID列表获取组织部门用户列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("list/user-ids") + public List listByUserIds(@RequestBody IdsVO idsVO) { + return departmentUserService.listByUserIds(idsVO.getIds()); + } + @ApiOperation(value = "组织部门用户ID列表", notes = "通过部门ID组织部门用户ID列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "departmentId", value = "部门ID", paramType = "path"), diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java index 3a1c17b7..ed29689d 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java @@ -175,6 +175,13 @@ public class DepartmentUserServiceImpl extends DefaultBaseService implements IDe return list(params); } + @Override + public List listByUserIds(List userIds) { + Map params = getHashMap(2); + params.put("userIds", userIds); + return list(params); + } + @Override public List listUserId(String departmentId) { Map params = getHashMap(2);