From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 20 十月 2021 13:07:16 +0800 Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像 --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 93 +++++++++------------------------------------- 1 files changed, 19 insertions(+), 74 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index 16d5594..164a697 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -1,107 +1,52 @@ package com.ruoyi.system.mapper; -import java.util.List; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 瑙掕壊琛� 鏁版嵁灞� - * - * @author ruoyi + * + * @author Lion Li */ -public interface SysRoleMapper -{ +public interface SysRoleMapper extends BaseMapperPlus<SysRole> { + + Page<SysRole> selectPageRoleList(@Param("page") Page<SysRole> page, @Param("role") SysRole role); + /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁 - * + * * @param role 瑙掕壊淇℃伅 * @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅 */ - public List<SysRole> selectRoleList(SysRole role); + List<SysRole> selectRoleList(SysRole role); /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊 - * + * * @param userId 鐢ㄦ埛ID * @return 瑙掕壊鍒楄〃 */ - public List<SysRole> selectRolePermissionByUserId(Long userId); + List<SysRole> selectRolePermissionByUserId(Long userId); - /** - * 鏌ヨ鎵�鏈夎鑹� - * - * @return 瑙掕壊鍒楄〃 - */ - public List<SysRole> selectRoleAll(); /** * 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛� - * + * * @param userId 鐢ㄦ埛ID * @return 閫変腑瑙掕壊ID鍒楄〃 */ - public List<Integer> selectRoleListByUserId(Long userId); - - /** - * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊 - * - * @param roleId 瑙掕壊ID - * @return 瑙掕壊瀵硅薄淇℃伅 - */ - public SysRole selectRoleById(Long roleId); + List<Integer> selectRoleListByUserId(Long userId); /** * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊 - * + * * @param userName 鐢ㄦ埛鍚� * @return 瑙掕壊鍒楄〃 */ - public List<SysRole> selectRolesByUserName(String userName); + List<SysRole> selectRolesByUserName(String userName); - /** - * 鏍¢獙瑙掕壊鍚嶇О鏄惁鍞竴 - * - * @param roleName 瑙掕壊鍚嶇О - * @return 瑙掕壊淇℃伅 - */ - public SysRole checkRoleNameUnique(String roleName); - - /** - * 鏍¢獙瑙掕壊鏉冮檺鏄惁鍞竴 - * - * @param roleKey 瑙掕壊鏉冮檺 - * @return 瑙掕壊淇℃伅 - */ - public SysRole checkRoleKeyUnique(String roleKey); - - /** - * 淇敼瑙掕壊淇℃伅 - * - * @param role 瑙掕壊淇℃伅 - * @return 缁撴灉 - */ - public int updateRole(SysRole role); - - /** - * 鏂板瑙掕壊淇℃伅 - * - * @param role 瑙掕壊淇℃伅 - * @return 缁撴灉 - */ - public int insertRole(SysRole role); - - /** - * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊 - * - * @param roleId 瑙掕壊ID - * @return 缁撴灉 - */ - public int deleteRoleById(Long roleId); - - /** - * 鎵归噺鍒犻櫎瑙掕壊淇℃伅 - * - * @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID - * @return 缁撴灉 - */ - public int deleteRoleByIds(Long[] roleIds); } -- Gitblit v1.9.3