diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/LanguageService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/LanguageService.java new file mode 100644 index 00000000..ca37df3a --- /dev/null +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/LanguageService.java @@ -0,0 +1,27 @@ +package com.nflg.product.material.service; + +import cn.hutool.core.collection.CollUtil; +import com.nflg.product.base.core.config.SpringContextUtils; +import com.nflg.product.base.core.conmon.util.SessionUtil; +import com.nflg.product.material.pojo.entity.LanguageTranslationEntity; +import com.nflg.product.material.util.ListCommonUtil; + +import java.util.List; +import java.util.Map; + +public class LanguageService { + + Map languageMp; + + public LanguageService(){ + List keyLanguage = SpringContextUtils.getBean(MaterialMainService.class).getBaseMapper().getKeyLanguage(SessionUtil.getLanguage()); + if(CollUtil.isEmpty(keyLanguage)){ + keyLanguage=SpringContextUtils.getBean(MaterialMainService.class).getBaseMapper().getKeyLanguage("zh-cn"); + } + languageMp= ListCommonUtil.listToMap(keyLanguage,LanguageTranslationEntity::getKeyName); + } + + public String getTranslateText(String keyName){ + return languageMp.get(keyName).getTranslationText(); + } +} diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java index 5baa1040..b976f4d8 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java @@ -400,10 +400,7 @@ public class MaterialMainService extends ServiceImpl keyLanguage = this.getBaseMapper().getKeyLanguage(SessionUtil.getLanguage()); - if(CollUtil.isNotEmpty(keyLanguage)){ - - } + LanguageService languageService=new LanguageService(); LinkedList thHeaderList = new LinkedList(); @@ -414,28 +411,28 @@ public class MaterialMainService extends ServiceImpl thHeaderList.add(new MaterialTbHeaderVO(u.getAttrName(), u.getAttrCode()))); } @@ -464,38 +461,38 @@ public class MaterialMainService extends ServiceImpl