From 22b052e32b2d5175a3a4916138311807312abe2b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 二月 2024 12:37:07 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 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 d98d507..c7e505f 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
@@ -11,16 +11,14 @@
 import com.zy.asrs.wcs.system.entity.Menu;
 import com.zy.asrs.wcs.system.service.MenuService;
 import com.zy.asrs.wcs.utils.ExcelUtil;
+import com.zy.asrs.wcs.utils.NodeUtils;
 import com.zy.asrs.wcs.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 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")
@@ -60,6 +58,24 @@
     @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("娣诲姞澶辫触");
         }
@@ -70,6 +86,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