From 2787212362c5a23bf5dd94b1bb9cae4ec3fe4caa Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期五, 03 二月 2023 09:47:41 +0800
Subject: [PATCH] !284 更新常量 GenConstants，优化 Map 返回结构 * update 优化返回结构, 将 Map 改为指定 Vo 对象 ; * update GenConstants 扩展数据库数据类型, 更新 BO, VO, ENTITY 字段, 并移动到 generator 模块 ;
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java
index 0671abe..b40acbb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java
@@ -5,12 +5,12 @@
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.web.core.BaseController;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.common.web.core.BaseController;
import com.ruoyi.system.domain.bo.SysMenuBo;
+import com.ruoyi.system.domain.vo.MenuTreeSelectVo;
import com.ruoyi.system.domain.vo.SysMenuVo;
import com.ruoyi.system.service.ISysMenuService;
import lombok.RequiredArgsConstructor;
@@ -18,7 +18,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 鑿滃崟淇℃伅
@@ -38,8 +37,8 @@
*/
@SaCheckPermission("system:menu:list")
@GetMapping("/list")
- public R<List<SysMenu>> list(SysMenu menu) {
- List<SysMenu> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+ public R<List<SysMenuVo>> list(SysMenuBo menu) {
+ List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
return R.ok(menus);
}
@@ -58,8 +57,8 @@
* 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
*/
@GetMapping("/treeselect")
- public R<List<Tree<Long>>> treeselect(SysMenu menu) {
- List<SysMenu> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+ public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
+ List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
return R.ok(menuService.buildMenuTreeSelect(menus));
}
@@ -69,12 +68,12 @@
* @param roleId 瑙掕壊ID
*/
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public R<Map<String, Object>> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
- List<SysMenu> menus = menuService.selectMenuList(LoginHelper.getUserId());
- return R.ok(Map.of(
- "checkedKeys", menuService.selectMenuListByRoleId(roleId),
- "menus", menuService.buildMenuTreeSelect(menus)
- ));
+ public R<MenuTreeSelectVo> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+ List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
+ MenuTreeSelectVo selectVo = new MenuTreeSelectVo();
+ selectVo.setCheckedKeys(menuService.selectMenuListByRoleId(roleId));
+ selectVo.setMenus(menuService.buildMenuTreeSelect(menus));
+ return R.ok(selectVo);
}
/**
--
Gitblit v1.9.3