From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java | 154 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 102 insertions(+), 52 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java
index e6e9444..d30538e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java
@@ -12,9 +12,7 @@
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.Menu;
import com.zy.asrs.wms.system.entity.RoleMenu;
-import com.zy.asrs.wms.system.service.HostService;
-import com.zy.asrs.wms.system.service.MenuService;
-import com.zy.asrs.wms.system.service.RoleMenuService;
+import com.zy.asrs.wms.system.service.*;
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,6 +32,10 @@
private MenuService menuService;
@Autowired
private RoleMenuService roleMenuService;
+ @Autowired
+ private RoleService roleService;
+ @Autowired
+ private UserService userService;
@PreAuthorize("hasAuthority('system:host:list')")
@PostMapping("/host/page")
@@ -66,59 +68,112 @@
return R.error("娣诲姞澶辫触");
}
- //鍒涘缓绯荤粺榛樿鑿滃崟
- Menu menu = new Menu();
- menu.setName("绯荤粺绠＄悊");
- menu.setParentId(0L);
- menu.setRoute("/system");
- menu.setType(0);
- menu.setIcon("UserOutlined");
- menu.setSort(1);
- menu.setLanguageId("system.system");
- menu.setHostId(host.getId());
- boolean save = menuService.save(menu);
- if (!save) {
- throw new CoolException("娣诲姞澶辫触");
- }
- List<Menu> menuList = menuService.selectByPathName("绯荤粺绠＄悊", 0);
- for (Menu menu1 : menuList) {
- menu1.setId(null);
- menu1.setHostId(host.getId());
- menu1.setParentId(menu.getId());
- boolean save1 = menuService.save(menu1);
+ List<Menu> parentMenus = menuService.selectByParentId(0L, 0, 1L);
+ for (Menu parentMenu : parentMenus) {
+ List<Menu> menuList = menuService.selectByParentId(parentMenu.getId(), 0, parentMenu.getHostId());
+
+ parentMenu.setId(null);
+ parentMenu.setHostId(host.getId());
+ boolean save1 = menuService.save(parentMenu);
if (!save1) {
throw new CoolException("娣诲姞澶辫触");
}
- List<Menu> menuList2 = menuService.selectByPathName(menu1.getName(), 1);
- for (Menu menu2 : menuList2) {
- menu2.setId(null);
- menu2.setHostId(host.getId());
- menu2.setParentId(menu1.getId());
- boolean save2 = menuService.save(menu2);
+ for (Menu menu1 : menuList) {
+ List<Menu> menuList2 = menuService.selectByParentId(menu1.getId(), 1, menu1.getHostId());
+
+ menu1.setId(null);
+ menu1.setHostId(host.getId());
+ menu1.setParentId(parentMenu.getId());
+ boolean save2 = menuService.save(menu1);
if (!save2) {
throw new CoolException("娣诲姞澶辫触");
}
- }
- }
- //鍒涘缓榛樿鏉冮檺
- for (Menu menu1 : menuList) {
+ for (Menu menu2 : menuList2) {
+ menu2.setId(null);
+ menu2.setHostId(host.getId());
+ menu2.setParentId(menu1.getId());
+ boolean save3 = menuService.save(menu2);
+ if (!save3) {
+ throw new CoolException("娣诲姞澶辫触");
+ }
+ }
+ }
+
+ //鍒涘缓榛樿鏉冮檺
+ for (Menu menu1 : menuList) {
+ RoleMenu roleMenu = new RoleMenu();
+ roleMenu.setRoleId(1L);
+ roleMenu.setMenuId(menu1.getId());
+ boolean save4 = roleMenuService.save(roleMenu);
+ if (!save4) {
+ throw new CoolException("娣诲姞澶辫触");
+ }
+ }
RoleMenu roleMenu = new RoleMenu();
roleMenu.setRoleId(1L);
- roleMenu.setMenuId(menu1.getId());
- boolean save1 = roleMenuService.save(roleMenu);
- if (!save1) {
+ roleMenu.setMenuId(parentMenu.getId());
+ boolean save5 = roleMenuService.save(roleMenu);
+ if (!save5) {
throw new CoolException("娣诲姞澶辫触");
}
+
}
- RoleMenu roleMenu = new RoleMenu();
- roleMenu.setRoleId(1L);
- roleMenu.setMenuId(menu.getId());
- boolean save1 = roleMenuService.save(roleMenu);
- if (!save1) {
- throw new CoolException("娣诲姞澶辫触");
- }
+
+// //鍒涘缓绯荤粺榛樿鑿滃崟
+// Menu menu = new Menu();
+// menu.setName("绯荤粺绠＄悊");
+// menu.setParentId(0L);
+// menu.setRoute("/system");
+// menu.setType(0);
+// menu.setIcon("UserOutlined");
+// menu.setSort(1);
+// menu.setLanguageId("system.system");
+// menu.setHostId(host.getId());
+// boolean save = menuService.save(menu);
+// if (!save) {
+// throw new CoolException("娣诲姞澶辫触");
+// }
+// List<Menu> menuList = menuService.selectByPathName("绯荤粺绠＄悊", 0);
+// for (Menu menu1 : menuList) {
+// menu1.setId(null);
+// menu1.setHostId(host.getId());
+// menu1.setParentId(menu.getId());
+// boolean save1 = menuService.save(menu1);
+// if (!save1) {
+// throw new CoolException("娣诲姞澶辫触");
+// }
+//
+// List<Menu> menuList2 = menuService.selectByPathName(menu1.getName(), 1);
+// for (Menu menu2 : menuList2) {
+// menu2.setId(null);
+// menu2.setHostId(host.getId());
+// menu2.setParentId(menu1.getId());
+// boolean save2 = menuService.save(menu2);
+// if (!save2) {
+// throw new CoolException("娣诲姞澶辫触");
+// }
+// }
+// }
+//
+// //鍒涘缓榛樿鏉冮檺
+// for (Menu menu1 : menuList) {
+// RoleMenu roleMenu = new RoleMenu();
+// roleMenu.setRoleId(1L);
+// roleMenu.setMenuId(menu1.getId());
+// boolean save1 = roleMenuService.save(roleMenu);
+// if (!save1) {
+// throw new CoolException("娣诲姞澶辫触");
+// }
+// }
+// RoleMenu roleMenu = new RoleMenu();
+// roleMenu.setRoleId(1L);
+// roleMenu.setMenuId(menu.getId());
+// boolean save1 = roleMenuService.save(roleMenu);
+// if (!save1) {
+// throw new CoolException("娣诲姞澶辫触");
+// }
return R.ok("娣诲姞鎴愬姛");
}
@@ -151,15 +206,10 @@
}
if (!menuIds.isEmpty()) {
- boolean result = roleMenuService.remove(new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getMenuId, menuIds));
- if (!result) {
- throw new CoolException("鍒犻櫎澶辫触");
- }
-
- boolean result1 = menuService.removeByHostId(host.getId());
- if (!result1) {
- throw new CoolException("鍒犻櫎澶辫触");
- }
+ roleMenuService.remove(new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getMenuId, menuIds));
+ menuService.removeByHostId(host.getId());
+ roleService.removeByHostId(host.getId());
+ userService.removeByHostId(host.getId());
}
}
--
Gitblit v1.9.1