From b016d1eb02dd09fd1ffcd24e4e6ddee72fd1b3d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 10:27:25 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
index f4a6da7..b807e38 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
@@ -18,10 +18,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
@@ -47,8 +44,17 @@
@PreAuthorize("hasAuthority('system:menu:list')")
@PostMapping("/menu/tree")
public R tree(@RequestBody Map<String, Object> map) {
- List<Menu> menus = menuService.list();
- return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
+// PageParam<Menu, BaseParam> param = new PageParam<>(buildParam(map, BaseParam.class), Menu.class);
+// QueryWrapper<Menu> wrapper = param.buildWrapper(true, queryWrapper -> queryWrapper.orderByAsc("sort"));
+// List<Menu> menus = menuService.list(wrapper);
+// return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
+ List<Menu> menuList = menuService.list(new LambdaQueryWrapper<Menu>().orderByAsc(Menu::getSort));
+ List<Menu> treeData = Utils.toTreeData(menuList, 0L, Menu::getParentId, Menu::getId, Menu::setChildren);
+ if (!Cools.isEmpty(map.get("condition"))) {
+ Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Menu::getName, Menu::getChildren);
+ Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Menu::getName, Menu::getChildren);
+ }
+ return R.ok().add(treeData);
}
@PreAuthorize("hasAuthority('system:menu:list')")
@@ -61,11 +67,27 @@
@OperationLog("娣诲姞鑿滃崟")
@PostMapping("/menu/save")
public R save(@RequestBody Menu menu) {
+ if (menu.getParentId() != null && menu.getParentId() > 0) {
+ Menu parent = menuService.getById(menu.getParentId());
+ if (parent != null) {
+ menu.setParentName(parent.getName());
+ }
+ } else {
+ menu.setParentId(0L);
+ }
+
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.generatePath0(item -> menuService.getById(item.getParentId()), menu, Menu::getId, Menu::getName, Menu::getParentId);
+ menu.setPath(nodeUtils.path.toString());
+ menu.setPathName(nodeUtils.pathName.toString());
+
+ menu.setCreateBy(getLoginUserId());
+ menu.setCreateTime(new Date());
+ menu.setUpdateBy(getLoginUserId());
+ menu.setUpdateTime(new Date());
if (!menuService.save(menu)) {
return R.error("娣诲姞澶辫触");
}
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.generatePath(Menu.class, menu, Menu::getId, Menu::getName, Menu::getParentId);
return R.ok("娣诲姞鎴愬姛");
}
@@ -73,6 +95,22 @@
@OperationLog("淇敼鑿滃崟")
@PostMapping("/menu/update")
public R update(@RequestBody Menu menu) {
+ if (menu.getParentId() != null && menu.getParentId() > 0) {
+ Menu parent = menuService.getById(menu.getParentId());
+ if (parent != null) {
+ menu.setParentName(parent.getName());
+ }
+ } else {
+ menu.setParentId(0L);
+ }
+
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.generatePath0(item -> menuService.getById(item.getParentId()), menu, Menu::getId, Menu::getName, Menu::getParentId);
+ menu.setPath(nodeUtils.path.toString());
+ menu.setPathName(nodeUtils.pathName.toString());
+
+ menu.setUpdateBy(getLoginUserId());
+ menu.setUpdateTime(new Date());
if (!menuService.updateById(menu)) {
return R.error("淇敼澶辫触");
}
--
Gitblit v1.9.1