From b5cbb58c2d1cbbae220eb4fd81ef348b394b0db3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 14:23:56 +0800
Subject: [PATCH] update 优化 简化一些方法的写法
---
ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java | 15 +++++----------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 5 ++---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 9 ++-------
3 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
index 09e1dc7..1cef027 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
@@ -2,6 +2,7 @@
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.constant.UserConstants;
import com.ruoyi.common.core.domain.model.LoginUser;
@@ -80,18 +81,12 @@
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-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index eea81fe..d724411 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.service.impl;
import cn.dev33.satoken.context.SaHolder;
-import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -245,7 +244,7 @@
SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
}
- Map<String, String> map = CollStreamUtil.toMap(datas, SysDictData::getDictValue, SysDictData::getDictLabel);
+ Map<String, String> 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))
@@ -273,7 +272,7 @@
SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, datas);
}
- Map<String, String> map = CollStreamUtil.toMap(datas, SysDictData::getDictLabel, SysDictData::getDictValue);
+ Map<String, String> 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-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index ea6c604..4d34067 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.TreeBuildUtils;
import com.ruoyi.system.domain.SysRoleMenu;
@@ -425,13 +426,7 @@
* 寰楀埌瀛愯妭鐐瑰垪琛�
*/
private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
- List<SysMenu> tlist = new ArrayList<SysMenu>();
- 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()));
}
/**
--
Gitblit v1.9.3