From 1b4d9b2dd4ed07758241d1143890b3a86b3c0641 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 28 四月 2024 14:15:49 +0800
Subject: [PATCH] 权限管理开发基本功能已完成,待前端对接

---
 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java |  128 ++++++++++++++----------------------------
 1 files changed, 44 insertions(+), 84 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 919fdb9..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,116 +1,76 @@
 package com.mes.menu.controller;
 
-
-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.role.entity.SysRoleMenu;
+import com.mes.menu.service.SysMenuService;
 import com.mes.utils.Result;
-import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 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 {
-    @ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
-    @GetMapping("/list")
-    public Result<List<SysMenu>> getMenuTree(String userName) {
-        return Result.success(sysMenuService.getMenuTree());
-    }
+@RequestMapping("/sys/menu")
+public class SysMenuController {
 
-    @ApiOperation("鑾峰彇鐢ㄦ埛鐨勬潈闄�")
-    @GetMapping("/getAuthorityInfo")
-    public Result<List<String>> getAuthorityInfo(String userName) {
-        return Result.success(sysMenuService.getAuthorityInfo(userName));
-    }
+    @Autowired
+    private SysMenuService sysMenuService;
 
-    /**
-     * 鐢ㄦ埛褰撳墠鐢ㄦ埛鐨勮彍鍗曞拰鏉冮檺淇℃伅
-     *
-     * @param userName
-     * @return
-     */
-    @GetMapping("/nav")
-    public Result nav(String userName) {
-//        SysUser sysUser = sysUserService.listByUserNameName(userName);
-//
-//        // 鑾峰彇鏉冮檺淇℃伅
-//       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()
-//        );
-        return null;
-    }
-
-    @GetMapping("/info/{id}")
-    @PreAuthorize("hasAuthority('sys:menu:list')")
-    public Result info(@PathVariable(name = "id") Long id) {
-        return Result.success(sysMenuService.getById(id));
-    }
-
-//    @GetMapping("/list")
-//    @PreAuthorize("hasAuthority('sys:menu:list')")
-//    public Result list() {
-//
-////        List<SysMenu> menus = sysMenuService.tree();
-//        return Result.success(null);
-//    }
-
+    @ApiOperation("鏂板鑿滃崟")
     @PostMapping("/save")
-    @PreAuthorize("hasAuthority('sys:menu:save')")
+//    @PreAuthorize("hasAuthority('sys:menu:save')")
     public Result save(@Validated @RequestBody SysMenu sysMenu) {
         return Result.success(sysMenuService.save(sysMenu));
     }
 
-    @PostMapping("/update")
-    @PreAuthorize("hasAuthority('sys:menu:update')")
-    public Result update(@Validated @RequestBody SysMenu sysMenu) {
-
-        sysMenuService.updateById(sysMenu);
-
-        // 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
-        sysUserService.clearUserAuthorityInfoByMenuId(sysMenu.getId());
+    @ApiOperation("淇敼鑿滃崟淇℃伅")
+    @PostMapping("/updateMenu")
+//    @PreAuthorize("hasAuthority('sys:menu:update')")
+    public Result updateMenu(@Validated @RequestBody SysMenu sysMenu) {
+        sysMenuService.updateMenu(sysMenu);
         return Result.success(sysMenu);
     }
 
-    @PostMapping("/delete/{id}")
-    @PreAuthorize("hasAuthority('sys:menu:delete')")
-    public Result delete(@PathVariable("id") Long id) {
+    @ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
+    @GetMapping("/getMenuTree")
+    public Result<List<SysMenu>> getMenuTree(GeneralRequest request) {
+        return Result.success(sysMenuService.getMenuTree(request));
+    }
 
-        int count = sysMenuService.count(new QueryWrapper<SysMenu>().eq("parent_id", id));
-        if (count > 0) {
-            return Result.error("璇峰厛鍒犻櫎瀛愯彍鍗�");
-        }
+    @ApiOperation("鑾峰彇鐢ㄦ埛鐨勬潈闄�")
+    @GetMapping("/getAuthorityInfo")
+    public Result<List<String>> getAuthorityInfo() {
+        return Result.success(sysMenuService.getAuthorityInfo());
+    }
 
-        // 娓呴櫎鎵�鏈変笌璇ヨ彍鍗曠浉鍏崇殑鏉冮檺缂撳瓨
-        sysUserService.clearUserAuthorityInfoByMenuId(id);
 
-        sysMenuService.removeById(id);
+    @ApiOperation("鐢ㄦ埛褰撳墠鐢ㄦ埛鐨勮彍鍗曞拰鏉冮檺淇℃伅")
+    @GetMapping("/nav")
+    public Result<Map<Object, Object>> nav() {
+        return Result.success(sysMenuService.nav());
+    }
 
-        // 鍚屾鍒犻櫎涓棿鍏宠仈琛�
-        sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().eq("menu_id", id));
-        return Result.success("");
+    @ApiOperation("鍒犻櫎鑿滃崟")
+    @PostMapping("/deleteMenu")
+//    @PreAuthorize("hasAuthority('sys:menu:delete')")
+    public Result<String> deleteMenu(Long menuId) {
+        return Result.success(sysMenuService.deleteMenu(menuId));
+    }
+
+    @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