diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/LanguageUtil.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/LanguageUtil.java new file mode 100644 index 00000000..3eb07584 --- /dev/null +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/util/LanguageUtil.java @@ -0,0 +1,34 @@ +package com.nflg.product.material.util; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.extra.spring.SpringUtil; +import com.nflg.product.base.core.conmon.util.SessionUtil; +import com.nflg.product.material.pojo.entity.LanguageTranslationEntity; +import com.nflg.product.material.service.MaterialMainService; +import nflg.product.common.dto.LoginUserInfoDTO; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +public class LanguageUtil { + + private final String zhLanguage="zh-cn"; + + private Map translationMap; + + public LanguageUtil() { + List keyLanguage = SpringUtil.getBean(MaterialMainService.class).getBaseMapper().getKeyLanguage(SessionUtil.getLanguage()); + + if(CollUtil.isEmpty(keyLanguage)){ + keyLanguage = SpringUtil.getBean(MaterialMainService.class).getBaseMapper().getKeyLanguage(zhLanguage); + } + translationMap=ListCommonUtil.listToMap(keyLanguage,LanguageTranslationEntity::getKeyName); + } + + public String getTranslationTextByKeyName(String keyName){ + + return translationMap.containsKey(keyName)? translationMap.get(keyName).getTranslationText():""; + } +} diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java index 755fd8c5..7b60cd73 100644 --- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java +++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java @@ -85,7 +85,7 @@ public class SessionUtil { } public static String getLanguage() { - return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getLanguage).orElse(null); + return Optional.ofNullable(loginUser.get()).map(LoginUserInfoDTO::getLanguage).orElse(""); } public static String getSessionKey() {