From 0b37392a8fd0a9bbda6e5ceecf52d47b01317786 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Wed, 10 Jun 2026 06:38:46 +0000 Subject: [PATCH] =?UTF-8?q?!856=20update=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=AE=80=E5=8C=96=E7=B1=BB=E5=9E=8B=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update 优化代码，简化类型检查 --- .../common/core/config/ThreadPoolConfig.java | 3 +-- .../core/utils/reflect/ReflectUtils.java | 1 - .../common/encrypt/enums/EncodeType.java | 2 +- .../json/enhance/JsonValueEnhancer.java | 24 +++++++++++-------- .../core/mapper/LambdaCrudChainWrapper.java | 2 ++ .../core/query/LambdaQueryBuilder.java | 22 ++++++++++++++--- .../common/oss/model/HandleAsyncResult.java | 6 ++--- .../common/redis/utils/RedisUtils.java | 6 ++--- .../common/social/utils/SocialUtils.java | 2 -- .../dromara/gen/domain/GenTableColumn.java | 2 +- .../controller/system/SysDeptController.java | 2 +- .../impl/CategoryNameTranslationImpl.java | 1 - 12 files changed, 44 insertions(+), 29 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java index a5f423aea..115cae65c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java @@ -98,9 +98,8 @@ public class ThreadPoolConfig { * @param t 任务执行过程中抛出的异常 */ public static void printException(Runnable r, Throwable t) { - if (t == null && r instanceof Future) { + if (t == null && r instanceof Future future) { try { - Future future = (Future) r; if (future.isDone()) { future.get(); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java index 073983f9e..1ad15501d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java @@ -12,7 +12,6 @@ import java.lang.reflect.Method; * * @author Lion Li */ -@SuppressWarnings("rawtypes") @NoArgsConstructor(access = AccessLevel.PRIVATE) public class ReflectUtils extends ReflectUtil { diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/EncodeType.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/EncodeType.java index 4193225e2..3d587b7c7 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/EncodeType.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/EncodeType.java @@ -21,6 +21,6 @@ public enum EncodeType { /** * 16进制编码 */ - HEX; + HEX } diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/enhance/JsonValueEnhancer.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/enhance/JsonValueEnhancer.java index 4f19a984e..b3c0b7de6 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/enhance/JsonValueEnhancer.java +++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/enhance/JsonValueEnhancer.java @@ -109,16 +109,20 @@ public class JsonValueEnhancer { * @param visited 已访问对象集合，用于避免循环引用 */ private void collectValue(Object value, JsonEnhancementContext context, IdentityHashMap visited) { - if (value == null) { - return; - } - if (value instanceof Map map) { - map.values().forEach(child -> collectValue(child, context, visited)); - return; - } - if (value instanceof Iterable iterable) { - iterable.forEach(child -> collectValue(child, context, visited)); - return; + switch (value) { + case null -> { + return; + } + case Map map -> { + map.values().forEach(child -> collectValue(child, context, visited)); + return; + } + case Iterable iterable -> { + iterable.forEach(child -> collectValue(child, context, visited)); + return; + } + default -> { + } } if (value.getClass().isArray()) { int length = Array.getLength(value); diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java index d8b44becf..4250c1837 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java @@ -122,6 +122,7 @@ public class LambdaCrudChainWrapper extends AbstractLambdaWrapper select(SFunction... columns) { return select(true, CollectionUtils.toList(columns)); @@ -134,6 +135,7 @@ public class LambdaCrudChainWrapper extends AbstractLambdaWrapper select(boolean condition, SFunction... columns) { return select(condition, CollectionUtils.toList(columns)); diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java index 24fe8015c..b5a423eca 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java @@ -400,6 +400,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition eq(boolean condition, SFunction column, Object value) { wrapper.eq(condition, column, value); return this; @@ -425,6 +426,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition ne(boolean condition, SFunction column, Object value) { wrapper.ne(condition, column, value); return this; @@ -450,6 +452,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition gt(boolean condition, SFunction column, Object value) { wrapper.gt(condition, column, value); return this; @@ -475,6 +478,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition ge(boolean condition, SFunction column, Object value) { wrapper.ge(condition, column, value); return this; @@ -500,6 +504,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition lt(boolean condition, SFunction column, Object value) { wrapper.lt(condition, column, value); return this; @@ -525,6 +530,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition le(boolean condition, SFunction column, Object value) { wrapper.le(condition, column, value); return this; @@ -550,6 +556,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition like(boolean condition, SFunction column, Object value) { wrapper.like(condition, column, value); return this; @@ -575,6 +582,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition notLike(boolean condition, SFunction column, Object value) { wrapper.notLike(condition, column, value); return this; @@ -600,6 +608,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition likeLeft(boolean condition, SFunction column, Object value) { wrapper.likeLeft(condition, column, value); return this; @@ -625,6 +634,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition likeRight(boolean condition, SFunction column, Object value) { wrapper.likeRight(condition, column, value); return this; @@ -652,6 +662,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition between(boolean condition, SFunction column, Object begin, Object end) { wrapper.between(condition, column, begin, end); return this; @@ -679,6 +690,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition notBetween(boolean condition, SFunction column, Object begin, Object end) { wrapper.notBetween(condition, column, begin, end); return this; @@ -718,7 +730,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition allEq(BiPredicate, Object> filter, Map params, boolean null2IsNull) { - wrapper.allEq(true, (BiPredicate) filter, (Map) params, null2IsNull); + wrapper.allEq(true, filter, (Map) params, null2IsNull); return this; } @@ -732,7 +744,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition allEq(boolean condition, BiPredicate, Object> filter, Map params, boolean null2IsNull) { - wrapper.allEq(condition, (BiPredicate) filter, (Map) params, null2IsNull); + wrapper.allEq(condition, filter, (Map) params, null2IsNull); return this; } @@ -802,6 +814,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition in(boolean condition, SFunction column, Collection values) { wrapper.in(condition, column, values); return this; @@ -827,6 +840,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition in(boolean condition, SFunction column, Object... values) { wrapper.in(condition, column, values); return this; @@ -852,6 +866,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition notIn(boolean condition, SFunction column, Collection values) { wrapper.notIn(condition, column, values); return this; @@ -877,6 +892,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition notIn(boolean condition, SFunction column, Object... values) { wrapper.notIn(condition, column, values); return this; @@ -1219,6 +1235,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition apply(boolean condition, String applySql, Object... values) { wrapper.apply(condition, applySql, values); return this; @@ -1368,7 +1385,6 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition aggregateWrapper() { return (AggregateLambdaQueryWrapper) wrapper; } diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java index c4ba48a5d..78f6430ca 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java @@ -60,7 +60,7 @@ public record HandleAsyncResult( * @return 异步处理结果 */ public static HandleAsyncResult of(T result, Throwable error) { - return new HandleAsyncResult(result, error); + return new HandleAsyncResult<>(result, error); } /** @@ -71,7 +71,7 @@ public record HandleAsyncResult( * @return 异步处理结果 */ public static HandleAsyncResult success(T result) { - return new HandleAsyncResult(result, null); + return new HandleAsyncResult<>(result, null); } /** @@ -82,6 +82,6 @@ public record HandleAsyncResult( * @return 异步处理结果 */ public static HandleAsyncResult failure(Throwable error) { - return new HandleAsyncResult(null, error); + return new HandleAsyncResult<>(null, error); } } diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java index 795679389..cb65250c4 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java @@ -22,7 +22,7 @@ import java.util.stream.Stream; * @version 3.1.0 新增 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -@SuppressWarnings(value = {"unchecked", "rawtypes"}) +@SuppressWarnings(value = {"rawtypes"}) public class RedisUtils { private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class); @@ -280,9 +280,7 @@ public class RedisUtils { return; } RBatch batch = CLIENT.createBatch(); - collection.forEach(t -> { - batch.getBucket(t.toString()).deleteAsync(); - }); + collection.forEach(t -> batch.getBucket(t.toString()).deleteAsync()); batch.execute(); } diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java index e74601b45..d5723688f 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java @@ -33,7 +33,6 @@ public class SocialUtils { * @return 授权响应 * @throws AuthException 授权异常 */ - @SuppressWarnings("unchecked") public static AuthResponse loginAuth(String source, String code, String state, SocialProperties socialProperties) throws AuthException { AuthRequest authRequest = getAuthRequest(source, socialProperties); AuthCallback callback = new AuthCallback(); @@ -93,4 +92,3 @@ public class SocialUtils { }; } } - diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java index d1a13bd31..5136177cb 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java @@ -340,7 +340,7 @@ public class GenTableColumn extends BaseEntity { */ public String readConverterExp() { String remarks = StringUtils.substringBetween(this.columnComment, "（", "）"); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (StringUtils.isNotEmpty(remarks)) { for (String value : remarks.split(" ")) { if (StringUtils.isNotEmpty(value)) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 8e014d8e2..3cb375fe7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -54,7 +54,7 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:list") @GetMapping("/list/exclude/{deptId}") - public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { + public R> excludeChild(@PathVariable(value = "deptId") Long deptId) { List depts = deptService.selectDeptList(new SysDeptBo()); depts.removeIf(d -> d.getDeptId().equals(deptId) || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId))); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java index dfe4f6b9e..6f902a9ef 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java @@ -3,7 +3,6 @@ package org.dromara.workflow.service.impl; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.core.TranslationInterface; import org.dromara.workflow.common.ConditionalOnEnable;