From 093579c99049bf09ecf8e5d0f80179fde1ddc776 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 10 七月 2024 09:49:31 +0800
Subject: [PATCH] 下片：下片任务状态字段名称修改 大理片：1、扫码任务新增确认字校验：确认字为0，请求有id的情况不处理 2、新增定时任务处理进出片任务执行过程中出现破损玻璃的情况 待完成：破损表新增功能未实现
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/controller/SysMenuController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..b507a45 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
@@ -29,15 +29,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 +67,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("鎵归噺鍒犻櫎鑿滃崟")
--
Gitblit v1.8.0