From c228e04e0d4e5a63a91222edf22b0ec7e7b8dcbc Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 四月 2022 17:13:59 +0800
Subject: [PATCH] 本地代码优化

---
 java110-core/src/main/java/com/java110/core/language/DefaultLanguage.java |   47 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/language/DefaultLanguage.java b/java110-core/src/main/java/com/java110/core/language/DefaultLanguage.java
index fa9c3db..29bc833 100644
--- a/java110-core/src/main/java/com/java110/core/language/DefaultLanguage.java
+++ b/java110-core/src/main/java/com/java110/core/language/DefaultLanguage.java
@@ -9,18 +9,18 @@
 import java.util.List;
 import java.util.Map;
 
-public abstract class DefaultLanguage implements Language{
+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<>();
+    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){
+    public List<MenuCatalogDto> getMenuCatalog(List<MenuCatalogDto> menuCatalogDtos) {
         String menuCatalogsName = "";
-        for(MenuCatalogDto menuCatalogDto :menuCatalogDtos){
+        for (MenuCatalogDto menuCatalogDto : menuCatalogDtos) {
             menuCatalogsName = menuCatalogs.get(menuCatalogDto.getName());
-            if(!StringUtil.isEmpty(menuCatalogsName)){
+            if (!StringUtil.isEmpty(menuCatalogsName)) {
                 menuCatalogDto.setName(menuCatalogsName);
             }
         }
@@ -29,13 +29,40 @@
 
 
     @Override
-    public List<MenuDto> getMenuDto(List<MenuDto> menus) {
-        return null;
+    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) {
-        return null;
+        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;
     }
 
 }

--
Gitblit v1.8.0