update 优化 转换模块代码 删除无用的 common-dict 依赖

疯狂的狮子li

2023-01-31 bff9720b6fa86fcced776601f4d318ea26b7265f

update 优化 转换模块代码 删除无用的 common-dict 依赖

 ruoyi-common/pom.xml

@@ -13,7 +13,6 @@
    <modules>
        <module>ruoyi-common-bom</module>
        <module>ruoyi-common-core</module>
        <module>ruoyi-common-dict</module>
        <module>ruoyi-common-doc</module>
        <module>ruoyi-common-excel</module>
        <module>ruoyi-common-idempotent</module>

 ruoyi-common/ruoyi-common-bom/pom.xml

@@ -26,13 +26,6 @@
                <version>${revision}</version>
            </dependency>

            <!-- å­—å…¸ -->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>ruoyi-common-dict</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- æŽ¥å£æ¨¡å— -->
            <dependency>
                <groupId>com.ruoyi</groupId>

 ruoyi-common/ruoyi-common-dict/pom.xml

ÎļþÒÑɾ³ý

 ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/annotation/DictDataMapper.java

ÎļþÒÑɾ³ý

 ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/jackson/DictDataJsonSerializer.java

ÎļþÒÑɾ³ý

 ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/annotation/Translation.java

@@ -25,8 +25,8 @@
    String type();

    /**
     * é€šç”¨Key å¦‚果为空则取被标注的字段值 ä¾‹å¦‚: å­—å…¸type(sys_user_sex)
     * å…¶ä»–条件 ä¾‹å¦‚: å­—å…¸type(sys_user_sex)
     */
    String key() default "";
    String other() default "";

}

 ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/constant/TransConstant.java

@@ -8,15 +8,18 @@
public interface TransConstant {

    /**
     * ç”¨æˆ·åç¿»è¯‘
     * ç”¨æˆ·id转账号
     */
    String USER_ID_TO_NAME = "userIdToName";

    /**
     * å­—典值翻译
     * å­—å…¸type转label
     */
    String DICT_TYPE_TO_LABEL = "dictTypeToLabel";

    /**
     * ossId转url
     */
    String OSS_ID_TO_URL = "ossIdToUrl";

}

 ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/TranslationInterface.java

@@ -13,5 +13,5 @@
     * @param key éœ€è¦è¢«ç¿»è¯‘çš„é”®
     * @return è¿”回键对应的值
     */
    String translation(Object key);
    String translation(Object key, String other);
}

 ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/handler/TranslationHandler.java

@@ -38,13 +38,13 @@
        try {
            TranslationInterface trans = TRANSLATION_MAPPER.get(translation.type());
            if (ObjectUtil.isNotNull(trans)) {
                String result = trans.translation(StringUtils.isBlank(translation.key()) ? value : translation.key());
                String result = trans.translation(value, translation.other());
                gen.writeString(StringUtils.isNotBlank(result) ? result : value.toString());
            } else {
                gen.writeString(value.toString());
            }
        } catch (BeansException e) {
            log.error("字典数据未查到, é‡‡ç”¨é»˜è®¤å¤„理 => {}", e.getMessage());
            log.error("数据未查到, é‡‡ç”¨é»˜è®¤å¤„理 => {}", e.getMessage());
            gen.writeString(value.toString());
        }
    }

 ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/impl/DictTranslationImpl.java

ÎļþÒÑɾ³ý

 ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/impl/DictTypeTranslationImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.ruoyi.common.translation.core.impl;

import com.ruoyi.common.core.service.DictService;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.translation.annotation.TranslationType;
import com.ruoyi.common.translation.constant.TransConstant;
import com.ruoyi.common.translation.core.TranslationInterface;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;

/**
 * å­—典翻译实现
 *
 * @author Lion Li
 */
@Component
@AllArgsConstructor
@TranslationType(type = TransConstant.DICT_TYPE_TO_LABEL)
public class DictTypeTranslationImpl implements TranslationInterface {

    private final DictService dictService;

    public String translation(Object key, String other) {
        if (key instanceof String dictValue && StringUtils.isNotBlank(other)) {
            return dictService.getDictLabel(other, dictValue);
        }
        return null;
    }
}

 ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/impl/UserNameTranslationImpl.java

@@ -6,7 +6,7 @@
import org.springframework.stereotype.Component;

/**
 * ç¿»è¯‘接口 (实现类需标注 {@link com.ruoyi.common.translation.annotation.TranslationType} æ³¨è§£æ ‡æ˜Žç¿»è¯‘类型)
 * ç”¨æˆ·åç¿»è¯‘实现
 *
 * @author Lion Li
 */
@@ -14,13 +14,8 @@
@TranslationType(type = TransConstant.USER_ID_TO_NAME)
public class UserNameTranslationImpl implements TranslationInterface {

    /**
     * ç¿»è¯‘
     *
     * @param key éœ€è¦è¢«ç¿»è¯‘çš„é”®
     * @return è¿”回键对应的值
     */
    public String translation(Object key) {
    public String translation(Object key, String other) {
        // todo å¾…实现
        if (key instanceof Long id) {
            return "admin";
        }

 ruoyi-modules/ruoyi-system/pom.xml

@@ -35,7 +35,7 @@

        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common-dict</artifactId>
            <artifactId>ruoyi-common-translation</artifactId>
        </dependency>

        <!-- OSS功能模块 -->