From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 16:30:20 +0800
Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 118 +++++++++++++++++++++--------------------------------------
1 files changed, 42 insertions(+), 76 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
index e99e067..0043903 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -1,116 +1,82 @@
package com.ruoyi.system.mapper;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 鑿滃崟琛� 鏁版嵁灞�
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
-public interface SysMenuMapper
-{
- /**
- * 鏌ヨ绯荤粺鑿滃崟鍒楄〃
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 鑿滃崟鍒楄〃
- */
- public List<SysMenu> selectMenuList(SysMenu menu);
+public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, SysMenu> {
/**
* 鏍规嵁鐢ㄦ埛鎵�鏈夋潈闄�
- *
+ *
* @return 鏉冮檺鍒楄〃
*/
- public List<String> selectMenuPerms();
+ List<String> selectMenuPerms();
/**
* 鏍规嵁鐢ㄦ埛鏌ヨ绯荤粺鑿滃崟鍒楄〃
- *
- * @param menu 鑿滃崟淇℃伅
+ *
+ * @param queryWrapper 鏌ヨ鏉′欢
* @return 鑿滃崟鍒楄〃
*/
- public List<SysMenu> selectMenuListByUserId(SysMenu menu);
+ List<SysMenu> selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper<SysMenu> queryWrapper);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 鏉冮檺鍒楄〃
*/
- public List<String> selectMenuPermsByUserId(Long userId);
+ List<String> selectMenuPermsByUserId(Long userId);
+
+ /**
+ * 鏍规嵁瑙掕壊ID鏌ヨ鏉冮檺
+ *
+ * @param roleId 瑙掕壊ID
+ * @return 鏉冮檺鍒楄〃
+ */
+ List<String> selectMenuPermsByRoleId(Long roleId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
- *
+ *
* @return 鑿滃崟鍒楄〃
*/
- public List<SysMenu> selectMenuTreeAll();
+ default List<SysMenu> selectMenuTreeAll() {
+ LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<SysMenu>()
+ .in(SysMenu::getMenuType, UserConstants.TYPE_DIR, UserConstants.TYPE_MENU)
+ .eq(SysMenu::getStatus, UserConstants.MENU_NORMAL)
+ .orderByAsc(SysMenu::getParentId)
+ .orderByAsc(SysMenu::getOrderNum);
+ return this.selectList(lqw);
+ }
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
- *
- * @param username 鐢ㄦ埛ID
+ *
+ * @param userId 鐢ㄦ埛ID
* @return 鑿滃崟鍒楄〃
*/
- public List<SysMenu> selectMenuTreeByUserId(Long userId);
+ List<SysMenu> selectMenuTreeByUserId(Long userId);
/**
* 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戜俊鎭�
- *
- * @param roleId 瑙掕壊ID
+ *
+ * @param roleId 瑙掕壊ID
+ * @param menuCheckStrictly 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�
* @return 閫変腑鑿滃崟鍒楄〃
*/
- public List<Integer> selectMenuListByRoleId(Long roleId);
+ List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
- /**
- * 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅
- *
- * @param menuId 鑿滃崟ID
- * @return 鑿滃崟淇℃伅
- */
- public SysMenu selectMenuById(Long menuId);
-
- /**
- * 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐�
- *
- * @param menuId 鑿滃崟ID
- * @return 缁撴灉
- */
- public int hasChildByMenuId(Long menuId);
-
- /**
- * 鏂板鑿滃崟淇℃伅
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 缁撴灉
- */
- public int insertMenu(SysMenu menu);
-
- /**
- * 淇敼鑿滃崟淇℃伅
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 缁撴灉
- */
- public int updateMenu(SysMenu menu);
-
- /**
- * 鍒犻櫎鑿滃崟绠＄悊淇℃伅
- *
- * @param menuId 鑿滃崟ID
- * @return 缁撴灉
- */
- public int deleteMenuById(Long menuId);
-
- /**
- * 鏍￠獙鑿滃崟鍚嶇О鏄惁鍞竴
- *
- * @param menuName 鑿滃崟鍚嶇О
- * @param parentId 鐖惰彍鍗旾D
- * @return 缁撴灉
- */
- public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
}
--
Gitblit v1.9.3