From c82afc8c461956e45be0aa29ca2a7fe3f18ee6f7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期二, 28 十二月 2021 11:23:33 +0800 Subject: [PATCH] update RedisUtils 迁移到 utils/redis 包下 --- ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index d6e8d9d..508f3c4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,8 +1,10 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.service.UserService; import java.util.List; @@ -11,10 +13,10 @@ * * @author Lion Li */ -public interface ISysUserService extends IService<SysUser> { +public interface ISysUserService extends IService<SysUser>, UserService { - TableDataInfo<SysUser> selectPageUserList(SysUser user); + TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery); /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃 @@ -30,7 +32,7 @@ * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ - TableDataInfo<SysUser> selectAllocatedList(SysUser user); + TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery); /** * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛� @@ -38,7 +40,7 @@ * @param user 鐢ㄦ埛淇℃伅 * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅 */ - TableDataInfo<SysUser> selectUnallocatedList(SysUser user); + TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery); /** * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴� @@ -46,6 +48,7 @@ * @param userName 鐢ㄦ埛鍚� * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ + @Override SysUser selectUserByUserName(String userName); /** @@ -54,6 +57,7 @@ * @param userId 鐢ㄦ埛ID * @return 鐢ㄦ埛瀵硅薄淇℃伅 */ + @Override SysUser selectUserById(Long userId); /** @@ -200,13 +204,4 @@ */ int deleteUserByIds(Long[] userIds); - /** - * 瀵煎叆鐢ㄦ埛鏁版嵁 - * - * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃 - * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁 - * @param operName 鎿嶄綔鐢ㄦ埛 - * @return 缁撴灉 - */ - String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName); } -- Gitblit v1.9.3