From 552e543471984fd37fd5cd70cde0218398258b3e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 10 十二月 2024 17:46:45 +0800
Subject: [PATCH] update 优化 pr代码
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java | 26 +++++++++-----------------
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java | 6 +++---
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 c31c770..d4f1c3d 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 @@
/**
* 闇�瑕佹牎楠岀殑鏋氫妇绫诲瀷
*/
- 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 0e748c0..6cfa11a 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 @@
@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
+}
--
Gitblit v1.9.3