From 4821902fdc73052b56a0b39ebe60e0c7287b254e Mon Sep 17 00:00:00 2001
From: 秋辞未寒 <545073804@qq.com>
Date: 星期一, 09 十二月 2024 18:16:49 +0800
Subject: [PATCH] update 更新 枚举校验通过枚举字段的getter方法取值
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java | 4 ++--
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java | 7 ++++---
2 files changed, 6 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 35f7ecb..c31c770 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
@@ -9,7 +9,7 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
- * 鑷畾涔夋灇涓炬牎楠屾敞瑙�
+ * 鑷畾涔夋灇涓炬牎楠�
*
* @author 绉嬭緸鏈瘨
* @date 2024-12-09
@@ -27,9 +27,10 @@
Class<? extends Enum> type() default Enum.class;
/**
- * 鏋氫妇绫诲瀷鏍￠獙鍊煎垽鏂柟娉�
+ * 鏋氫妇绫诲瀷鏍￠獙鍊煎瓧娈靛悕绉�
+ * TODO 闇�纭繚璇ュ瓧娈靛疄鐜颁簡 getter 鏂规硶
*/
- String method() default "getCode";
+ String fieldName() default "code";
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 af87225..0e748c0 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
@@ -28,10 +28,10 @@
try {
if (StringUtils.isNotBlank(value)) {
Class<?> type = annotation.type();
+ String fieldName = annotation.fieldName();
Object[] enumConstants = type.getEnumConstants();
- Method method = ReflectUtils.getMethod(type, annotation.method());
for (Object e : enumConstants) {
- if (value.equals(method.invoke(e))) {
+ if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) {
return true;
}
}
--
Gitblit v1.9.3