From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java b/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java
index ca6c8e6..ddef54b 100644
--- a/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogCmd.java
@@ -18,15 +18,19 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.language.Language;
 import com.java110.dto.menuCatalog.MenuCatalogDto;
 import com.java110.dto.store.StoreDto;
 import com.java110.intf.store.IStoreInnerServiceSMO;
 import com.java110.intf.user.IMenuCatalogV1InnerServiceSMO;
+import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +53,7 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "menu.listCatalog")
-public class ListCatalogCmd extends AbstractServiceCmdListener {
+public class ListCatalogCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(ListCatalogCmd.class);
     @Autowired
@@ -87,6 +91,15 @@
             menuCatalogDtos = new ArrayList<>();
         }
 
+        String lang = cmdDataFlowContext.getReqHeaders().get(CommonConstant.JAVA110_LANG);
+        if (!StringUtil.isEmpty(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
+            Language language = ApplicationContextFactory.getBean(lang, Language.class);
+            if (language != null) {
+                menuCatalogDtos = language.getMenuCatalog(menuCatalogDtos);
+            }
+
+        }
+
         ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, menuCatalogDtos);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

--
Gitblit v1.8.0