!856 update 优化代码，简化类型检查

* update 优化代码，简化类型检查

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();
                 }

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 {
 

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
 
 }

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<Object, Boolean> 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);

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java

@@ -122,6 +122,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @param columns 查询字段
      * @return this
      */
+    @Override
     @SafeVarargs
     public final LambdaCrudChainWrapper<T, V> select(SFunction<T, ?>... columns) {
         return select(true, CollectionUtils.toList(columns));
@@ -134,6 +135,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @param columns   查询字段
      * @return this
      */
+    @Override
     @SafeVarargs
     public final LambdaCrudChainWrapper<T, V> select(boolean condition, SFunction<T, ?>... columns) {
         return select(condition, CollectionUtils.toList(columns));

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java

@@ -400,6 +400,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> eq(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.eq(condition, column, value);
         return this;
@@ -425,6 +426,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> ne(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.ne(condition, column, value);
         return this;
@@ -450,6 +452,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> gt(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.gt(condition, column, value);
         return this;
@@ -475,6 +478,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> ge(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.ge(condition, column, value);
         return this;
@@ -500,6 +504,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> lt(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.lt(condition, column, value);
         return this;
@@ -525,6 +530,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> le(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.le(condition, column, value);
         return this;
@@ -550,6 +556,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> like(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.like(condition, column, value);
         return this;
@@ -575,6 +582,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> notLike(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.notLike(condition, column, value);
         return this;
@@ -600,6 +608,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> likeLeft(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.likeLeft(condition, column, value);
         return this;
@@ -625,6 +634,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param value     条件值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> likeRight(boolean condition, SFunction<T, ?> column, Object value) {
         wrapper.likeRight(condition, column, value);
         return this;
@@ -652,6 +662,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param end       结束值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> between(boolean condition, SFunction<T, ?> column, Object begin, Object end) {
         wrapper.between(condition, column, begin, end);
         return this;
@@ -679,6 +690,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param end       结束值
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> notBetween(boolean condition, SFunction<T, ?> column, Object begin, Object end) {
         wrapper.notBetween(condition, column, begin, end);
         return this;
@@ -718,7 +730,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @return 当前查询构造辅助对象
      */
     public LambdaQueryBuilder<T> allEq(BiPredicate<SFunction<T, ?>, 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<T> implements LambdaQueryCondition<T, Lamb
      * @return 当前查询构造辅助对象
      */
     public LambdaQueryBuilder<T> allEq(boolean condition, BiPredicate<SFunction<T, ?>, 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<T> implements LambdaQueryCondition<T, Lamb
      * @param values    条件值集合
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> in(boolean condition, SFunction<T, ?> column, Collection<?> values) {
         wrapper.in(condition, column, values);
         return this;
@@ -827,6 +840,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param values    条件值数组
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> in(boolean condition, SFunction<T, ?> column, Object... values) {
         wrapper.in(condition, column, values);
         return this;
@@ -852,6 +866,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param values    条件值集合
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> notIn(boolean condition, SFunction<T, ?> column, Collection<?> values) {
         wrapper.notIn(condition, column, values);
         return this;
@@ -877,6 +892,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param values    条件值数组
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> notIn(boolean condition, SFunction<T, ?> column, Object... values) {
         wrapper.notIn(condition, column, values);
         return this;
@@ -1219,6 +1235,7 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      * @param values    SQL 片段参数
      * @return 当前查询构造辅助对象
      */
+    @Override
     public LambdaQueryBuilder<T> apply(boolean condition, String applySql, Object... values) {
         wrapper.apply(condition, applySql, values);
         return this;
@@ -1368,7 +1385,6 @@ public final class LambdaQueryBuilder<T> implements LambdaQueryCondition<T, Lamb
      *
      * @return 聚合查询包装器
      */
-    @SuppressWarnings("unchecked")
     private AggregateLambdaQueryWrapper<T> aggregateWrapper() {
         return (AggregateLambdaQueryWrapper<T>) wrapper;
     }

ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java

@@ -60,7 +60,7 @@ public record HandleAsyncResult<T>(
      * @return 异步处理结果
      */
     public static <T> HandleAsyncResult<T> of(T result, Throwable error) {
-        return new HandleAsyncResult<T>(result, error);
+        return new HandleAsyncResult<>(result, error);
     }
 
     /**
@@ -71,7 +71,7 @@ public record HandleAsyncResult<T>(
      * @return 异步处理结果
      */
     public static <T> HandleAsyncResult<T> success(T result) {
-        return new HandleAsyncResult<T>(result, null);
+        return new HandleAsyncResult<>(result, null);
     }
 
     /**
@@ -82,6 +82,6 @@ public record HandleAsyncResult<T>(
      * @return 异步处理结果
      */
     public static <T> HandleAsyncResult<T> failure(Throwable error) {
-        return new HandleAsyncResult<T>(null, error);
+        return new HandleAsyncResult<>(null, error);
     }
 }

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();
     }
 

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<AuthUser> 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 {
         };
     }
 }
-

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)) {

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<List<SysDeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+    public R<List<SysDeptVo>> excludeChild(@PathVariable(value = "deptId") Long deptId) {
         List<SysDeptVo> depts = deptService.selectDeptList(new SysDeptBo());
         depts.removeIf(d -> d.getDeptId().equals(deptId)
             || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId)));

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;