From 1cd1c38372a5652b59866f28953179476cf84567 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 10:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
index 7ed7d10..96ffa7d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
@@ -3,13 +3,18 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sandu.common.execption.BusinessException;
+import com.sandu.common.execption.EntityExistException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.param.MenuParam;
+import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.AdminRoleRelation;
import com.sandu.ximon.dao.domain.Menu;
import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.mapper.AdminRoleRelationMapper;
import com.sandu.ximon.dao.mapper.MenuMapper;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -34,7 +39,56 @@
if (CollectionUtil.isEmpty(menuIdList)) {
return null;
}
- List<Menu> menus = listByIds(menuIdList);
- return menus;
+ return listByIds(menuIdList);
+ }
+
+ public boolean addMenu(MenuParam param) {
+ Menu menu = new Menu();
+ BeanUtils.copyProperties(param,menu);
+ return save(menu);
+ }
+
+// public Set<Menu> listMenuByRoles(Set<Role> roles) {
+// List<Long> roleIds = roles.stream().map(Role::getId).collect(Collectors.toList());
+// Set<Menu> menus = menuDao.listMenuByRoleIds(roleIds);
+// return menus;
+// }
+//
+// /**
+// * 鎶婅彍鍗曡浆鎴愭爲褰㈢粨鏋�
+// */
+// public List<MenuNode> buildTree(List<Menu> menuList) {
+// return menuList.stream()
+// .filter(menu -> menu.getPid().equals(0L))
+// .map(menu -> covertMenuNode(menu, menuList)).collect(Collectors.toList());
+// }
+
+ private MenuNode covertMenuNode(Menu menu, List<Menu> menuList) {
+ MenuNode node = new MenuNode();
+ BeanUtils.copyProperties(menu, node);
+ List<MenuNode> children = menuList.stream()
+ .filter(subMenu -> subMenu.getPid().equals(menu.getId()))
+ .map(subMenu -> covertMenuNode(subMenu, menuList)).collect(Collectors.toList());
+ node.setChildren(children);
+ return node;
+ }
+
+ public boolean updateMenu(Long menuId,MenuParam param) {
+ Menu one = getById(menuId);
+ if (one == null) {
+ throw new BusinessException("鎵句笉鍒拌彍鍗曚俊鎭�");
+ }
+
+ Menu menu = new Menu();
+ BeanUtils.copyProperties(param,menu);
+ menu.setId(menuId);
+ return updateById(menu);
+ }
+
+ public List<MenuNode> treeList() {
+ List<Menu> list = list();
+ return list.stream()
+ .filter(menu -> menu.getPid().equals(0L))
+ .map(menu -> covertMenuNode(menu, list)).collect(Collectors.toList());
}
}
--
Gitblit v1.9.3