From 7fb4668c520d7f333afafe0c405923e62155bcab Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Sat, 2 Apr 2022 11:31:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ISystemRoleMenuServiceImpl.java | 3 +- .../com/hxkj/admin/vo/album/AlbumCateVo.java | 3 + .../java/com/hxkj/admin/vo/album/AlbumVo.java | 3 + .../com/hxkj/admin/vo/system/LogLoginVo.java | 3 + .../hxkj/admin/vo/system/LogOperateVo.java | 3 + .../hxkj/admin/vo/system/SystemAdminVo.java | 3 + .../hxkj/admin/vo/system/SystemMenuVo.java | 3 + .../hxkj/admin/vo/system/SystemRoleVo.java | 3 + like-admin/src/main/resources/banner.txt | 10 ++ .../java/com/hxkj/common/utils/ArrayUtil.java | 140 ++++++++++++++++++ .../com/hxkj/common/utils/StringUtil.java | 36 ++--- .../java/com/hxkj/common/utils/ToolsUtil.java | 34 +---- 12 files changed, 200 insertions(+), 44 deletions(-) create mode 100644 like-admin/src/main/resources/banner.txt diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/ISystemRoleMenuServiceImpl.java b/like-admin/src/main/java/com/hxkj/admin/service/impl/ISystemRoleMenuServiceImpl.java index aebf9a34..6f79d100 100644 --- a/like-admin/src/main/java/com/hxkj/admin/service/impl/ISystemRoleMenuServiceImpl.java +++ b/like-admin/src/main/java/com/hxkj/admin/service/impl/ISystemRoleMenuServiceImpl.java @@ -7,6 +7,7 @@ import com.hxkj.common.entity.system.SystemMenu; import com.hxkj.common.entity.system.SystemRoleMenu; import com.hxkj.common.mapper.system.SystemMenuMapper; import com.hxkj.common.mapper.system.SystemRoleMenuMapper; +import com.hxkj.common.utils.ArrayUtil; import com.hxkj.common.utils.RedisUtil; import com.hxkj.common.utils.ToolsUtil; import org.springframework.stereotype.Service; @@ -113,7 +114,7 @@ public class ISystemRoleMenuServiceImpl implements ISystemRoleMenuService { } } - RedisUtil.hSet(SystemConfig.backstageRolesKey, String.valueOf(roleId), ToolsUtil.listStrToString(menuArray, ",")); + RedisUtil.hSet(SystemConfig.backstageRolesKey, String.valueOf(roleId), ArrayUtil.listStrToString(menuArray, ",")); } } diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java b/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java index d71ec556..000ca700 100644 --- a/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java +++ b/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java @@ -4,6 +4,9 @@ import lombok.Data; import java.io.Serializable; +/** + * 相册分类Vo + */ @Data public class AlbumCateVo implements Serializable { diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java b/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java index 7962badf..53dcb2ed 100644 --- a/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java +++ b/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java @@ -4,6 +4,9 @@ import lombok.Data; import java.io.Serializable; +/** + * 相册Vo + */ @Data public class AlbumVo implements Serializable { diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java b/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java index ebfc0ac0..a41e1430 100644 --- a/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java +++ b/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java @@ -4,6 +4,9 @@ import lombok.Data; import java.io.Serializable; +/** + * 登录日志Vo + */ @Data public class LogLoginVo implements Serializable { diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java b/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java index 0c4fab7d..08a5ec8b 100644 --- a/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java +++ b/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java @@ -4,6 +4,9 @@ import lombok.Data; import java.io.Serializable; +/** + * 操作日志Vo + */ @Data public class LogOperateVo implements Serializable { diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java b/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java index 664f54c2..13b44e3c 100644 --- a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java +++ b/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java @@ -4,6 +4,9 @@ import lombok.Data; import java.io.Serializable; +/** + * 管理员Vo + */ @Data public class SystemAdminVo implements Serializable { diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java b/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java index c1f6d27e..afc18072 100644 --- a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java +++ b/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java @@ -4,6 +4,9 @@ import lombok.Data; import java.io.Serializable; +/** + * 系统菜单Vo + */ @Data public class SystemMenuVo implements Serializable { diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java b/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java index 0c6d7ad1..865f75d0 100644 --- a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java +++ b/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java @@ -4,6 +4,9 @@ import lombok.Data; import java.io.Serializable; +/** + * 系统角色Vo + */ @Data public class SystemRoleVo implements Serializable { diff --git a/like-admin/src/main/resources/banner.txt b/like-admin/src/main/resources/banner.txt new file mode 100644 index 00000000..b8eebe5c --- /dev/null +++ b/like-admin/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +/////////////////////////////////////////////////////// +// _ _ _ _ _ _ // +// | | (_) | __ / \ __| |_ __ ___ (_)_ __ // +// | | | | |/ / / _ \ / _` | '_ ` _ \| | '_ \ // +// | |___| | < / ___ \ (_| | | | | | | | | | | // +// |_____|_|_|\_\/_/ \_\__,_|_| |_| |_|_|_| |_| // +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // +// 佛祖保佑 永不宕机 永无BUG // +/////////////////////////////////////////////////////// \ No newline at end of file diff --git a/like-common/src/main/java/com/hxkj/common/utils/ArrayUtil.java b/like-common/src/main/java/com/hxkj/common/utils/ArrayUtil.java index 209b9f7b..82f1807a 100644 --- a/like-common/src/main/java/com/hxkj/common/utils/ArrayUtil.java +++ b/like-common/src/main/java/com/hxkj/common/utils/ArrayUtil.java @@ -3,6 +3,11 @@ package com.hxkj.common.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * 数组工具类 */ @@ -53,5 +58,140 @@ public class ArrayUtil { return r; } + /** + * List去重,不打乱原来顺序,泛型list对象 + * 对象重写hashCode和equals + * + * @author fzr + * @param 泛型 + * @param list 列表 + * @return List + */ + public static List uniqueBySetOrder(List list){ + Set set = new HashSet(); + List newList = new ArrayList(); + for(T t: list){ + if(set.add(t)){ + newList.add(t); + } + } + return newList; + } + + /** + * List去重,可能打乱原来顺序,泛型list对象 + * 对象重写hashCode和equals + * + * @author fzr + * @param list 列表 + * @return List + */ + public static List uniqueBySet(List list){ + return new ArrayList(new HashSet(list)); + } + + /** + * 列表转字符串 + * + * @author fzr + * @param list 列表 [1, 2, 4] -> 1,2,3 + * @param separator 分割符号 + * @return String + */ + public static String listToString(List list, String separator) { + StringBuilder sb = new StringBuilder(); + for (Object o : list) { + sb.append(o).append(separator); + } + return list.isEmpty() ? "" : sb.substring(0, sb.toString().length() - 1); + } + + /** + * 列表转字符串 + * + * @author fzr + * @param list 列表 ["1", "2", "3"] -> 1,2,3 + * @param separator 分割符号 + * @return String + */ + public static String listStrToString(List list, String separator) { + StringBuilder sb = new StringBuilder(); + for (Object o : list) { + sb.append(o).append(separator); + } + return list.isEmpty() ? "" : sb.substring(0, sb.toString().length() - 1); + } + + /** + * 字符串分割,转化为数组 + * + * @author fzr + * @param str 字符串 + * @return List + */ + public static List stringToArray(String str){ + return stringToArrayByRegex(str, ","); + } + + /** + * 字符串分割，转化为数组 + * + * @author fzr + * @param str 字符串 + * @return List + */ + public static List stringToArrayStr(String str){ + return stringToArrayStrRegex(str, ","); + } + + /** + * 字符串分割,转化为数组 + * + * @author fzr + * @param str 字符串 + * @param regex 分隔符 + * @return List + */ + public static List stringToArrayByRegex(String str, String regex){ + List list = new ArrayList<>(); + if (str.contains(regex)){ + + String[] split = str.split(regex); + + for (String value : split) { + if(!StringUtil.isBlank(value)){ + list.add(Integer.parseInt(value.trim())); + } + } + }else { + list.add(Integer.parseInt(str)); + } + return list; + } + + /** + * 字符串分割，转化为数组 + * + * @author fzr + * @param str 字符串 + * @param regex 分隔符 + * @return List + */ + public static List stringToArrayStrRegex(String str, String regex ){ + List list = new ArrayList<>(); + if (str.contains(regex)){ + + String[] split = str.split(regex); + + for (String value : split) { + if(!StringUtil.isBlank(value)){ + list.add(value); + } + } + }else { + list.add(str); + } + return list; + } } diff --git a/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java b/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java index a54562d1..4e702aca 100644 --- a/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java +++ b/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java @@ -7,13 +7,15 @@ import java.util.*; /** * 字符串工具类 */ -public class StringUtil extends org.apache.commons.lang3.StringUtils -{ - - /** 空字符串 */ +public class StringUtil extends org.apache.commons.lang3.StringUtils { + /** + * 空字符串 + */ private static final String NULL_STR = ""; - /** 下划线 */ + /** + * 下划线 + */ private static final char SEPARATOR = '_'; /** @@ -27,10 +29,10 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils } /** - * 判断一个Collection是否为空, 包含List, Set, Queue + * 判断一个Collection是否为空,包含List, Set, Queue * * @param coll 要判断的Collection - * @return true：为空 false：非空 + * @return true=为空, false=非空 */ public static boolean isEmpty(Collection coll) { return isNull(coll) || coll.isEmpty(); @@ -40,7 +42,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个Collection是否非空,包含List, Set, Queue * * @param coll 要判断的Collection - * @return true：非空 false：空 + * @return true=非空, false=空 */ public static boolean isNotEmpty(Collection coll) { return !isEmpty(coll); @@ -50,7 +52,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个对象数组是否为空 * * @param objects 要判断的对象数组 - * @return true：为空 false：非空 + * @return true=为空, false=非空 */ public static boolean isEmpty(Object[] objects) { return isNull(objects) || (objects.length == 0); @@ -60,7 +62,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个对象数组是否非空 * * @param objects 要判断的对象数组 - * @return true：非空 false：空 + * @return true=非空, false=空 */ public static boolean isNotEmpty(Object[] objects) { return !isEmpty(objects); @@ -70,7 +72,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个Map是否为空 * * @param map 要判断的Map - * @return true：为空 false：非空 + * @return true=为空, false=非空 */ public static boolean isEmpty(Map map) { return isNull(map) || map.isEmpty(); @@ -80,7 +82,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个Map是否为空 * * @param map 要判断的Map - * @return true：非空 false：空 + * @return true=非空, false=空 */ public static boolean isNotEmpty(Map map) { return !isEmpty(map); @@ -90,7 +92,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个字符串是否为空串 * * @param str String - * @return true：为空 false：非空 + * @return true=为空, false=非空 */ public static boolean isEmpty(String str) { return isNull(str) || NULL_STR.equals(str.trim()); @@ -100,7 +102,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个字符串是否为非空串 * * @param str String - * @return true：非空串 false：空串 + * @return true=非空串, false=空串 */ public static boolean isNotEmpty(String str) { return !isEmpty(str); @@ -110,7 +112,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个对象是否为空 * * @param object Object - * @return true：为空 false：非空 + * @return true=为空, false=非空 */ public static boolean isNull(Object object) { return object == null; @@ -120,7 +122,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个对象是否非空 * * @param object Object - * @return true：非空 false：空 + * @return true=非空, false=空 */ public static boolean isNotNull(Object object) { return !isNull(object); @@ -130,7 +132,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils * 判断一个对象是否是数组类型（Java基本型别的数组） * * @param object 对象 - * @return true：是数组 false：不是数组 + * @return true=是数组, false=不是数组 */ public static boolean isArray(Object object) { return isNotNull(object) && object.getClass().isArray(); diff --git a/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java b/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java index 49b599f6..abe9ff80 100644 --- a/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java +++ b/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java @@ -157,35 +157,17 @@ public class ToolsUtil { } /** - * 列表转字符串 + * map合并 * * @author fzr - * @param list 列表 [1, 2, 4] -> 1,2,3 - * @param separator 分割符号 - * @return String + * @param map 对象 + * @return Object */ - public static String listToString(List list, String separator) { - StringBuilder sb = new StringBuilder(); - for (Object o : list) { - sb.append(o).append(separator); - } - return list.isEmpty() ? "" : sb.substring(0, sb.toString().length() - 1); - } - - /** - * 列表转字符串 - * - * @author fzr - * @param list 列表 ["1", "2", "3"] -> 1,2,3 - * @param separator 分割符号 - * @return String - */ - public static String listStrToString(List list, String separator) { - StringBuilder sb = new StringBuilder(); - for (Object o : list) { - sb.append(o).append(separator); - } - return list.isEmpty() ? "" : sb.substring(0, sb.toString().length() - 1); + public static Map mergeMap(Map map, Map map1){ + HashMap map2 = new HashMap<>(); + map2.putAll(map); + map2.putAll(map1); + return map2; } }