diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserBaseService.java b/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserBaseService.java index e389a675..ccdcda1c 100644 --- a/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserBaseService.java +++ b/basic-interface/src/main/java/ink/wgink/interfaces/user/IUserBaseService.java @@ -160,4 +160,11 @@ public interface IUserBaseService { */ List listByKeywords(String keywords); + /** + * 用户ID列表 + * + * @param userDTOs + * @return + */ + List listUserIds(List userDTOs); } diff --git a/common/src/main/java/ink/wgink/common/base/DefaultBaseService.java b/common/src/main/java/ink/wgink/common/base/DefaultBaseService.java index c294d5eb..b85e628b 100644 --- a/common/src/main/java/ink/wgink/common/base/DefaultBaseService.java +++ b/common/src/main/java/ink/wgink/common/base/DefaultBaseService.java @@ -6,7 +6,6 @@ import ink.wgink.common.enums.RoleDataRightEnum; import ink.wgink.exceptions.AccessTokenException; import ink.wgink.exceptions.AppTokenException; import ink.wgink.exceptions.SearchException; -import ink.wgink.exceptions.TokenException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.app.AppTokenUser; import ink.wgink.pojo.bos.UserInfoBO; @@ -166,6 +165,21 @@ public class DefaultBaseService { return code; } + /** + * 获取关键词 + * + * @param params + * @return + */ + protected String getKeywords(Map params) { + String keywords = null; + if (params.get("keywords") != null) { + keywords = params.get("keywords").toString(); + } + params.remove("keywords"); + return keywords; + } + /** * 获取session * diff --git a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java index 47bd6523..00bc44ac 100644 --- a/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java +++ b/login-oauth2-client/src/main/java/ink/wgink/login/oauth2/client/service/user/impl/UserServiceImpl.java @@ -17,8 +17,7 @@ import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @ClassName: UserServiceImpl @@ -139,6 +138,18 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService return list(params); } + @Override + public List listUserIds(List userDTOs) { + if (userDTOs.isEmpty()) { + return new ArrayList<>(); + } + Set userIdSet = new HashSet<>(); + for (UserDTO userDTO : userDTOs) { + userIdSet.add(userDTO.getUserId()); + } + return new ArrayList<>(userIdSet); + } + @Override public void updatePassword(UpdatePasswordVO updatePasswordVO) { userRemoteService.updatePassword(apiPathProperties.getUserCenter(), securityComponent.getCurrentUser().getUserId(), OAuth2ClientTokenManager.getInstance().getToken().getAccessToken(), updatePasswordVO); diff --git a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java index bfe658cb..aba4187d 100644 --- a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java +++ b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java @@ -53,10 +53,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * When you feel like quitting. Think about why you started @@ -540,6 +537,18 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService return list(params); } + @Override + public List listUserIds(List userDTOs) { + if (userDTOs.isEmpty()) { + return new ArrayList<>(); + } + Set userIdSet = new HashSet<>(); + for (UserDTO userDTO : userDTOs) { + userIdSet.add(userDTO.getUserId()); + } + return new ArrayList<>(userIdSet); + } + /** * Excel导入错误对象 *