From 3819e42593746fd6f28832049e082e03d4df9fd9 Mon Sep 17 00:00:00 2001 From: redkale Date: Tue, 4 Jun 2024 12:14:37 +0800 Subject: [PATCH] =?UTF-8?q?ConvertColumnTransfer=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/redkale/convert/ConvertColumnTransfer.java | 6 ++---- src/main/java/org/redkale/convert/EnMember.java | 2 +- .../java/org/redkale/test/convert/ConvertTransferTest.java | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/redkale/convert/ConvertColumnTransfer.java b/src/main/java/org/redkale/convert/ConvertColumnTransfer.java index 1711cb1bf..c163b16bb 100644 --- a/src/main/java/org/redkale/convert/ConvertColumnTransfer.java +++ b/src/main/java/org/redkale/convert/ConvertColumnTransfer.java @@ -4,8 +4,6 @@ package org.redkale.convert; -import org.redkale.util.Attribute; - /** * 字段值转换器,常见于脱敏操作 * @@ -22,10 +20,10 @@ public interface ConvertColumnTransfer { * 字段值转换 * * @param obj 父对象 - * @param attribute 属性对象 + * @param field 字段名 * @param value 字段值 * * @return Object */ - public Object transfer(Object obj, Attribute attribute, F value); + public Object transfer(Object obj, String field, F value); } diff --git a/src/main/java/org/redkale/convert/EnMember.java b/src/main/java/org/redkale/convert/EnMember.java index 67eb4c63e..25dca1428 100644 --- a/src/main/java/org/redkale/convert/EnMember.java +++ b/src/main/java/org/redkale/convert/EnMember.java @@ -107,7 +107,7 @@ public final class EnMember { public Object getFieldValue(T obj) { F val = attribute.get(obj); if (transfer != null) { - return transfer.transfer(obj, attribute, val); + return transfer.transfer(obj, attribute.field(), val); } else { return val; } diff --git a/src/test/java/org/redkale/test/convert/ConvertTransferTest.java b/src/test/java/org/redkale/test/convert/ConvertTransferTest.java index 8f1e80bc4..300fed3a4 100644 --- a/src/test/java/org/redkale/test/convert/ConvertTransferTest.java +++ b/src/test/java/org/redkale/test/convert/ConvertTransferTest.java @@ -8,7 +8,6 @@ import org.junit.jupiter.api.*; import org.redkale.convert.ConvertColumn; import org.redkale.convert.ConvertColumnTransfer; import org.redkale.convert.json.JsonConvert; -import org.redkale.util.Attribute; /** * @@ -61,7 +60,7 @@ public class ConvertTransferTest { public static class ParamTransfer implements ConvertColumnTransfer { @Override - public Object transfer(Object obj, Attribute attribute, String value) { + public Object transfer(Object obj, String field, String value) { if (value == null || value.length() < 5) { return value; } else {