msb_6557
/
opsli-boot
mirror of https://github.com/hiparker/opsli-boot.git
1
1
Code Issues Projects Releases Wiki Activity

User工具类优化

Browse Source
v1.4.1
Parker 5 years ago
parent e6ec77eb7f
commit 4923f4bbb3
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File

25
opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserUtil.java
Unescape View File

@ -15,6 +15,7 @@
*/ */
package org.opsli.core.utils; package org.opsli.core.utils;
import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@ -247,12 +248,12 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId); Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId);
if(obj instanceof List){ if(obj instanceof List){
List<String> list = (List<String>) obj; List<String> list = Convert.toList(String.class, obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
return list; return list;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(String.class); return jsonArray.toJavaList(String.class);
} }
@ -286,12 +287,12 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId); Object obj = CacheUtil.get(PREFIX_ID_ROLES + userId);
if(obj instanceof List){ if(obj instanceof List){
List<String> list = (List<String>) obj; List<String> list = Convert.toList(String.class, obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
return list; return list;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(String.class); return jsonArray.toJavaList(String.class);
} }
@ -334,12 +335,12 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId); Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId);
if(obj instanceof List){ if(obj instanceof List){
List<String> list = (List<String>) obj; List<String> list = Convert.toList(String.class, obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
return list; return list;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(String.class); return jsonArray.toJavaList(String.class);
} }
@ -374,12 +375,12 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId); Object obj = CacheUtil.get(PREFIX_ID_PERMISSIONS + userId);
if(obj instanceof List){ if(obj instanceof List){
List<String> list = (List<String>) obj; List<String> list = Convert.toList(String.class, obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
return list; return list;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(String.class); return jsonArray.toJavaList(String.class);
} }
@ -421,7 +422,7 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId); Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId);
if(obj instanceof List){ if(obj instanceof List){
List<Object> list = (List<Object>) obj; List<?> list = Convert.toList(obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size()); List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size());
for (Object menuObj : list) { for (Object menuObj : list) {
@ -436,7 +437,7 @@ public class UserUtil {
return menuModels; return menuModels;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(MenuModel.class); return jsonArray.toJavaList(MenuModel.class);
} }
@ -471,7 +472,7 @@ public class UserUtil {
try { try {
Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId); Object obj = CacheUtil.get(PREFIX_ID_MENUS + userId);
if(obj instanceof List){ if(obj instanceof List){
List<Object> list = (List<Object>) obj; List<?> list = Convert.toList(obj);
if (!list.isEmpty()) { if (!list.isEmpty()) {
List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size()); List<MenuModel> menuModels = Lists.newArrayListWithCapacity(list.size());
for (Object menuObj : list) { for (Object menuObj : list) {
@ -486,7 +487,7 @@ public class UserUtil {
return menuModels; return menuModels;
} }
}else { }else {
JSONArray jsonArray = (JSONArray) obj; JSONArray jsonArray = Convert.convert(JSONArray.class, obj);
if (jsonArray != null && !jsonArray.isEmpty()) { if (jsonArray != null && !jsonArray.isEmpty()) {
return jsonArray.toJavaList(MenuModel.class); return jsonArray.toJavaList(MenuModel.class);
} }

Write Preview
Loading…
Cancel
Save