From 409849db1a41f559edc582c6fbc0b8d0e7e55a6a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 十二月 2022 14:38:08 +0800
Subject: [PATCH] update springdoc 1.6.13 => 1.6.14 update snakeyaml 1.32 => 1.33 update springboot-admin 2.7.7 => 2.7.9
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 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 e4eafc5..042efc2 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,7 +1,7 @@
package com.ruoyi.system.service;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;
@@ -9,12 +9,12 @@
/**
* 鐢ㄦ埛 涓氬姟灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
-public interface ISysUserService extends IServicePlus<SysUser> {
+public interface ISysUserService {
- TableDataInfo<SysUser> selectPageUserList(SysUser user);
+ TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -22,7 +22,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
- public List<SysUser> selectUserList(SysUser user);
+ List<SysUser> selectUserList(SysUser user);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
@@ -30,7 +30,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
- public List<SysUser> selectAllocatedList(SysUser user);
+ TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
@@ -38,7 +38,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
- public List<SysUser> selectUnallocatedList(SysUser user);
+ TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery);
/**
* 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
@@ -46,7 +46,15 @@
* @param userName 鐢ㄦ埛鍚�
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
- public SysUser selectUserByUserName(String userName);
+ SysUser selectUserByUserName(String userName);
+
+ /**
+ * 閫氳繃鎵嬫満鍙锋煡璇㈢敤鎴�
+ *
+ * @param phonenumber 鎵嬫満鍙�
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ SysUser selectUserByPhonenumber(String phonenumber);
/**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
@@ -54,7 +62,7 @@
* @param userId 鐢ㄦ埛ID
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
- public SysUser selectUserById(Long userId);
+ SysUser selectUserById(Long userId);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
@@ -62,7 +70,7 @@
* @param userName 鐢ㄦ埛鍚�
* @return 缁撴灉
*/
- public String selectUserRoleGroup(String userName);
+ String selectUserRoleGroup(String userName);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍
@@ -70,15 +78,15 @@
* @param userName 鐢ㄦ埛鍚�
* @return 缁撴灉
*/
- public String selectUserPostGroup(String userName);
+ String selectUserPostGroup(String userName);
/**
* 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
*
- * @param userName 鐢ㄦ埛鍚嶇О
+ * @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public String checkUserNameUnique(String userName);
+ String checkUserNameUnique(SysUser user);
/**
* 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
@@ -86,7 +94,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public String checkPhoneUnique(SysUser user);
+ String checkPhoneUnique(SysUser user);
/**
* 鏍￠獙email鏄惁鍞竴
@@ -94,14 +102,21 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public String checkEmailUnique(SysUser user);
+ String checkEmailUnique(SysUser user);
/**
* 鏍￠獙鐢ㄦ埛鏄惁鍏佽鎿嶄綔
*
* @param user 鐢ㄦ埛淇℃伅
*/
- public void checkUserAllowed(SysUser user);
+ void checkUserAllowed(SysUser user);
+
+ /**
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param userId 鐢ㄦ埛id
+ */
+ void checkUserDataScope(Long userId);
/**
* 鏂板鐢ㄦ埛淇℃伅
@@ -109,7 +124,15 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int insertUser(SysUser user);
+ int insertUser(SysUser user);
+
+ /**
+ * 娉ㄥ唽鐢ㄦ埛淇℃伅
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 缁撴灉
+ */
+ boolean registerUser(SysUser user);
/**
* 淇敼鐢ㄦ埛淇℃伅
@@ -117,15 +140,15 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int updateUser(SysUser user);
+ int updateUser(SysUser user);
/**
* 鐢ㄦ埛鎺堟潈瑙掕壊
*
- * @param userId 鐢ㄦ埛ID
+ * @param userId 鐢ㄦ埛ID
* @param roleIds 瑙掕壊缁�
*/
- public void insertUserAuth(Long userId, Long[] roleIds);
+ void insertUserAuth(Long userId, Long[] roleIds);
/**
* 淇敼鐢ㄦ埛鐘舵��
@@ -133,7 +156,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int updateUserStatus(SysUser user);
+ int updateUserStatus(SysUser user);
/**
* 淇敼鐢ㄦ埛鍩烘湰淇℃伅
@@ -141,16 +164,16 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int updateUserProfile(SysUser user);
+ int updateUserProfile(SysUser user);
/**
* 淇敼鐢ㄦ埛澶村儚
*
* @param userName 鐢ㄦ埛鍚�
- * @param avatar 澶村儚鍦板潃
+ * @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
- public boolean updateUserAvatar(String userName, String avatar);
+ boolean updateUserAvatar(String userName, String avatar);
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
@@ -158,7 +181,7 @@
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
- public int resetPwd(SysUser user);
+ int resetPwd(SysUser user);
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
@@ -167,7 +190,7 @@
* @param password 瀵嗙爜
* @return 缁撴灉
*/
- public int resetUserPwd(String userName, String password);
+ int resetUserPwd(String userName, String password);
/**
* 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
@@ -175,7 +198,7 @@
* @param userId 鐢ㄦ埛ID
* @return 缁撴灉
*/
- public int deleteUserById(Long userId);
+ int deleteUserById(Long userId);
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
@@ -183,15 +206,6 @@
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
- public int deleteUserByIds(Long[] userIds);
+ int deleteUserByIds(Long[] userIds);
- /**
- * 瀵煎叆鐢ㄦ埛鏁版嵁
- *
- * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
- * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
- * @param operName 鎿嶄綔鐢ㄦ埛
- * @return 缁撴灉
- */
- public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
}
--
Gitblit v1.9.3