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/entity/OperationRecord.java | 4 ++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java | 4 ++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java | 38 ++++++++++++++++++++++++++++++++------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java | 4 ++--
4 files changed, 38 insertions(+), 12 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 fec1915..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
@@ -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")
@@ -61,14 +58,27 @@
@OperationLog("娣诲姞鑿滃崟")
@PostMapping("/menu/save")
public R save(@RequestBody Menu menu) {
- if (!menuService.save(menu)) {
- return R.error("娣诲姞澶辫触");
+ 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("娣诲姞澶辫触");
+ }
return R.ok("娣诲姞鎴愬姛");
}
@@ -76,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("淇敼澶辫触");
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
index 77d6a72..fb1b40d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
@@ -276,7 +276,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -292,7 +292,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java
index 36c83d0..8589f59 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/OperationRecord.java
@@ -164,7 +164,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.userId);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -173,7 +173,7 @@
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
if (!Cools.isEmpty(host)){
- return String.valueOf(host.getId());
+ return String.valueOf(host.getName());
}
return null;
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
index 92bd052..b082623 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/UserLogin.java
@@ -87,7 +87,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.userId);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -96,7 +96,7 @@
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
if (!Cools.isEmpty(host)){
- return String.valueOf(host.getId());
+ return String.valueOf(host.getName());
}
return null;
}
--
Gitblit v1.9.1