diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java index 9aea0c1a..cea583b6 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java @@ -17,8 +17,8 @@ package top.charles7c.cnadmin.common.base; import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -104,7 +104,7 @@ public abstract class BaseServiceImpl, T, V, D, Q, C ext public List> tree(Q query, SortQuery sortQuery, boolean isSimple) { List list = this.list(query, sortQuery); if (CollUtil.isEmpty(list)) { - return Collections.emptyList(); + return new ArrayList<>(0); } // 如果构建简单树结构,则不包含基本树结构之外的扩展字段 @@ -205,7 +205,7 @@ public abstract class BaseServiceImpl, T, V, D, Q, C ext queryWrapper.orderBy(order != null, order.isAscending(), StrUtil.toUnderlineCase(order.getProperty())); } List entityList = baseMapper.selectList(queryWrapper); - return CollUtil.isNotEmpty(entityList) ? BeanUtil.copyToList(entityList, targetClass) : Collections.emptyList(); + return BeanUtil.copyToList(entityList, targetClass); } /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CharConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CharConsts.java index dee0a0ea..c319567e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CharConsts.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CharConsts.java @@ -34,4 +34,9 @@ public class CharConsts implements CharPool { * 分号 */ public static final String SEMICOLON = ";"; + + /** + * 空字符串 + */ + public static final String EMPTY = ""; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java index 5d50c09c..8b11b837 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java @@ -120,7 +120,7 @@ public class PageDataVO { int fromIndex = (page - 1) * size; int toIndex = page * size + size; if (fromIndex > list.size()) { - pageDataVO.setList(new ArrayList<>()); + pageDataVO.setList(new ArrayList<>(0)); } else if (toIndex >= list.size()) { pageDataVO.setList(list.subList(fromIndex, list.size())); } else { diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java index 2ec7eef7..6f8ceeb4 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java @@ -18,8 +18,8 @@ package top.charles7c.cnadmin.common.util; import java.io.File; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import javax.mail.MessagingException; @@ -229,7 +229,7 @@ public class MailUtils { */ private static List splitAddress(String addresses) { if (StrUtil.isBlank(addresses)) { - return Collections.emptyList(); + return new ArrayList<>(0); } List result; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java index 429fc02b..48d44b43 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java @@ -24,10 +24,10 @@ import java.util.stream.Collectors; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.StringUtils; - import cn.hutool.core.collection.CollUtil; +import top.charles7c.cnadmin.common.constant.CharConsts; + /** * Stream 工具类 * @@ -52,7 +52,7 @@ public class StreamUtils { */ public static String join(Collection collection, Function function, CharSequence delimiter) { if (CollUtil.isEmpty(collection)) { - return StringUtils.EMPTY; + return CharConsts.EMPTY; } return collection.stream().map(function).filter(Objects::nonNull).collect(Collectors.joining(delimiter)); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/TreeUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/TreeUtils.java index d5d372a1..ac4cb246 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/TreeUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/TreeUtils.java @@ -16,7 +16,7 @@ package top.charles7c.cnadmin.common.util; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; import lombok.AccessLevel; @@ -79,7 +79,7 @@ public class TreeUtils { */ public static List> build(List list, TreeNodeConfig treeNodeConfig, NodeParser nodeParser) { if (CollUtil.isEmpty(list)) { - return Collections.emptyList(); + return new ArrayList<>(0); } E parentId = (E)ReflectUtil.getFieldValue(list.get(0), treeNodeConfig.getParentIdKey()); return TreeUtil.build(list, parentId, treeNodeConfig, nodeParser); diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java index ffdbff35..a4569627 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java @@ -16,7 +16,7 @@ package top.charles7c.cnadmin.system.service.impl; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -60,7 +60,7 @@ public class RoleMenuServiceImpl implements RoleMenuService { @Override public List listMenuIdByRoleIds(List roleIds) { if (CollUtil.isEmpty(roleIds)) { - return Collections.emptyList(); + return new ArrayList<>(0); } return roleMenuMapper.selectMenuIdsByRoleIds(roleIds); } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java index 68de0fd4..65a7de5e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java @@ -16,7 +16,7 @@ package top.charles7c.cnadmin.system.service.impl; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -141,7 +141,7 @@ public class RoleServiceImpl extends BaseServiceImpl menuIds = list.stream().map(MenuVO::getMenuId).collect(Collectors.toList()); detailVO.setMenuIds(menuIds); } else { - detailVO.setMenuIds(roleMenuService.listMenuIdByRoleIds(Collections.singletonList(roleId))); + detailVO.setMenuIds(roleMenuService.listMenuIdByRoleIds(CollUtil.newArrayList(roleId))); } detailVO.setDeptIds(roleDeptService.listDeptIdByRoleId(roleId)); } @@ -150,7 +150,7 @@ public class RoleServiceImpl extends BaseServiceImpl> buildDict(List list) { if (CollUtil.isEmpty(list)) { - return Collections.emptyList(); + return new ArrayList<>(0); } return list.stream().map(r -> new LabelValueVO<>(r.getRoleName(), r.getRoleId())).collect(Collectors.toList()); } @@ -158,9 +158,6 @@ public class RoleServiceImpl extends BaseServiceImpl listRoleNamesByRoleIds(List roleIds) { List roleList = super.lambdaQuery().select(RoleDO::getRoleName).in(RoleDO::getRoleId, roleIds).list(); - if (CollUtil.isEmpty(roleList)) { - return Collections.emptyList(); - } return roleList.stream().map(RoleDO::getRoleName).collect(Collectors.toList()); } @@ -168,9 +165,6 @@ public class RoleServiceImpl extends BaseServiceImpl listRoleCodesByUserId(Long userId) { List roleIds = userRoleService.listRoleIdsByUserId(userId); List roleList = super.lambdaQuery().select(RoleDO::getRoleCode).in(RoleDO::getRoleId, roleIds).list(); - if (CollUtil.isEmpty(roleList)) { - return Collections.emptySet(); - } return roleList.stream().map(RoleDO::getRoleCode).collect(Collectors.toSet()); } }