From a8c1d02ee14a3aa01dc02f496a9e4a61b6abdf99 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 17 六月 2021 18:15:34 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 86 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 73908c7..dd12f10 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,12 +1,16 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
@@ -14,13 +18,13 @@
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -28,12 +32,9 @@
*
* @author ruoyi
*/
+@Slf4j
@Service
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
- private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-
- @Autowired
- private SysUserMapper userMapper;
@Autowired
private SysRoleMapper roleMapper;
@@ -50,6 +51,12 @@
@Autowired
private ISysConfigService configService;
+ @Override
+ @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
+ public TableDataInfo<SysUser> selectPageUserList(SysUser user) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageUserList(PageUtils.buildPage(), user));
+ }
+
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
*
@@ -57,9 +64,9 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
public List<SysUser> selectUserList(SysUser user) {
- return userMapper.selectUserList(user);
+ return baseMapper.selectUserList(user);
}
/**
@@ -70,7 +77,7 @@
*/
@Override
public SysUser selectUserByUserName(String userName) {
- return userMapper.selectUserByUserName(userName);
+ return baseMapper.selectUserByUserName(userName);
}
/**
@@ -81,7 +88,7 @@
*/
@Override
public SysUser selectUserById(Long userId) {
- return userMapper.selectUserById(userId);
+ return baseMapper.selectUserById(userId);
}
/**
@@ -93,7 +100,7 @@
@Override
public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
+ StringBuilder idsStr = new StringBuilder();
for (SysRole role : list) {
idsStr.append(role.getRoleName()).append(",");
}
@@ -112,7 +119,7 @@
@Override
public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
+ StringBuilder idsStr = new StringBuilder();
for (SysPost post : list) {
idsStr.append(post.getPostName()).append(",");
}
@@ -130,7 +137,7 @@
*/
@Override
public String checkUserNameUnique(String userName) {
- int count = userMapper.checkUserNameUnique(userName);
+ int count = count(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName).last("limit 1"));
if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
@@ -146,7 +153,9 @@
@Override
public String checkPhoneUnique(SysUser user) {
Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+ SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getUserId, SysUser::getPhonenumber)
+ .eq(SysUser::getPhonenumber, user.getPhonenumber()).last("limit 1"));
if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -162,7 +171,9 @@
@Override
public String checkEmailUnique(SysUser user) {
Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkEmailUnique(user.getEmail());
+ SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getUserId, SysUser::getEmail)
+ .eq(SysUser::getEmail, user.getEmail()).last("limit 1"));
if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -191,7 +202,7 @@
@Transactional
public int insertUser(SysUser user) {
// 鏂板鐢ㄦ埛淇℃伅
- int rows = userMapper.insertUser(user);
+ int rows = baseMapper.insert(user);
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -210,14 +221,14 @@
public int updateUser(SysUser user) {
Long userId = user.getUserId();
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRoleByUserId(userId);
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
insertUserRole(user);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
- userPostMapper.deleteUserPostByUserId(userId);
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
insertUserPost(user);
- return userMapper.updateUser(user);
+ return baseMapper.updateById(user);
}
/**
@@ -228,7 +239,7 @@
*/
@Override
public int updateUserStatus(SysUser user) {
- return userMapper.updateUser(user);
+ return baseMapper.updateById(user);
}
/**
@@ -239,7 +250,7 @@
*/
@Override
public int updateUserProfile(SysUser user) {
- return userMapper.updateUser(user);
+ return baseMapper.updateById(user);
}
/**
@@ -251,7 +262,10 @@
*/
@Override
public boolean updateUserAvatar(String userName, String avatar) {
- return userMapper.updateUserAvatar(userName, avatar) > 0;
+ return baseMapper.update(null,
+ new LambdaUpdateWrapper<SysUser>()
+ .set(SysUser::getAvatar,avatar)
+ .eq(SysUser::getUserName,userName)) > 0;
}
/**
@@ -262,7 +276,7 @@
*/
@Override
public int resetPwd(SysUser user) {
- return userMapper.updateUser(user);
+ return baseMapper.updateById(user);
}
/**
@@ -274,7 +288,10 @@
*/
@Override
public int resetUserPwd(String userName, String password) {
- return userMapper.resetUserPwd(userName, password);
+ return baseMapper.update(null,
+ new LambdaUpdateWrapper<SysUser>()
+ .set(SysUser::getPassword,password)
+ .eq(SysUser::getUserName,userName));
}
/**
@@ -294,7 +311,7 @@
list.add(ur);
}
if (list.size() > 0) {
- userRoleMapper.batchUserRole(list);
+ userRoleMapper.batchUserRole(list);
}
}
}
@@ -316,7 +333,7 @@
list.add(up);
}
if (list.size() > 0) {
- userPostMapper.batchUserPost(list);
+ userPostMapper.batchUserPost(list);
}
}
}
@@ -331,10 +348,10 @@
@Transactional
public int deleteUserById(Long userId) {
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRoleByUserId(userId);
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
- userPostMapper.deleteUserPostByUserId(userId);
- return userMapper.deleteUserById(userId);
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
+ return baseMapper.deleteById(userId);
}
/**
@@ -349,11 +366,12 @@
for (Long userId : userIds) {
checkUserAllowed(new SysUser(userId));
}
+ List<Long> ids = Arrays.asList(userIds);
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRole(userIds);
- // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
- userPostMapper.deleteUserPost(userIds);
- return userMapper.deleteUserByIds(userIds);
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId,ids));
+ // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId,ids));
+ return baseMapper.deleteBatchIds(ids);
}
/**
@@ -377,7 +395,7 @@
for (SysUser user : userList) {
try {
// 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
- SysUser u = userMapper.selectUserByUserName(user.getUserName());
+ SysUser u = baseMapper.selectUserByUserName(user.getUserName());
if (Validator.isNull(u)) {
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
--
Gitblit v1.9.3