From edcd7c99ba58e87745741908839b09016a1f4fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Sat, 18 Feb 2023 23:43:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E7=BB=84=E4=BB=B6=20=E6=94=AF=E6=8C=81=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E6=B3=9B=E5=9E=8B=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E7=A7=8D=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E7=BF=BB?= =?UTF-8?q?=E8=AF=91(=E4=BE=8B=E5=A6=82:=20=E6=A0=B9=E6=8D=AE=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E7=BF=BB=E8=AF=91=E6=88=90=E5=AF=B9=E8=B1=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/translation/TranslationInterface.java | 4 ++-- .../common/translation/handler/TranslationHandler.java | 8 ++++---- .../common/translation/impl/DeptNameTranslationImpl.java | 2 +- .../common/translation/impl/DictTypeTranslationImpl.java | 2 +- .../common/translation/impl/OssUrlTranslationImpl.java | 2 +- .../common/translation/impl/UserNameTranslationImpl.java | 2 +- .../com/ruoyi/framework/config/TranslationConfig.java | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java index 4d59d7ec8..91af97cae 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java @@ -5,7 +5,7 @@ package com.ruoyi.common.translation; * * @author Lion Li */ -public interface TranslationInterface { +public interface TranslationInterface { /** * 翻译 @@ -13,5 +13,5 @@ public interface TranslationInterface { * @param key 需要被翻译的键(不为空) * @return 返回键对应的值 */ - String translation(Object key, String other); + T translation(Object key, String other); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java index f6daa50c5..ede720675 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java @@ -29,13 +29,13 @@ public class TranslationHandler extends JsonSerializer implements Contex /** * 全局翻译实现类映射器 */ - public static final Map TRANSLATION_MAPPER = new ConcurrentHashMap<>(); + public static final Map> TRANSLATION_MAPPER = new ConcurrentHashMap<>(); private Translation translation; @Override public void serialize(Object value, JsonGenerator gen, SerializerProvider serializers) throws IOException { - TranslationInterface trans = TRANSLATION_MAPPER.get(translation.type()); + TranslationInterface trans = TRANSLATION_MAPPER.get(translation.type()); if (ObjectUtil.isNotNull(trans)) { // 如果映射字段不为空 则取映射字段的值 if (StringUtils.isNotBlank(translation.mapper())) { @@ -46,8 +46,8 @@ public class TranslationHandler extends JsonSerializer implements Contex gen.writeNull(); return; } - String result = trans.translation(value, translation.other()); - gen.writeString(result); + Object result = trans.translation(value, translation.other()); + gen.writeObject(result); } else { gen.writeObject(value); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java index ed224381d..69196171b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @Component @AllArgsConstructor @TranslationType(type = TransConstant.DEPT_ID_TO_NAME) -public class DeptNameTranslationImpl implements TranslationInterface { +public class DeptNameTranslationImpl implements TranslationInterface { private final DeptService deptService; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java index 3928f7d0c..210312c82 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; @Component @AllArgsConstructor @TranslationType(type = TransConstant.DICT_TYPE_TO_LABEL) -public class DictTypeTranslationImpl implements TranslationInterface { +public class DictTypeTranslationImpl implements TranslationInterface { private final DictService dictService; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java index 8b5aa7b3f..69ebd9afe 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @Component @AllArgsConstructor @TranslationType(type = TransConstant.OSS_ID_TO_URL) -public class OssUrlTranslationImpl implements TranslationInterface { +public class OssUrlTranslationImpl implements TranslationInterface { private final OssService ossService; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java index bda39b146..36fd6c399 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @Component @AllArgsConstructor @TranslationType(type = TransConstant.USER_ID_TO_NAME) -public class UserNameTranslationImpl implements TranslationInterface { +public class UserNameTranslationImpl implements TranslationInterface { private final UserService userService; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java index ebed362d3..c68bf6073 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java @@ -24,15 +24,15 @@ import java.util.Map; public class TranslationConfig { @Autowired - private List list; + private List> list; @Autowired private ObjectMapper objectMapper; @PostConstruct public void init() { - Map map = new HashMap<>(list.size()); - for (TranslationInterface trans : list) { + Map> map = new HashMap<>(list.size()); + for (TranslationInterface trans : list) { if (trans.getClass().isAnnotationPresent(TranslationType.class)) { TranslationType annotation = trans.getClass().getAnnotation(TranslationType.class); map.put(annotation.type(), trans);