From 046ec0cb6c3e407c617689a2a59df7bf45af034f Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Fri, 27 Aug 2021 20:43:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.3=E3=80=91=E3=80=90menu=E3=80=91me?= =?UTF-8?q?nu=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9Eapp=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/pojo/menu/layui/LayuiAppIndexMenusVO.java | 5 +++++ .../modular/menu/factory/LayuiMenusFactory.java | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiAppIndexMenusVO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiAppIndexMenusVO.java index f24013244..c774492f6 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiAppIndexMenusVO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/menu/layui/LayuiAppIndexMenusVO.java @@ -47,6 +47,11 @@ public class LayuiAppIndexMenusVO { */ private String appName; + /** + * 应用图标 + */ + private String appIcon; + /** * 该应用对应的菜单树 */ diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java index 19bdc726c..676efd91d 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java @@ -34,9 +34,10 @@ import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; import cn.stylefeng.roses.kernel.system.api.AppServiceApi; -import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; +import cn.stylefeng.roses.kernel.system.api.pojo.app.SysAppResult; import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiAppIndexMenusVO; import cn.stylefeng.roses.kernel.system.api.pojo.menu.layui.LayuiIndexMenuTreeNode; +import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu; import java.util.*; import java.util.stream.Collectors; @@ -104,7 +105,9 @@ public class LayuiMenusFactory { // 将appCode和对应的树包装为实体 LayuiAppIndexMenusVO layuiAppIndexMenusVO = new LayuiAppIndexMenusVO(); layuiAppIndexMenusVO.setAppCode(appCode); - layuiAppIndexMenusVO.setAppName(getAppNameByAppCode(appCode)); + SysAppResult appInfo = getAppNameByAppCode(appCode); + layuiAppIndexMenusVO.setAppName(appInfo.getAppName()); + layuiAppIndexMenusVO.setAppIcon(appInfo.getAppIcon()); layuiAppIndexMenusVO.setLayuiIndexMenuTreeNodes(layuiIndexMenuTreeNodeList); resultList.add(layuiAppIndexMenusVO); } @@ -118,9 +121,9 @@ public class LayuiMenusFactory { * @author fengshuonan * @date 2021/1/1 18:09 */ - private static String getAppNameByAppCode(String appCode) { + private static SysAppResult getAppNameByAppCode(String appCode) { AppServiceApi appServiceApi = SpringUtil.getBean(AppServiceApi.class); - return appServiceApi.getAppNameByAppCode(appCode); + return appServiceApi.getAppInfoByAppCode(appCode); } }