From b9159de963d39453c7158e81ce6e39c4a4e8a2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 19 Mar 2026 15:03:48 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9List=E4=B8=BACollect?= =?UTF-8?q?ion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/system/api/RemoteDeptService.java | 3 ++- .../dromara/system/api/RemotePostService.java | 3 ++- .../dromara/system/api/RemoteRoleService.java | 3 ++- .../dromara/system/api/RemoteUserService.java | 13 ++++----- .../api/domain/vo/RemoteTaskAssigneeVo.java | 7 ++--- .../common/core/domain/PageResult.java | 27 ++++++++++++++----- .../system/dubbo/RemoteDeptServiceImpl.java | 3 ++- .../system/dubbo/RemotePostServiceImpl.java | 3 ++- .../system/dubbo/RemoteRoleServiceImpl.java | 3 ++- .../system/dubbo/RemoteUserServiceImpl.java | 18 ++++++------- .../system/service/ISysUserService.java | 3 ++- .../service/impl/SysUserServiceImpl.java | 7 ++--- 12 files changed, 57 insertions(+), 36 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java index a8ffb5d45..e3df33946 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java @@ -2,6 +2,7 @@ package org.dromara.system.api; import org.dromara.system.api.domain.vo.RemoteDeptVo; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -41,6 +42,6 @@ public interface RemoteDeptService { * @param deptIds 部门 ID 列表 * @return Map,其中 key 为部门 ID,value 为对应的部门名称 */ - Map selectDeptNamesByIds(List deptIds); + Map selectDeptNamesByIds(Collection deptIds); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePostService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePostService.java index 2e5ad1a82..8b5549563 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePostService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePostService.java @@ -1,5 +1,6 @@ package org.dromara.system.api; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -16,6 +17,6 @@ public interface RemotePostService { * @param postIds 岗位 ID 列表 * @return Map,其中 key 为岗位 ID,value 为对应的岗位名称 */ - Map selectPostNamesByIds(List postIds); + Map selectPostNamesByIds(Collection postIds); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteRoleService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteRoleService.java index 9c976ee6d..f651fdd82 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteRoleService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteRoleService.java @@ -1,5 +1,6 @@ package org.dromara.system.api; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -16,6 +17,6 @@ public interface RemoteRoleService { * @param roleIds 角色 ID 列表 * @return Map,其中 key 为角色 ID,value 为对应的角色名称 */ - Map selectRoleNamesByIds(List roleIds); + Map selectRoleNamesByIds(Collection roleIds); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java index c58eb87d4..7c8372725 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java @@ -7,6 +7,7 @@ import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.system.api.model.LoginUser; import org.dromara.system.api.model.XcxLoginUser; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -119,7 +120,7 @@ public interface RemoteUserService { * @param userIds 用户ids * @return 用户列表 */ - List selectListByIds(List userIds); + List selectListByIds(Collection userIds); /** * 通过角色ID查询用户ID @@ -127,7 +128,7 @@ public interface RemoteUserService { * @param roleIds 角色ids * @return 用户ids */ - List selectUserIdsByRoleIds(List roleIds); + List selectUserIdsByRoleIds(Collection roleIds); /** * 通过角色ID查询用户 @@ -135,7 +136,7 @@ public interface RemoteUserService { * @param roleIds 角色ids * @return 用户 */ - List selectUsersByRoleIds(List roleIds); + List selectUsersByRoleIds(Collection roleIds); /** * 通过部门ID查询用户 @@ -143,7 +144,7 @@ public interface RemoteUserService { * @param deptIds 部门ids * @return 用户 */ - List selectUsersByDeptIds(List deptIds); + List selectUsersByDeptIds(Collection deptIds); /** * 通过岗位ID查询用户 @@ -151,7 +152,7 @@ public interface RemoteUserService { * @param postIds 岗位ids * @return 用户 */ - List selectUsersByPostIds(List postIds); + List selectUsersByPostIds(Collection postIds); /** * 根据用户 ID 列表查询用户昵称映射关系 @@ -159,6 +160,6 @@ public interface RemoteUserService { * @param userIds 用户 ID 列表 * @return Map,其中 key 为用户 ID,value 为对应的用户昵称 */ - Map selectUserNicksByIds(List userIds); + Map selectUserNicksByIds(Collection userIds); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTaskAssigneeVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTaskAssigneeVo.java index aba8bde92..eddbde26a 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTaskAssigneeVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTaskAssigneeVo.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.function.Function; @@ -42,7 +43,7 @@ public class RemoteTaskAssigneeVo implements Serializable { * 将源列表转换为 TaskHandler 列表 * * @param 通用类型 - * @param sourceList 待转换的源列表 + * @param sourceCollection 待转换的源列表 * @param storageId 提取 storageId 的函数 * @param handlerCode 提取 handlerCode 的函数 * @param handlerName 提取 handlerName 的函数 @@ -51,13 +52,13 @@ public class RemoteTaskAssigneeVo implements Serializable { * @return 转换后的 TaskHandler 列表 */ public static List convertToHandlerList( - List sourceList, + Collection sourceCollection, Function storageId, Function handlerCode, Function handlerName, Function groupName, Function createTimeMapper) { - return sourceList.stream() + return sourceCollection.stream() .map(item -> new TaskHandler( storageId.apply(item), handlerCode.apply(item), diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java index 2cd938df1..a89a755ea 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java @@ -5,10 +5,10 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.util.List; +import java.util.Collection; /** - * 分页结果对象 + * 表格分页数据对象 * * @author Lion Li */ @@ -27,27 +27,42 @@ public class PageResult implements Serializable { /** * 列表数据 */ - private List rows; + private Collection rows; - public PageResult(List list, long total) { + /** + * 分页 + * + * @param list 列表数据 + * @param total 总记录数 + */ + public PageResult(Collection list, long total) { this.rows = list; this.total = total; } - public static PageResult build(List list, long total) { + /** + * 根据分页对象构建表格分页数据对象 + */ + public static PageResult build(Collection list, long total) { PageResult rspData = new PageResult<>(); rspData.setRows(list); rspData.setTotal(total); return rspData; } - public static PageResult build(List list) { + /** + * 根据数据列表构建表格分页数据对象 + */ + public static PageResult build(Collection list) { PageResult rspData = new PageResult<>(); rspData.setRows(list); rspData.setTotal(list.size()); return rspData; } + /** + * 构建表格分页数据对象 + */ public static PageResult build() { return new PageResult<>(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java index 148f5f90c..582f8a42a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java @@ -15,6 +15,7 @@ import org.dromara.system.mapper.SysDeptMapper; import org.dromara.system.service.ISysDeptService; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -75,7 +76,7 @@ public class RemoteDeptServiceImpl implements RemoteDeptService { * @return Map,其中 key 为部门 ID,value 为对应的部门名称 */ @Override - public Map selectDeptNamesByIds(List deptIds) { + public Map selectDeptNamesByIds(Collection deptIds) { if (CollUtil.isEmpty(deptIds)) { return Collections.emptyMap(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java index ffe79755c..a0258cd7c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.system.domain.SysPost; import org.dromara.system.mapper.SysPostMapper; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class RemotePostServiceImpl implements RemotePostService { * @return Map,其中 key 为岗位 ID,value 为对应的岗位名称 */ @Override - public Map selectPostNamesByIds(List postIds) { + public Map selectPostNamesByIds(Collection postIds) { if (CollUtil.isEmpty(postIds)) { return Collections.emptyMap(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java index 9ce4afdeb..277ec37fc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.system.domain.SysRole; import org.dromara.system.mapper.SysRoleMapper; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class RemoteRoleServiceImpl implements RemoteRoleService { * @return Map,其中 key 为角色 ID,value 为对应的角色名称 */ @Override - public Map selectRoleNamesByIds(List roleIds) { + public Map selectRoleNamesByIds(Collection roleIds) { if (CollUtil.isEmpty(roleIds)) { return Collections.emptyMap(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java index 01c5290da..e633d29bb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java @@ -294,9 +294,9 @@ public class RemoteUserServiceImpl implements RemoteUserService { * @see org.dromara.system.domain.convert.SysUserVoConvert */ @Override - public List selectListByIds(List userIds) { + public List selectListByIds(Collection userIds) { if (CollUtil.isEmpty(userIds)) { - return new ArrayList<>(); + return List.of(); } List list = userMapper.selectVoList(new LambdaQueryWrapper() .select(SysUser::getUserId, SysUser::getDeptId, SysUser::getUserName, @@ -315,9 +315,9 @@ public class RemoteUserServiceImpl implements RemoteUserService { * @return 用户ids */ @Override - public List selectUserIdsByRoleIds(List roleIds) { + public List selectUserIdsByRoleIds(Collection roleIds) { if (CollUtil.isEmpty(roleIds)) { - return new ArrayList<>(); + return List.of(); } return userService.selectUserIdsByRoleIds(roleIds); } @@ -329,7 +329,7 @@ public class RemoteUserServiceImpl implements RemoteUserService { * @return 用户 */ @Override - public List selectUsersByRoleIds(List roleIds) { + public List selectUsersByRoleIds(Collection roleIds) { if (CollUtil.isEmpty(roleIds)) { return List.of(); } @@ -351,7 +351,7 @@ public class RemoteUserServiceImpl implements RemoteUserService { * @return 用户 */ @Override - public List selectUsersByDeptIds(List deptIds) { + public List selectUsersByDeptIds(Collection deptIds) { if (CollUtil.isEmpty(deptIds)) { return List.of(); } @@ -369,7 +369,7 @@ public class RemoteUserServiceImpl implements RemoteUserService { * @return 用户 */ @Override - public List selectUsersByPostIds(List postIds) { + public List selectUsersByPostIds(Collection postIds) { if (CollUtil.isEmpty(postIds)) { return List.of(); } @@ -390,9 +390,9 @@ public class RemoteUserServiceImpl implements RemoteUserService { * @param userIds 用户 ID 列表 * @return Map,其中 key 为用户 ID,value 为对应的用户昵称 */ - public Map selectUserNicksByIds(List userIds) { + public Map selectUserNicksByIds(Collection userIds) { if (CollUtil.isEmpty(userIds)) { - return Collections.emptyMap(); + return List.of(); } List list = userMapper.selectList( new LambdaQueryWrapper() diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index bacf2ec2b..ee21aa64a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -6,6 +6,7 @@ import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; +import java.util.Collection; import java.util.List; /** @@ -272,6 +273,6 @@ public interface ISysUserService { * @param roleIds 角色ids * @return 用户ids */ - List selectUserIdsByRoleIds(List roleIds); + List selectUserIdsByRoleIds(Collection roleIds); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 84d89c96f..418cc7060 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -33,10 +33,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 用户 业务层处理 @@ -557,7 +554,7 @@ public class SysUserServiceImpl implements ISysUserService { } @Override - public List selectUserIdsByRoleIds(List roleIds) { + public List selectUserIdsByRoleIds(Collection roleIds) { List userRoles = userRoleMapper.selectList( new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); return StreamUtils.toList(userRoles, SysUserRole::getUserId);