From 552e543471984fd37fd5cd70cde0218398258b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 10 Dec 2024 17:46:45 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20pr=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/validate/enumd/EnumPattern.java      |  6 ++---
 .../validate/enumd/EnumPatternValidator.java  | 26 +++++++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java
index c31c7703c..d4f1c3d01 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java
@@ -24,13 +24,13 @@ public @interface EnumPattern {
     /**
      * 需要校验的枚举类型
      */
-    Class<? extends Enum> type() default Enum.class;
+    Class<? extends Enum<?>> type();
 
     /**
      * 枚举类型校验值字段名称
-     * TODO 需确保该字段实现了 getter 方法
+     * 需确保该字段实现了 getter 方法
      */
-    String fieldName() default "code";
+    String fieldName();
 
     String message() default "输入值不在枚举范围内";
 
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java
index 0e748c0a4..6cfa11a33 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java
@@ -1,11 +1,9 @@
 package org.dromara.common.core.validate.enumd;
 
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.reflect.ReflectUtils;
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
-import jakarta.validation.ValidationException;
-import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
 
 /**
  * 自定义枚举校验注解实现
@@ -25,21 +23,15 @@ public class EnumPatternValidator implements ConstraintValidator<EnumPattern, St
 
     @Override
     public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
-        try {
-            if (StringUtils.isNotBlank(value)) {
-                Class<?> type = annotation.type();
-                String fieldName = annotation.fieldName();
-                Object[] enumConstants = type.getEnumConstants();
-                for (Object e : enumConstants) {
-                    if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) {
-                        return true;
-                    }
+        if (StringUtils.isNotBlank(value)) {
+            String fieldName = annotation.fieldName();
+            for (Object e : annotation.type().getEnumConstants()) {
+                if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) {
+                    return true;
                 }
             }
-            return false;
-        } catch (Exception e) {
-            throw new ValidationException(e);
         }
+        return false;
     }
 
-}
\ No newline at end of file
+}