From d22b530fa0fbd910d8d7baefa29d88d755568e68 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 15 十二月 2025 10:01:41 +0800
Subject: [PATCH] 1、 修复权限相关的bug
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 82 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 16 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 131b179..a24a214 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,39 +1,89 @@
package com.mes.menu.controller;
-
+import com.mes.entity.request.GeneralRequest;
import com.mes.menu.entity.SysMenu;
import com.mes.menu.service.SysMenuService;
+import com.mes.tools.DateUtil;
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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
import java.util.List;
+import java.util.Map;
/**
- * <p>
- * 鑿滃崟琛�
- * </p>
- *
* @author zhoush
* @since 2024-04-11
*/
-@ApiModel("鑾峰彇鑿滃崟淇℃伅")
+@Api(tags = "鑿滃崟绠＄悊")
@RestController
-@RequestMapping("/menu/sysMenu")
+@RequestMapping("/sys/menu")
public class SysMenuController {
@Autowired
- SysMenuService sysMenuService;
+ private SysMenuService sysMenuService;
- @ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
- @GetMapping("/list")
- public Result<List<SysMenu>> getMenuTree() {
- return Result.success(sysMenuService.getMenuTree());
+ @ApiOperation("鏂板鑿滃崟")
+ @PostMapping("/save")
+// @PreAuthorize("hasAuthority('sys:menu:save')")
+ public Result saveMenu(@Validated @RequestBody SysMenu sysMenu) {
+ sysMenuService.saveMenu(sysMenu);
+ return Result.build(200, "鏂板鎴愬姛", Boolean.TRUE);
+
}
+ @ApiOperation("淇敼鑿滃崟淇℃伅")
+ @PostMapping("/updateMenu")
+// @PreAuthorize("hasAuthority('sys:menu:update')")
+ public Result<Boolean> updateMenu(@Validated @RequestBody SysMenu sysMenu) {
+ sysMenuService.updateMenu(sysMenu);
+ return Result.build(200, "淇敼鎴愬姛", Boolean.TRUE);
+ }
+
+ @ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
+ @GetMapping("/getMenuTree")
+ public Result<List<SysMenu>> getMenuTree(GeneralRequest request) {
+ return Result.success(sysMenuService.getMenuTree(request));
+ }
+
+ @ApiOperation("鑾峰彇鐢ㄦ埛鐨勬潈闄�")
+ @GetMapping("/getAuthorityInfo")
+ public Result<List<String>> getAuthorityInfo() {
+ return Result.success(sysMenuService.getAuthorityInfo());
+ }
+
+
+ @ApiOperation("鐢ㄦ埛褰撳墠鐢ㄦ埛鐨勮彍鍗曞拰鏉冮檺淇℃伅")
+ @GetMapping("/nav")
+ public Result<Map<Object, Object>> nav() {
+ return Result.success(sysMenuService.nav());
+ }
+
+ @ApiOperation("鍒犻櫎鑿滃崟")
+ @PostMapping("/deleteMenu")
+// @PreAuthorize("hasAuthority('sys:menu:delete')")
+ public Result<List<SysMenu>> deleteMenu(Long menuId) {
+ GeneralRequest request = new GeneralRequest();
+ return Result.build(200, sysMenuService.deleteMenu(menuId), sysMenuService.getMenuTree(request));
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎鑿滃崟")
+ @PostMapping("/batchDeleteMenu")
+// @PreAuthorize("hasAuthority('sys:menu:delete')")
+ public Result<String> batchDeleteMenu(@RequestBody List<Long> menuIds) {
+ return Result.success(sysMenuService.batchDeleteMenu(menuIds));
+ }
+
+ @ApiOperation("鑾峰彇褰撳墠鏃堕棿")
+ @PostMapping("/getNowDate")
+// @PreAuthorize("hasAuthority('sys:menu:delete')")
+ public Result getNowDate() {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return Result.build(200, "鏌ヨ鎴愬姛", sdf.format(DateUtil.getEndDate()));
+ }
}
--
Gitblit v1.8.0