diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java index 4133725c..8778c4ff 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java @@ -110,10 +110,12 @@ public class KitRedisHelper { ScanOptions options = ScanOptions.scanOptions().match(pattern).build(); RedisConnectionFactory factory = redisTemplate.getConnectionFactory(); RedisConnection rc = Objects.requireNonNull(factory).getConnection(); - Cursor cursor = rc.scan(options); - List result = new ArrayList<>(); - while (cursor.hasNext()) { - result.add(new String(cursor.next())); + List result; + try (Cursor cursor = rc.scan(options)) { + result = new ArrayList<>(); + while (cursor.hasNext()) { + result.add(new String(cursor.next())); + } } try { RedisConnectionUtils.releaseConnection(rc, factory); diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java index 01ebabcc..82548e83 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java @@ -15,6 +15,7 @@ */ package cn.odboy.util; +import cn.hutool.core.collection.CollUtil; import cn.odboy.base.KitSelectOptionVo; import com.alibaba.fastjson2.JSON; import java.lang.reflect.Field; @@ -38,7 +39,7 @@ import lombok.experimental.UtilityClass; * @date 2022-11-09 */ @UtilityClass -public final class KitCollUtil extends cn.hutool.core.collection.CollUtil { +public final class KitCollUtil extends CollUtil { private static Predicate distinctPredicate(Function keyMapper) { Map map = new HashMap<>(3); @@ -192,6 +193,7 @@ public final class KitCollUtil extends cn.hutool.core.collection.CollUtil { * @return / */ public static BigDecimal streamBigDecimalAvg(List data) { + KitValidUtil.notEmpty(data, "data"); return data.stream().filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add) .divide(BigDecimal.valueOf(data.size()), 6, RoundingMode.FLOOR); } diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java index 81ab6c2a..d69de63a 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java @@ -81,10 +81,6 @@ public final class KitFileUtil extends FileUtil { * 定义KB的计算常量 */ private static final int KB = 1024; - /** - * 格式化小数 - */ - private static final DecimalFormat DF = new DecimalFormat("0.00"); /** * MultipartFile转File @@ -113,13 +109,13 @@ public final class KitFileUtil extends FileUtil { String resultSize; if (size / GB >= 1) { //如果当前Byte的值大于等于1GB - resultSize = DF.format(size / (float) GB) + " GB"; + resultSize = new DecimalFormat("0.00").format(size / (float) GB) + " GB"; } else if (size / MB >= 1) { //如果当前Byte的值大于等于1MB - resultSize = DF.format(size / (float) MB) + " MB"; + resultSize = new DecimalFormat("0.00").format(size / (float) MB) + " MB"; } else if (size / KB >= 1) { //如果当前Byte的值大于等于1KB - resultSize = DF.format(size / (float) KB) + " KB"; + resultSize = new DecimalFormat("0.00").format(size / (float) KB) + " KB"; } else { resultSize = size + " B"; } diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java index 995e44ac..77bccc8d 100644 --- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java +++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java @@ -15,16 +15,18 @@ */ package cn.odboy.util; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.exception.BadRequestException; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validation; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.groups.Default; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; +import javax.validation.constraints.NotNull; +import javax.validation.groups.Default; import lombok.experimental.UtilityClass; /** @@ -65,7 +67,7 @@ public final class KitValidUtil { } public static void notNull(Object value, @NotNull String name, @NotNull String code) { - if (value != null) { + if (value == null) { throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code)); } } @@ -81,4 +83,10 @@ public final class KitValidUtil { throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code)); } } + + public static void notEmpty(List data, @NotNull String code) { + if (CollUtil.isEmpty(data)) { + throw new BadRequestException(String.format("参数 %s 必填", code)); + } + } } \ No newline at end of file diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java index 4133725c..8778c4ff 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java @@ -110,10 +110,12 @@ public class KitRedisHelper { ScanOptions options = ScanOptions.scanOptions().match(pattern).build(); RedisConnectionFactory factory = redisTemplate.getConnectionFactory(); RedisConnection rc = Objects.requireNonNull(factory).getConnection(); - Cursor cursor = rc.scan(options); - List result = new ArrayList<>(); - while (cursor.hasNext()) { - result.add(new String(cursor.next())); + List result; + try (Cursor cursor = rc.scan(options)) { + result = new ArrayList<>(); + while (cursor.hasNext()) { + result.add(new String(cursor.next())); + } } try { RedisConnectionUtils.releaseConnection(rc, factory); diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java index 01ebabcc..79068d96 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java @@ -15,7 +15,9 @@ */ package cn.odboy.util; +import cn.hutool.core.collection.CollUtil; import cn.odboy.base.KitSelectOptionVo; +import cn.odboy.framework.exception.BadRequestException; import com.alibaba.fastjson2.JSON; import java.lang.reflect.Field; import java.math.BigDecimal; @@ -192,6 +194,7 @@ public final class KitCollUtil extends cn.hutool.core.collection.CollUtil { * @return / */ public static BigDecimal streamBigDecimalAvg(List data) { + KitValidUtil.notEmpty(data, "data"); return data.stream().filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add) .divide(BigDecimal.valueOf(data.size()), 6, RoundingMode.FLOOR); } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java index 55f8ea58..a2a8df19 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java @@ -81,10 +81,6 @@ public final class KitFileUtil extends FileUtil { * 定义KB的计算常量 */ private static final int KB = 1024; - /** - * 格式化小数 - */ - private static final DecimalFormat DF = new DecimalFormat("0.00"); /** * MultipartFile转File @@ -113,13 +109,13 @@ public final class KitFileUtil extends FileUtil { String resultSize; if (size / GB >= 1) { //如果当前Byte的值大于等于1GB - resultSize = DF.format(size / (float) GB) + " GB"; + resultSize = new DecimalFormat("0.00").format(size / (float) GB) + " GB"; } else if (size / MB >= 1) { //如果当前Byte的值大于等于1MB - resultSize = DF.format(size / (float) MB) + " MB"; + resultSize = new DecimalFormat("0.00").format(size / (float) MB) + " MB"; } else if (size / KB >= 1) { //如果当前Byte的值大于等于1KB - resultSize = DF.format(size / (float) KB) + " KB"; + resultSize = new DecimalFormat("0.00").format(size / (float) KB) + " KB"; } else { resultSize = size + " B"; } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java index a68cab2a..77bccc8d 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java @@ -15,8 +15,10 @@ */ package cn.odboy.util; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.odboy.framework.exception.BadRequestException; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; import javax.validation.ConstraintViolation; @@ -65,7 +67,7 @@ public final class KitValidUtil { } public static void notNull(Object value, @NotNull String name, @NotNull String code) { - if (value != null) { + if (value == null) { throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code)); } } @@ -81,4 +83,10 @@ public final class KitValidUtil { throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code)); } } + + public static void notEmpty(List data, @NotNull String code) { + if (CollUtil.isEmpty(data)) { + throw new BadRequestException(String.format("参数 %s 必填", code)); + } + } } \ No newline at end of file