From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 123 ++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 45 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index aa924f9..643d304 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -1,14 +1,16 @@
package com.ruoyi.system.service.impl;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.mapper.SysMenuMapper;
@@ -24,14 +26,10 @@
/**
* 鑿滃崟 涓氬姟灞傚鐞�
*
- * @author ruoyi
+ * @author Lion Li
*/
@Service
-public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
- public static final String PREMISSION_STRING = "perms[\"{0}\"]";
-
- @Autowired
- private SysMenuMapper menuMapper;
+public class SysMenuServiceImpl extends ServicePlusImpl<SysMenuMapper, SysMenu, SysMenu> implements ISysMenuService {
@Autowired
private SysRoleMapper roleMapper;
@@ -61,10 +59,15 @@
List<SysMenu> menuList = null;
// 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭�
if (SysUser.isAdmin(userId)) {
- menuList = menuMapper.selectMenuList(menu);
+ menuList = list(new LambdaQueryWrapper<SysMenu>()
+ .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
+ .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
+ .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+ .orderByAsc(SysMenu::getParentId)
+ .orderByAsc(SysMenu::getOrderNum));
} else {
menu.getParams().put("userId", userId);
- menuList = menuMapper.selectMenuListByUserId(menu);
+ menuList = baseMapper.selectMenuListByUserId(menu);
}
return menuList;
}
@@ -77,10 +80,10 @@
*/
@Override
public Set<String> selectMenuPermsByUserId(Long userId) {
- List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
+ List<String> perms = baseMapper.selectMenuPermsByUserId(userId);
Set<String> permsSet = new HashSet<>();
for (String perm : perms) {
- if (Validator.isNotEmpty(perm)) {
+ if (StringUtils.isNotEmpty(perm)) {
permsSet.addAll(Arrays.asList(perm.trim().split(",")));
}
}
@@ -97,9 +100,9 @@
public List<SysMenu> selectMenuTreeByUserId(Long userId) {
List<SysMenu> menus = null;
if (SecurityUtils.isAdmin(userId)) {
- menus = menuMapper.selectMenuTreeAll();
+ menus = baseMapper.selectMenuTreeAll();
} else {
- menus = menuMapper.selectMenuTreeByUserId(userId);
+ menus = baseMapper.selectMenuTreeByUserId(userId);
}
return getChildPerms(menus, 0);
}
@@ -112,8 +115,8 @@
*/
@Override
public List<Integer> selectMenuListByRoleId(Long roleId) {
- SysRole role = roleMapper.selectRoleById(roleId);
- return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
+ SysRole role = roleMapper.selectById(roleId);
+ return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
}
/**
@@ -131,19 +134,34 @@
router.setName(getRouteName(menu));
router.setPath(getRouterPath(menu));
router.setComponent(getComponent(menu));
- router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache())));
- List<SysMenu> cMenus = menu.getChildren();
- if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
+ router.setQuery(menu.getQuery());
+ router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+ List<SysMenu> cMenus = (List<SysMenu>) menu.getChildren();
+ if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
router.setAlwaysShow(true);
router.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus));
} else if (isMenuFrame(menu)) {
+ router.setMeta(null);
List<RouterVo> childrenList = new ArrayList<RouterVo>();
RouterVo children = new RouterVo();
children.setPath(menu.getPath());
children.setComponent(menu.getComponent());
- children.setName(StrUtil.upperFirst(menu.getPath()));
- children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache())));
+ children.setName(StringUtils.capitalize(menu.getPath()));
+ children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+ children.setQuery(menu.getQuery());
+ childrenList.add(children);
+ router.setChildren(childrenList);
+ } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {
+ router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
+ router.setPath("/inner");
+ List<RouterVo> childrenList = new ArrayList<RouterVo>();
+ RouterVo children = new RouterVo();
+ String routerPath = StringUtils.replaceEach(menu.getPath(), new String[]{Constants.HTTP, Constants.HTTPS}, new String[]{"", ""});
+ children.setPath(routerPath);
+ children.setComponent(UserConstants.INNER_LINK);
+ children.setName(StringUtils.capitalize(routerPath));
+ children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()));
childrenList.add(children);
router.setChildren(childrenList);
}
@@ -165,8 +183,7 @@
for (SysMenu dept : menus) {
tempList.add(dept.getMenuId());
}
- for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
- SysMenu menu = (SysMenu) iterator.next();
+ for (SysMenu menu : menus) {
// 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
if (!tempList.contains(menu.getParentId())) {
recursionFn(menus, menu);
@@ -199,7 +216,7 @@
*/
@Override
public SysMenu selectMenuById(Long menuId) {
- return menuMapper.selectMenuById(menuId);
+ return getById(menuId);
}
/**
@@ -210,8 +227,8 @@
*/
@Override
public boolean hasChildByMenuId(Long menuId) {
- int result = menuMapper.hasChildByMenuId(menuId);
- return result > 0 ? true : false;
+ long result = count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, menuId));
+ return result > 0;
}
/**
@@ -222,8 +239,8 @@
*/
@Override
public boolean checkMenuExistRole(Long menuId) {
- int result = roleMenuMapper.checkMenuExistRole(menuId);
- return result > 0 ? true : false;
+ long result = roleMenuMapper.selectCount(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getMenuId, menuId));
+ return result > 0;
}
/**
@@ -234,7 +251,7 @@
*/
@Override
public int insertMenu(SysMenu menu) {
- return menuMapper.insertMenu(menu);
+ return baseMapper.insert(menu);
}
/**
@@ -245,7 +262,7 @@
*/
@Override
public int updateMenu(SysMenu menu) {
- return menuMapper.updateMenu(menu);
+ return baseMapper.updateById(menu);
}
/**
@@ -256,7 +273,7 @@
*/
@Override
public int deleteMenuById(Long menuId) {
- return menuMapper.deleteMenuById(menuId);
+ return baseMapper.deleteById(menuId);
}
/**
@@ -267,9 +284,12 @@
*/
@Override
public String checkMenuNameUnique(SysMenu menu) {
- Long menuId = Validator.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
- SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
- if (Validator.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
+ Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
+ SysMenu info = getOne(new LambdaQueryWrapper<SysMenu>()
+ .eq(SysMenu::getMenuName, menu.getMenuName())
+ .eq(SysMenu::getParentId, menu.getParentId())
+ .last("limit 1"));
+ if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -282,10 +302,10 @@
* @return 璺敱鍚嶇О
*/
public String getRouteName(SysMenu menu) {
- String routerName = StrUtil.upperFirst(menu.getPath());
+ String routerName = StringUtils.capitalize(menu.getPath());
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
if (isMenuFrame(menu)) {
- routerName = StrUtil.EMPTY;
+ routerName = StringUtils.EMPTY;
}
return routerName;
}
@@ -298,6 +318,10 @@
*/
public String getRouterPath(SysMenu menu) {
String routerPath = menu.getPath();
+ // 鍐呴摼鎵撳紑澶栫綉鏂瑰紡
+ if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
+ routerPath = StringUtils.replaceEach(routerPath, new String[]{Constants.HTTP, Constants.HTTPS}, new String[]{"", ""});
+ }
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
&& UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
@@ -318,9 +342,11 @@
*/
public String getComponent(SysMenu menu) {
String component = UserConstants.LAYOUT;
- if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) {
+ if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) {
component = menu.getComponent();
- } else if (StrUtil.isEmpty(menu.getComponent()) && isParentView(menu)) {
+ } else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) {
+ component = UserConstants.INNER_LINK;
+ } else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) {
component = UserConstants.PARENT_VIEW;
}
return component;
@@ -335,6 +361,16 @@
public boolean isMenuFrame(SysMenu menu) {
return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
&& menu.getIsFrame().equals(UserConstants.NO_FRAME);
+ }
+
+ /**
+ * 鏄惁涓哄唴閾剧粍浠�
+ *
+ * @param menu 鑿滃崟淇℃伅
+ * @return 缁撴灉
+ */
+ public boolean isInnerLink(SysMenu menu) {
+ return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath());
}
/**
@@ -356,8 +392,7 @@
*/
public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId) {
List<SysMenu> returnList = new ArrayList<SysMenu>();
- for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext(); ) {
- SysMenu t = (SysMenu) iterator.next();
+ for (SysMenu t : list) {
// 涓�銆佹牴鎹紶鍏ョ殑鏌愪釜鐖惰妭鐐笽D,閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
if (t.getParentId() == parentId) {
recursionFn(list, t);
@@ -389,9 +424,7 @@
*/
private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
List<SysMenu> tlist = new ArrayList<SysMenu>();
- Iterator<SysMenu> it = list.iterator();
- while (it.hasNext()) {
- SysMenu n = (SysMenu) it.next();
+ for (SysMenu n : list) {
if (n.getParentId().longValue() == t.getMenuId().longValue()) {
tlist.add(n);
}
@@ -403,6 +436,6 @@
* 鍒ゆ柇鏄惁鏈夊瓙鑺傜偣
*/
private boolean hasChild(List<SysMenu> list, SysMenu t) {
- return getChildList(list, t).size() > 0 ? true : false;
+ return getChildList(list, t).size() > 0;
}
}
--
Gitblit v1.9.3