优化 国际化显示问题

java110-core/src/main/java/com/java110/core/language/Cn.java

@@ -1,6 +1,8 @@
 package com.java110.core.language;
 
 import com.java110.dto.menu.MenuDto;
+import com.java110.dto.menuCatalog.MenuCatalogDto;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.stereotype.Component;
 
@@ -14,8 +16,61 @@ import java.util.Map;
  */
 @Component
 public class Cn extends DefaultLanguage {
+    private static Map<String, String> menuCatalogs = new HashMap<>();
+    private static Map<String, String> menus = new HashMap<>();
+    private static Map<String, String> msgs = new HashMap<>();
 
 
+
+    public List<MenuCatalogDto> getMenuCatalog(List<MenuCatalogDto> menuCatalogDtos) {
+        String menuCatalogsName = "";
+        for (MenuCatalogDto menuCatalogDto : menuCatalogDtos) {
+            menuCatalogsName = menuCatalogs.get(menuCatalogDto.getName());
+            if (!StringUtil.isEmpty(menuCatalogsName)) {
+                menuCatalogDto.setName(menuCatalogsName);
+            }
+        }
+        return menuCatalogDtos;
+    }
+
+
+    @Override
+    public List<Map> getMenuDto(List<Map> menuDtos) {
+        String menuName = "";
+        for (Map menuDto : menuDtos) {
+            menuName = menus.get(menuDto.get("menuGroupName"));
+            if (!StringUtil.isEmpty(menuName)) {
+                menuDto.put("menuGroupName", menuName);
+            }
+
+            menuName = menus.get(menuDto.get("menuName"));
+            if (!StringUtil.isEmpty(menuName)) {
+                menuDto.put("menuName", menuName);
+            }
+
+        }
+        return menuDtos;
+    }
+
+    @Override
+    public ResultVo getResultVo(ResultVo resultVo) {
+        String msg = msgs.get(resultVo.getMsg());
+        if (!StringUtil.isEmpty(msg)) {
+            resultVo.setMsg(msg);
+        }
+
+        return resultVo;
+    }
+
+    public String getLangMsg(String msg){
+        String msgStr = msgs.get(msg);
+        if (!StringUtil.isEmpty(msg)) {
+            return msgStr;
+        }
+
+        return msg;
+    }
+
     static {
         menuCatalogs.put("设备", "設備");
         menuCatalogs.put("首页", "首頁");

java110-core/src/main/java/com/java110/core/language/DefaultLanguage.java

@@ -11,11 +11,13 @@ import java.util.Map;
 
 public abstract class DefaultLanguage implements Language {
 
+
     protected static Map<String, String> menuCatalogs = new HashMap<>();
     protected static Map<String, String> menus = new HashMap<>();
     protected static Map<String, String> msgs = new HashMap<>();
 
 
+
     public List<MenuCatalogDto> getMenuCatalog(List<MenuCatalogDto> menuCatalogDtos) {
         String menuCatalogsName = "";
         for (MenuCatalogDto menuCatalogDto : menuCatalogDtos) {
@@ -56,13 +58,13 @@ public abstract class DefaultLanguage implements Language {
         return resultVo;
     }
 
-   public String getLangMsg(String msg){
-       String msgStr = msgs.get(msg);
-       if (!StringUtil.isEmpty(msg)) {
-           return msgStr;
-       }
+    public String getLangMsg(String msg){
+        String msgStr = msgs.get(msg);
+        if (!StringUtil.isEmpty(msg)) {
+            return msgStr;
+        }
 
-       return msg;
+        return msg;
     }
 
 }

java110-core/src/main/java/com/java110/core/language/En.java

@@ -1,12 +1,73 @@
 package com.java110.core.language;
 
+import com.java110.dto.menuCatalog.MenuCatalogDto;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 英文
  */
 @Component
 public class En extends DefaultLanguage{
+    private static Map<String, String> menuCatalogs = new HashMap<>();
+    private static Map<String, String> menus = new HashMap<>();
+    private static Map<String, String> msgs = new HashMap<>();
+
+
+
+    public List<MenuCatalogDto> getMenuCatalog(List<MenuCatalogDto> menuCatalogDtos) {
+        String menuCatalogsName = "";
+        for (MenuCatalogDto menuCatalogDto : menuCatalogDtos) {
+            menuCatalogsName = menuCatalogs.get(menuCatalogDto.getName());
+            if (!StringUtil.isEmpty(menuCatalogsName)) {
+                menuCatalogDto.setName(menuCatalogsName);
+            }
+        }
+        return menuCatalogDtos;
+    }
+
+
+    @Override
+    public List<Map> getMenuDto(List<Map> menuDtos) {
+        String menuName = "";
+        for (Map menuDto : menuDtos) {
+            menuName = menus.get(menuDto.get("menuGroupName"));
+            if (!StringUtil.isEmpty(menuName)) {
+                menuDto.put("menuGroupName", menuName);
+            }
+
+            menuName = menus.get(menuDto.get("menuName"));
+            if (!StringUtil.isEmpty(menuName)) {
+                menuDto.put("menuName", menuName);
+            }
+
+        }
+        return menuDtos;
+    }
+
+    @Override
+    public ResultVo getResultVo(ResultVo resultVo) {
+        String msg = msgs.get(resultVo.getMsg());
+        if (!StringUtil.isEmpty(msg)) {
+            resultVo.setMsg(msg);
+        }
+
+        return resultVo;
+    }
+
+    public String getLangMsg(String msg){
+        String msgStr = msgs.get(msg);
+        if (!StringUtil.isEmpty(msg)) {
+            return msgStr;
+        }
+
+        return msg;
+    }
     static {
         menuCatalogs.put("设备","Machine");
         menuCatalogs.put("首页","Front page");