From 9009a90ef27754a81ba86932663d33e176942d4e Mon Sep 17 00:00:00 2001
From: 秋辞未寒 <545073804@qq.com>
Date: 星期一, 09 十二月 2024 17:41:52 +0800
Subject: [PATCH] update 更新 枚举校验通过获取枚举值，不再需要实现接口
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java | 10 ++++++----
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java | 10 +++++++++-
2 files changed, 15 insertions(+), 5 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 2f7de75..35f7ecb 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
@@ -21,7 +21,15 @@
@Constraint(validatedBy = {EnumPatternValidator.class})
public @interface EnumPattern {
- Class<? extends ValidateEnum> type() default ValidateEnum.class;
+ /**
+ * 闇�瑕佹牎楠岀殑鏋氫妇绫诲瀷
+ */
+ Class<? extends Enum> type() default Enum.class;
+
+ /**
+ * 鏋氫妇绫诲瀷鏍￠獙鍊煎垽鏂柟娉�
+ */
+ String method() default "getCode";
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 451dc71..af87225 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,6 +1,7 @@
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;
@@ -26,10 +27,11 @@
public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
try {
if (StringUtils.isNotBlank(value)) {
- Class<? extends ValidateEnum> type = annotation.type();
- ValidateEnum[] constants = type.getEnumConstants();
- for (ValidateEnum e : constants) {
- if (e.validate(value)) {
+ Class<?> type = annotation.type();
+ Object[] enumConstants = type.getEnumConstants();
+ Method method = ReflectUtils.getMethod(type, annotation.method());
+ for (Object e : enumConstants) {
+ if (value.equals(method.invoke(e))) {
return true;
}
}
--
Gitblit v1.9.3