From 96f7482da50589da1e908f32c7fca24420e4e815 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, 24 Nov 2022 14:26:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E4=B8=80=E4=BA=9B=E6=96=B9=E6=B3=95=E7=9A=84=E5=86=99?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dict/service/impl/DictServiceImpl.java | 6 +++--- .../ruoyi/common/satoken/utils/LoginHelper.java | 15 +++++---------- .../system/service/impl/SysMenuServiceImpl.java | 9 ++------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/service/impl/DictServiceImpl.java b/ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/service/impl/DictServiceImpl.java index a29af23a..970c0759 100644 --- a/ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/service/impl/DictServiceImpl.java +++ b/ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/service/impl/DictServiceImpl.java @@ -1,10 +1,10 @@ package com.ruoyi.common.dict.service.impl; import cn.dev33.satoken.context.SaHolder; -import cn.hutool.core.collection.CollStreamUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.service.DictService; +import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.RemoteDictService; import com.ruoyi.system.api.domain.SysDictData; @@ -45,7 +45,7 @@ public class DictServiceImpl implements DictService { SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas); } - Map map = CollStreamUtil.toMap(datas, SysDictData::getDictValue, SysDictData::getDictLabel); + Map map = StreamUtils.toMap(datas, SysDictData::getDictValue, SysDictData::getDictLabel); if (StringUtils.containsAny(dictValue, separator)) { return Arrays.stream(dictValue.split(separator)) .map(v -> map.getOrDefault(v, StringUtils.EMPTY)) @@ -73,7 +73,7 @@ public class DictServiceImpl implements DictService { SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas); } - Map map = CollStreamUtil.toMap(datas, SysDictData::getDictLabel, SysDictData::getDictValue); + Map map = StreamUtils.toMap(datas, SysDictData::getDictLabel, SysDictData::getDictValue); if (StringUtils.containsAny(dictLabel, separator)) { return Arrays.stream(dictLabel.split(separator)) .map(l -> map.getOrDefault(l, StringUtils.EMPTY)) diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java index 8d6ea663..96da2c1a 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java @@ -2,6 +2,7 @@ package com.ruoyi.common.satoken.utils; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.enums.DeviceType; @@ -80,18 +81,12 @@ public class LoginHelper { LoginUser loginUser = getLoginUser(); if (ObjectUtil.isNull(loginUser)) { String loginId = StpUtil.getLoginIdAsString(); - String userId = null; - for (UserType value : UserType.values()) { - if (StringUtils.contains(loginId, value.getUserType())) { - String[] strs = StringUtils.split(loginId, JOIN_CODE); - // 用户id在总是在最后 - userId = strs[strs.length - 1]; - } - } - if (StringUtils.isBlank(userId)) { + String[] strs = StringUtils.split(loginId, JOIN_CODE); + if (!ArrayUtil.containsAny(strs, UserType.values())) { throw new UtilException("登录用户: LoginId异常 => " + loginId); } - return Long.parseLong(userId); + // 用户id在总是在最后 + return Long.parseLong(strs[strs.length - 1]); } return loginUser.getUserId(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index b23f48e8..e5c829f3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.UserConstants; +import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.TreeBuildUtils; import com.ruoyi.common.satoken.utils.LoginHelper; @@ -426,13 +427,7 @@ public class SysMenuServiceImpl implements ISysMenuService { * 得到子节点列表 */ private List getChildList(List list, SysMenu t) { - List tlist = new ArrayList(); - for (SysMenu n : list) { - if (n.getParentId().longValue() == t.getMenuId().longValue()) { - tlist.add(n); - } - } - return tlist; + return StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId())); } /**