From 0c8c0da73efb15fc92c23c023acaed2d1860e0aa Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 七月 2024 11:02:30 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/base/tag/edit.vue | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/MenuService.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/MenuMapper.java | 2
zy-asrs-wms/src/main/resources/mapper/system/MenuMapper.xml | 12 ++-
zy-asrs-admin/src/views/base/mat/edit.vue | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/MenuServiceImpl.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/HostController.java | 145 +++++++++++++++++++++++++++++++----------------
7 files changed, 109 insertions(+), 60 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/mat/edit.vue b/zy-asrs-admin/src/views/base/mat/edit.vue
index e7bc654..2d32427 100644
--- a/zy-asrs-admin/src/views/base/mat/edit.vue
+++ b/zy-asrs-admin/src/views/base/mat/edit.vue
@@ -27,7 +27,7 @@
post(isSave.value ? '/api/mat/save' : '/api/mat/update', formData.value).then((resp) => {
let result = resp.data;
if (result.code === 200) {
- message.success(formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
} else {
message.error(result.msg);
}
diff --git a/zy-asrs-admin/src/views/base/tag/edit.vue b/zy-asrs-admin/src/views/base/tag/edit.vue
index 437794a..35eb1bd 100644
--- a/zy-asrs-admin/src/views/base/tag/edit.vue
+++ b/zy-asrs-admin/src/views/base/tag/edit.vue
@@ -29,7 +29,7 @@
post(isSave.value ? '/api/tag/save' : '/api/tag/update', formData.value).then((resp) => {
let result = resp.data;
if (result.code === 200) {
- message.success(formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
} else {
message.error(result.msg);
}
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 865fde5..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
@@ -68,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("娣诲姞鎴愬姛");
}
@@ -153,16 +206,8 @@
}
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());
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/MenuMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/MenuMapper.java
index 5f0e7d7..91f3ae9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/MenuMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/mapper/MenuMapper.java
@@ -13,7 +13,7 @@
public interface MenuMapper extends BaseMapper<Menu> {
@InterceptorIgnore(tenantLine = "true")
- List<Menu> selectByPathName(String pathName, Integer type);
+ List<Menu> selectByParentId(Long parentId, Integer type, Long hostId);
@InterceptorIgnore(tenantLine = "true")
List<Menu> selectByHostId(Long hostId);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/MenuService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/MenuService.java
index 4628914..28a0624 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/MenuService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/MenuService.java
@@ -7,7 +7,7 @@
public interface MenuService extends IService<Menu> {
- List<Menu> selectByPathName(String pathName, Integer type);
+ List<Menu> selectByParentId(Long parentId, Integer type, Long hostId);
List<Menu> selectByHostId(Long hostId);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/MenuServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/MenuServiceImpl.java
index 1938b22..1d644b4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/MenuServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/MenuServiceImpl.java
@@ -13,8 +13,8 @@
public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
@Override
- public List<Menu> selectByPathName(String pathName, Integer type) {
- return this.baseMapper.selectByPathName('%' + pathName + '%', type);
+ public List<Menu> selectByParentId(Long parentId, Integer type, Long hostId) {
+ return this.baseMapper.selectByParentId(parentId, type, hostId);
}
@Override
diff --git a/zy-asrs-wms/src/main/resources/mapper/system/MenuMapper.xml b/zy-asrs-wms/src/main/resources/mapper/system/MenuMapper.xml
index a705d86..a9a672c 100644
--- a/zy-asrs-wms/src/main/resources/mapper/system/MenuMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/system/MenuMapper.xml
@@ -2,11 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wms.system.mapper.MenuMapper">
- <select id="selectByPathName" resultType="com.zy.asrs.wms.system.entity.Menu">
+ <select id="selectByParentId" resultType="com.zy.asrs.wms.system.entity.Menu">
select * from sys_menu
- where path_name like #{pathName}
- and type = #{type}
- and host_id = 1
+ where parent_id = #{parentId}
+ <if test="type!=null">
+ and type = #{type}
+ </if>
+ <if test="hostId!=null">
+ and host_id = #{hostId}
+ </if>
and deleted = 0
order by id
</select>
--
Gitblit v1.9.1