From db77dd1f6314d2125f888a52a302361ff5ad3d20 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 30 Jul 2024 19:27:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B5=8C=E5=A5=97=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=8B=B1=E6=96=87enDict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/aspect/TranslationAspect.java | 3 +++ .../java/com/jero/common/aspect/annotation/Dict.java | 9 +++++++++ .../java/com/jero/common/constant/CommonConstant.java | 1 + 3 files changed, 13 insertions(+) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java index 068f5620..d2fd8ed5 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java @@ -209,9 +209,12 @@ public class TranslationAspect { String code = field.getAnnotation(Dict.class).dicCode(); String text = field.getAnnotation(Dict.class).dicText(); String table = field.getAnnotation(Dict.class).dictTable(); + String enText = field.getAnnotation(Dict.class).dicEnText(); String key = String.valueOf(item.get(field.getName())); String textValue = translateDictValue(code, text, table, key, listDict); + String enValue = translateDictValue(code, enText, table, key, listDict); item.put(field.getName() + CommonConstant.DICT_TEXT_SUFFIX, textValue); + item.put(field.getName() + CommonConstant.DICT_TEXT_EN_SUFFIX, enValue); } if (Objects.equals(field.getType().getName(), "java.util.Date") && field.getAnnotation(JsonFormat.class) == null && item.get(field.getName()) != null) { diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/annotation/Dict.java b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/annotation/Dict.java index c8adb142..7b75c292 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/annotation/Dict.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/annotation/Dict.java @@ -39,4 +39,13 @@ public @interface Dict { * @return 返回类型： String */ String dictTable() default ""; + + /** + * 方法描述: 数据字典表 + * 作 者： dangzhenghui + * 日 期： 2019年03月17日-下午9:37:16 + * + * @return 返回类型： String + */ + String dicEnText() default ""; } diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java index 88b9001f..8f2f9148 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java @@ -160,6 +160,7 @@ public class CommonConstant { /**字典翻译文本后缀*/ public static final String DICT_TEXT_SUFFIX = "_dictText"; + public static final String DICT_TEXT_EN_SUFFIX = "_dictTextEn"; /** * 表单设计器主表类型