From 91e4ba507f9806c975a4273154d79f1a43b836c4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 29 四月 2024 13:42:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 137 +++++++++++++--------------------------------
1 files changed, 41 insertions(+), 96 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
index 347731d..4ca0cb9 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java
@@ -1,131 +1,76 @@
package com.mes.menu.controller;
-
-import cn.hutool.core.map.MapUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mes.base.BaseController;
+import com.mes.entity.request.GeneralRequest;
import com.mes.menu.entity.SysMenu;
import com.mes.menu.service.SysMenuService;
-import com.mes.role.entity.SysRoleMenu;
-import com.mes.userinfo.entity.SysUser;
import com.mes.utils.Result;
-import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
/**
- * <p>
- * 鑿滃崟琛�
- * </p>
- *
* @author zhoush
* @since 2024-04-11
*/
-@ApiModel("鑾峰彇鑿滃崟淇℃伅")
+@Api(description = "鑿滃崟绠＄悊")
@RestController
-@RequestMapping("/menu/sysMenu")
-public class SysMenuController extends BaseController {
+@RequestMapping("/sys/menu")
+public class SysMenuController {
@Autowired
- SysMenuService sysMenuService;
+ private SysMenuService sysMenuService;
+
+ @ApiOperation("鏂板鑿滃崟")
+ @PostMapping("/save")
+// @PreAuthorize("hasAuthority('sys:menu:save')")
+ public Result save(@Validated @RequestBody SysMenu sysMenu) {
+ return Result.success(sysMenuService.save(sysMenu));
+ }
+
+ @ApiOperation("淇敼鑿滃崟淇℃伅")
+ @PostMapping("/updateMenu")
+// @PreAuthorize("hasAuthority('sys:menu:update')")
+ public Result updateMenu(@Validated @RequestBody SysMenu sysMenu) {
+ sysMenuService.updateMenu(sysMenu);
+ return Result.success(sysMenu);
+ }
@ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
- @GetMapping("/list")
- public Result<List<SysMenu>> getMenuTree(String userName) {
- return Result.success(sysMenuService.getMenuTree());
+ @GetMapping("/getMenuTree")
+ public Result<List<SysMenu>> getMenuTree(GeneralRequest request) {
+ return Result.success(sysMenuService.getMenuTree(request));
}
@ApiOperation("鑾峰彇鐢ㄦ埛鐨勬潈闄�")
@GetMapping("/getAuthorityInfo")
- public Result<List<String>> getAuthorityInfo(String userName) {
- return Result.success(sysMenuService.getAuthorityInfo(userName));
+ public Result<List<String>> getAuthorityInfo() {
+ return Result.success(sysMenuService.getAuthorityInfo());
}
- /**
- * 鐢ㄦ埛褰撳墠鐢ㄦ埛鐨勮彍鍗曞拰鏉冮檺淇℃伅
- *
- * @param userName
- * @return
- */
+
+ @ApiOperation("鐢ㄦ埛褰撳墠鐢ㄦ埛鐨勮彍鍗曞拰鏉冮檺淇℃伅")
@GetMapping("/nav")
- public Result nav(String userName) {
- SysUser sysUser = sysUserService.getByUsername(userName);
-
- // 鑾峰彇鏉冮檺淇℃伅
- String authorityInfo = sysUserService.getUserAuthorityInfo(sysUser.getId());// ROLE_admin,ROLE_normal,sys:user:list,....
- String[] authorityInfoArray = StringUtils.tokenizeToStringArray(authorityInfo, ",");
-
- // 鑾峰彇瀵艰埅鏍忎俊鎭�
- List<SysMenuDto> navs = sysMenuService.getCurrentUserNav();
-
- return Result.success(MapUtil.builder()
- .put("authoritys", authorityInfoArray)
- .put("nav", navs)
- .map()
- );
+ public Result<Map<Object, Object>> nav() {
+ return Result.success(sysMenuService.nav());
}
- @GetMapping("/info/{id}")
- @PreAuthorize("hasAuthority('sys:menu:list')")
- public Result info(@PathVariable(name = "id") Long id) {
- return Result.success(sysMenuService.getById(id));
+ @ApiOperation("鍒犻櫎鑿滃崟")
+ @PostMapping("/deleteMenu")
+// @PreAuthorize("hasAuthority('sys:menu:delete')")
+ public Result<String> deleteMenu(Long menuId) {
+ return Result.success(sysMenuService.deleteMenu(menuId));
}
- @GetMapping("/list")
- @PreAuthorize("hasAuthority('sys:menu:list')")
- public Result list() {
-
- List<SysMenu> menus = sysMenuService.tree();
- return Result.success(menus);
- }
-
- @PostMapping("/save")
- @PreAuthorize("hasAuthority('sys:menu:save')")
- public Result save(@Validated @RequestBody SysMenu sysMenu) {
-
- sysMenu.setCreated(LocalDateTime.now());
-
- sysMenuService.save(sysMenu);
- return Result.success(sysMenu);
- }
-
- @PostMapping("/update")
- @PreAuthorize("hasAuthority('sys:menu:update')")
- public Result update(@Validated @RequestBody SysMenu sysMenu) {
-
- sysMenu.setUpdated(LocalDateTime.now());
-
- sysMenuService.updateById(sysMenu);
-
- // 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
- sysUserService.clearUserAuthorityInfoByMenuId(sysMenu.getId());
- return Result.success(sysMenu);
- }
-
- @PostMapping("/delete/{id}")
- @PreAuthorize("hasAuthority('sys:menu:delete')")
- public Result delete(@PathVariable("id") Long id) {
-
- int count = sysMenuService.count(new QueryWrapper<SysMenu>().eq("parent_id", id));
- if (count > 0) {
- return Result.fail("璇峰厛鍒犻櫎瀛愯彍鍗�");
- }
-
- // 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
- sysUserService.clearUserAuthorityInfoByMenuId(id);
-
- sysMenuService.removeById(id);
-
- // 鍚屾鍒犻櫎涓棿鍏宠仈琛�
- sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().eq("menu_id", id));
- return Result.success("");
+ @ApiOperation("鎵归噺鍒犻櫎鑿滃崟")
+ @PostMapping("/batchDeleteMenu")
+// @PreAuthorize("hasAuthority('sys:menu:delete')")
+ public Result<String> batchDeleteMenu(@RequestBody List<Long> menuIds) {
+ return Result.success(sysMenuService.batchDeleteMenu(menuIds));
}
}
--
Gitblit v1.8.0