From 94e43e62bccbb0326b66d892a14962d77526354f Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Sun, 10 Mar 2024 16:30:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/service/LanguageService.java     | 27 ++++++++
 .../material/service/MaterialMainService.java | 65 +++++++++----------
 2 files changed, 58 insertions(+), 34 deletions(-)
 create mode 100644 nflg_project_dev/material/src/main/java/com/nflg/product/material/service/LanguageService.java

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<String, LanguageTranslationEntity> languageMp;
+
+    public LanguageService(){
+        List<LanguageTranslationEntity> 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<MaterialMainMapper, Materia
         log.info("[计算耗时][getTbHeader]================================" + Date10 );
 
         //多语言(没有则获取中午)
-        List<LanguageTranslationEntity> 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<MaterialMainMapper, Materia
         }
         if (materialClass.equals(0)) {
             //物料查看
-            thHeaderList.add(new MaterialTbHeaderVO("状态", "materialStateName"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialStateName"), "materialStateName"));
             // 制作物料、整机物料、服务等，推荐度此列不显示
             if (categoryCode == null || (!categoryCode.startsWith("20") && !categoryCode.startsWith("30") && !categoryCode.startsWith("60"))) {
-                thHeaderList.add(new MaterialTbHeaderVO("推荐度", "recommend"));
+                thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("recommend") , "recommend"));
             }
         }
-        thHeaderList.add(new MaterialTbHeaderVO("物料编码", "materialNo"));
-        thHeaderList.add(new MaterialTbHeaderVO("物料描述", "materialDesc"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialNo"), "materialNo"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialDesc"), "materialDesc"));
         if (CollectionUtil.isEmpty(childList)) {
-            thHeaderList.add(new MaterialTbHeaderVO("简化描述", "shortMaterialDesc"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("shortMaterialDesc"), "shortMaterialDesc"));
         }
-        thHeaderList.add(new MaterialTbHeaderVO("图号", "drawingNo"));
-        thHeaderList.add(new MaterialTbHeaderVO("大类/中类/小类/细分类", "oldCategoryNameTree"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("drawingNo"), "drawingNo"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("oldCategoryNameTree"), "oldCategoryNameTree"));
 
         // 当categoryCode = null，
         if (categoryCode != null && materialClass.equals(0) && !(categoryCode.startsWith("20") || categoryCode.startsWith("30"))) {
-            thHeaderList.add(new MaterialTbHeaderVO("品牌", "materialBrand"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialBrand"), "materialBrand"));
         }
         if (categoryCode == null && materialClass.equals(0)) {
-            thHeaderList.add(new MaterialTbHeaderVO("品牌", "materialBrand"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialBrand"), "materialBrand"));
         }
-        thHeaderList.add(new MaterialTbHeaderVO("备注", "remark"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("remark"), "remark"));
 
         //获取分类属性列表：物料名称、物料规格、品牌、备注。。
         //查询界面查询非最小类物料视图直接展示部分属性，包含【物料名称】【物料规格】【补充说明】（补充说明为拼接除名称、规格的其它需要进描述的属性，进描述字段）
@@ -456,7 +453,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
                             thHeaderList.add(new MaterialTbHeaderVO(dto.getAttrName(), dto.getAttrCode()));
                         }
                     }
-                    thHeaderList.add(new MaterialTbHeaderVO("补充说明", "replenish"));
+                    thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("replenish"), "replenish"));
                 } else {
                     categoryAttrList.forEach(u -> thHeaderList.add(new MaterialTbHeaderVO(u.getAttrName(), u.getAttrCode())));
                 }
@@ -464,38 +461,38 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
             long Date22 = new Date().getTime();
             log.info("[计算耗时][getTbHeader][查询数据库][获取类别属性总耗时]================================" + (Date22-Date20) );
         } else {
-            thHeaderList.add(new MaterialTbHeaderVO("物料名称", "materialName"));
-            thHeaderList.add(new MaterialTbHeaderVO("物料规格", "materialSpecifications"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialName"), "materialName"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialSpecifications"), "materialSpecifications"));
         }
 
         if (materialClass.equals(0)) {
-            thHeaderList.add(new MaterialTbHeaderVO("两年出库量", "towYearLssl"));
-            thHeaderList.add(new MaterialTbHeaderVO("两年出库天数", "towYearLsslDay"));
-            thHeaderList.add(new MaterialTbHeaderVO("昨日库存", "materialStock"));
-            thHeaderList.add(new MaterialTbHeaderVO("最近出库时间", "lastOutWarehouseTime"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("towYearLssl"), "towYearLssl"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("towYearLsslDay"), "towYearLsslDay"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialStock"), "materialStock"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("lastOutWarehouseTime"), "lastOutWarehouseTime"));
         }
 
-        thHeaderList.add(new MaterialTbHeaderVO("编码申请人", "applyUserCode"));
-        thHeaderList.add(new MaterialTbHeaderVO("申请部门", "applyDeptName"));
-        thHeaderList.add(new MaterialTbHeaderVO("物料创建时间", "createdTime"));
-        thHeaderList.add(new MaterialTbHeaderVO("重量(kg)", "materialWeight"));
-        thHeaderList.add(new MaterialTbHeaderVO("基本计量单位", "materialUnit"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("applyUserCode"), "applyUserCode"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("applyDeptName"), "applyDeptName"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("createdTime"), "createdTime"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialWeight"), "materialWeight"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialUnit"), "materialUnit"));
         if (categoryCode != null && materialClass.equals(0) && !(categoryCode.startsWith("20") || categoryCode.startsWith("30"))) {
-            thHeaderList.add(new MaterialTbHeaderVO("辅助单位", "materialAssistUnit"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialAssistUnit"), "materialAssistUnit"));
         }
         if (categoryCode == null && materialClass.equals(0)) {
-            thHeaderList.add(new MaterialTbHeaderVO("辅助单位", "materialAssistUnit"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("materialAssistUnit"), "materialAssistUnit"));
         }
         if (materialClass.equals(0)) {  //查看
-            thHeaderList.add(new MaterialTbHeaderVO("最近变更时间", "lastApplyTime"));
-            thHeaderList.add(new MaterialTbHeaderVO("变更申请人", "updatedByUserCode"));
-            thHeaderList.add(new MaterialTbHeaderVO("替代物料", "replaceMaterialNo"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("lastApplyTime"), "lastApplyTime"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("updatedByUserCode"), "updatedByUserCode"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("replaceMaterialNo"), "replaceMaterialNo"));
         }
-        thHeaderList.add(new MaterialTbHeaderVO("物料重用性", "reuseOfOnceStateName"));
+        thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("reuseOfOnceStateName"), "reuseOfOnceStateName"));
         if (!materialClass.equals(0)) {
             //物料申请
-            thHeaderList.add(new MaterialTbHeaderVO("状态", "processStateName"));
-            thHeaderList.add(new MaterialTbHeaderVO("退回原因", "rejectResion"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("processStateName"), "processStateName"));
+            thHeaderList.add(new MaterialTbHeaderVO(languageService.getTranslateText("rejectResion"), "rejectResion"));
         }
 
         long Date9999 = new Date().getTime();