From da9ad4154ada783663f36c91e4be0b1c1c1d54cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Fri, 19 Jul 2024 10:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ICoreMemTreeService.java | 1 + .../controller/busi/SysMemTreeController.java | 3 +++ .../serviceimpl/busi/CoreMemTreeService.java | 31 +++++++++++++++++++--- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java index 2b0b10c..c137776 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java @@ -185,6 +185,7 @@ public interface ICoreMemTreeService { List packTreeToDto(List list); + List setLanguageSysMenuName(String languageCode, List menuList); /********************************************* End SysMenu Tree *********************************************/ } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java index 2e6e858..0f92cc8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java @@ -176,8 +176,11 @@ public class SysMemTreeController extends CoreBaseController { List refList = personnelService.findSysRefUserDepartmentByUserId(getSessionUser().getUser().getId()); List userTreeList = memTreeService.packTreeSysOrganizeBySysRefUserOrganize(listTree, refList); + userTreeList = memTreeService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), userTreeList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(userTreeList); } else { + listTree = memTreeService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), listTree); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(listTree); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java index 2d999d8..aacd3af 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java @@ -2,11 +2,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.*; import cn.estsh.i3plus.core.api.iservice.dto.SysMenuDTO; +import cn.estsh.i3plus.platform.common.tool.SerializeTool; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ModelEnumUtil; import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -14,12 +17,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; +import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU; + /** * @Description : * @Reference : @@ -747,6 +749,27 @@ public class CoreMemTreeService implements ICoreMemTreeService { return sysMenuDTOList; } + @Override + public List setLanguageSysMenuName(String languageCode, List menuList) { + languageCode = StringUtils.isNotBlank(languageCode) ? languageCode : CommonConstWords.DEFAULT_LANGUAGE; + Map localeResourceMap = SysMenuService.MEM_CACHE_LANGAGE.get(languageCode); + + if (menuList != null && localeResourceMap != null) { + List resultList = (List) SerializeTool.copyObject(menuList); + + for (SysOrganize menu : resultList) { + if (menu != null) { + if (StringUtils.isNotBlank(menu.getName())) { + String menuName = localeResourceMap.get(RESOURCE_PREFIX_MENU + menu.getName()); + menu.setName(StringUtils.isNotBlank(menuName) ? menuName : menu.getName()); + } + } + } + return resultList; + } + + return menuList; + } /********************************************* End SysMenu Tree *********************************************/ }