From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java | 72 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
index 8fc718f..9ea25c4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysMenuController.java
@@ -1,16 +1,6 @@
package com.ruoyi.system.controller.sys;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSON;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -19,8 +9,17 @@
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.domain.pojo.sys.SysMenu;
import com.ruoyi.system.service.sys.ISysMenuService;
+import com.ruoyi.system.service.sys.ISysUserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* 菜单信息
@@ -33,6 +32,9 @@
{
@Autowired
private ISysMenuService menuService;
+
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 获取菜单列表
@@ -67,6 +69,7 @@
return success(menuService.buildMenuTreeSelect(menus));
}
+
/**
* 加载对应角色菜单列表树
*/
@@ -81,11 +84,39 @@
return ajax;
}
+
+ @ApiOperation(value = "加载对应部门菜单列表树")
+ @GetMapping(value = "/deptMenuTreeselect/{deptId}")
+ public AjaxResult deptMenuTreeselect(@PathVariable("deptId") Long deptId)
+ {
+ Long userId = SecurityUtils.getUserId();
+ List<SysMenu> menus = menuService.selectMenuList(userId);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", menuService.selectMenuListByDeptId(deptId));
+ ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+ return ajax;
+ }
+
+
+ @ApiOperation(value = "加载对应部门用户菜单列表树")
+ @GetMapping(value = "/deptUserMenuTreeselect/{deptUserId}")
+ public AjaxResult deptUserMenuTreeselect(@PathVariable("deptUserId") Long deptUserId)
+ {
+ Long userId = SecurityUtils.getUserId();
+ SysUser sysUser = sysUserService.selectUserById(deptUserId);
+ List<SysMenu> menus = menuService.selectDeptMenuList(deptUserId);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", menuService.selectMenuListByDeptUserId(deptUserId));
+ ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+ ajax.put("dataScope", sysUser.getDataScope());
+ return ajax;
+ }
+
/**
* 新增菜单
*/
@RequiresPermissions("system:menu:add")
- @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+ @Log(title = "菜单管理", businessType = BusinessType.INSERT,operContent = "新增菜单")
@PostMapping
public AjaxResult add(@Validated @RequestBody SysMenu menu)
{
@@ -105,7 +136,7 @@
* 修改菜单
*/
@RequiresPermissions("system:menu:edit")
- @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+ @Log(title = "菜单管理", businessType = BusinessType.UPDATE,operContent = "修改菜单")
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysMenu menu)
{
@@ -129,7 +160,7 @@
* 删除菜单
*/
@RequiresPermissions("system:menu:remove")
- @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+ @Log(title = "菜单管理", businessType = BusinessType.DELETE,operContent = "删除菜单")
@DeleteMapping("/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long menuId)
{
@@ -156,4 +187,17 @@
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return success(menuService.buildMenus(menus));
}
+
+ /**
+ * 获取路由信息
+ *
+ * @return 路由信息
+ */
+ @GetMapping("getStaffRouters")
+ public AjaxResult getStaffRouters()
+ {
+ Long userId = SecurityUtils.getUserId();
+ List<SysMenu> menus = menuService.selectStaffMenuTreeByUserId(userId);
+ return success(menuService.buildMenus(menus));
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1