mirror of
				https://gitee.com/hhyykk/ipms-sjy.git
				synced 2025-11-04 12:18:42 +08:00 
			
		
		
		
	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts: # sql/mysql/ruoyi-vue-pro.sql
This commit is contained in:
		@@ -16,6 +16,10 @@ public class NumberUtils {
 | 
			
		||||
        return StrUtil.isNotEmpty(str) ? Long.valueOf(str) : null;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public static Integer parseInt(String str) {
 | 
			
		||||
        return StrUtil.isNotEmpty(str) ? Integer.valueOf(str) : null;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 通过经纬度获取地球上两点之间的距离
 | 
			
		||||
     *
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,13 @@
 | 
			
		||||
package cn.iocoder.yudao.framework.common.util.string;
 | 
			
		||||
 | 
			
		||||
import cn.hutool.core.text.StrPool;
 | 
			
		||||
import cn.hutool.core.util.ArrayUtil;
 | 
			
		||||
import cn.hutool.core.util.StrUtil;
 | 
			
		||||
 | 
			
		||||
import java.util.Arrays;
 | 
			
		||||
import java.util.Collection;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import java.util.Set;
 | 
			
		||||
import java.util.stream.Collectors;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
@@ -45,6 +47,15 @@ public class StrUtils {
 | 
			
		||||
        return Arrays.stream(longs).boxed().collect(Collectors.toList());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public static Set<Long> splitToLongSet(String value) {
 | 
			
		||||
        return splitToLongSet(value, StrPool.COMMA);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public static Set<Long> splitToLongSet(String value, CharSequence separator) {
 | 
			
		||||
        long[] longs = StrUtil.splitToLong(value, separator);
 | 
			
		||||
        return Arrays.stream(longs).boxed().collect(Collectors.toSet());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public static List<Integer> splitToInteger(String value, CharSequence separator) {
 | 
			
		||||
        int[] integers = StrUtil.splitToInt(value, separator);
 | 
			
		||||
        return Arrays.stream(integers).boxed().collect(Collectors.toList());
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user