From ae504e646e4775837eba99aa2efb30e6c3c818d4 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 01 四月 2025 17:01:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 4ca0cb9..27eab58 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
@@ -3,6 +3,7 @@
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.Api;
import io.swagger.annotations.ApiOperation;
@@ -10,6 +11,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
@@ -17,7 +19,7 @@
* @author zhoush
* @since 2024-04-11
*/
-@Api(description = "鑿滃崟绠＄悊")
+@Api(tags = "鑿滃崟绠＄悊")
@RestController
@RequestMapping("/sys/menu")
public class SysMenuController {
@@ -29,15 +31,20 @@
@PostMapping("/save")
// @PreAuthorize("hasAuthority('sys:menu:save')")
public Result save(@Validated @RequestBody SysMenu sysMenu) {
- return Result.success(sysMenuService.save(sysMenu));
+ sysMenuService.save(sysMenu);
+ GeneralRequest request = new GeneralRequest();
+ return Result.success(sysMenuService.getMenuTree(request));
+
}
@ApiOperation("淇敼鑿滃崟淇℃伅")
@PostMapping("/updateMenu")
// @PreAuthorize("hasAuthority('sys:menu:update')")
- public Result updateMenu(@Validated @RequestBody SysMenu sysMenu) {
+ public Result<List<SysMenu>> updateMenu(@Validated @RequestBody SysMenu sysMenu) {
+ //return Result.success(sysMenu);
sysMenuService.updateMenu(sysMenu);
- return Result.success(sysMenu);
+ GeneralRequest request = new GeneralRequest();
+ return Result.build(200, "淇敼鎴愬姛", sysMenuService.getMenuTree(request));
}
@ApiOperation("鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑鎵�鏈夎彍鍗�")
@@ -62,8 +69,9 @@
@ApiOperation("鍒犻櫎鑿滃崟")
@PostMapping("/deleteMenu")
// @PreAuthorize("hasAuthority('sys:menu:delete')")
- public Result<String> deleteMenu(Long menuId) {
- return Result.success(sysMenuService.deleteMenu(menuId));
+ public Result<List<SysMenu>> deleteMenu(Long menuId) {
+ GeneralRequest request = new GeneralRequest();
+ return Result.build(200, sysMenuService.deleteMenu(menuId), sysMenuService.getMenuTree(request));
}
@ApiOperation("鎵归噺鍒犻櫎鑿滃崟")
@@ -73,5 +81,12 @@
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