From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 283 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 164 insertions(+), 119 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..a31b43a 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,39 +1,43 @@
package com.ruoyi.system.service.impl;
-import cn.hutool.core.lang.Validator;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.annotation.DataScope;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.service.UserService;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
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;
+import java.util.stream.Collectors;
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Slf4j
@Service
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
- private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-
- @Autowired
- private SysUserMapper userMapper;
+public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser, SysUser> implements ISysUserService, UserService {
@Autowired
private SysRoleMapper roleMapper;
@@ -47,8 +51,11 @@
@Autowired
private SysUserPostMapper userPostMapper;
- @Autowired
- private ISysConfigService configService;
+ @Override
+ public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
+ Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
+ }
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -57,9 +64,32 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUserList(SysUser user) {
- return userMapper.selectUserList(user);
+ return baseMapper.selectUserList(user);
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @Override
+ public TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery) {
+ Page<SysUser> page = baseMapper.selectAllocatedList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @Override
+ public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
+ Page<SysUser> page = baseMapper.selectUnallocatedList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
}
/**
@@ -70,7 +100,7 @@
*/
@Override
public SysUser selectUserByUserName(String userName) {
- return userMapper.selectUserByUserName(userName);
+ return baseMapper.selectUserByUserName(userName);
}
/**
@@ -81,7 +111,7 @@
*/
@Override
public SysUser selectUserById(Long userId) {
- return userMapper.selectUserById(userId);
+ return baseMapper.selectUserById(userId);
}
/**
@@ -93,14 +123,10 @@
@Override
public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
- for (SysRole role : list) {
- idsStr.append(role.getRoleName()).append(",");
+ if (CollUtil.isEmpty(list)) {
+ return StringUtils.EMPTY;
}
- if (Validator.isNotEmpty(idsStr.toString())) {
- return idsStr.substring(0, idsStr.length() - 1);
- }
- return idsStr.toString();
+ return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
}
/**
@@ -112,14 +138,10 @@
@Override
public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
- for (SysPost post : list) {
- idsStr.append(post.getPostName()).append(",");
+ if (CollUtil.isEmpty(list)) {
+ return StringUtils.EMPTY;
}
- if (Validator.isNotEmpty(idsStr.toString())) {
- return idsStr.substring(0, idsStr.length() - 1);
- }
- return idsStr.toString();
+ return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
}
/**
@@ -130,7 +152,7 @@
*/
@Override
public String checkUserNameUnique(String userName) {
- int count = userMapper.checkUserNameUnique(userName);
+ long count = count(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName));
if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
@@ -138,16 +160,18 @@
}
/**
- * 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
+ * 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
*
* @param user 鐢ㄦ埛淇℃伅
* @return
*/
@Override
public String checkPhoneUnique(SysUser user) {
- Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
- if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+ Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+ long count = count(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getPhonenumber, user.getPhonenumber())
+ .ne(SysUser::getUserId, userId));
+ if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -161,9 +185,11 @@
*/
@Override
public String checkEmailUnique(SysUser user) {
- Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkEmailUnique(user.getEmail());
- if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+ Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+ long count = count(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getEmail, user.getEmail())
+ .ne(SysUser::getUserId, userId));
+ if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -176,8 +202,25 @@
*/
@Override
public void checkUserAllowed(SysUser user) {
- if (Validator.isNotNull(user.getUserId()) && user.isAdmin()) {
- throw new CustomException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
+ if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
+ throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
+ }
+ }
+
+ /**
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param userId 鐢ㄦ埛id
+ */
+ @Override
+ public void checkUserDataScope(Long userId) {
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ SysUser user = new SysUser();
+ user.setUserId(userId);
+ List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
+ if (StringUtils.isEmpty(users)) {
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁锛�");
+ }
}
}
@@ -188,15 +231,26 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int insertUser(SysUser user) {
// 鏂板鐢ㄦ埛淇℃伅
- int rows = userMapper.insertUser(user);
+ int rows = baseMapper.insert(user);
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
insertUserRole(user);
return rows;
+ }
+
+ /**
+ * 娉ㄥ唽鐢ㄦ埛淇℃伅
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ public boolean registerUser(SysUser user) {
+ return baseMapper.insert(user) > 0;
}
/**
@@ -206,18 +260,32 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
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);
+ }
+
+ /**
+ * 鐢ㄦ埛鎺堟潈瑙掕壊
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @param roleIds 瑙掕壊缁�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void insertUserAuth(Long userId, Long[] roleIds) {
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
+ .eq(SysUserRole::getUserId, userId));
+ insertUserRole(userId, roleIds);
}
/**
@@ -228,7 +296,7 @@
*/
@Override
public int updateUserStatus(SysUser user) {
- return userMapper.updateUser(user);
+ return baseMapper.updateById(user);
}
/**
@@ -239,7 +307,7 @@
*/
@Override
public int updateUserProfile(SysUser user) {
- return userMapper.updateUser(user);
+ return baseMapper.updateById(user);
}
/**
@@ -251,7 +319,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 +333,7 @@
*/
@Override
public int resetPwd(SysUser user) {
- return userMapper.updateUser(user);
+ return baseMapper.updateById(user);
}
/**
@@ -274,7 +345,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));
}
/**
@@ -284,7 +358,7 @@
*/
public void insertUserRole(SysUser user) {
Long[] roles = user.getRoleIds();
- if (Validator.isNotNull(roles)) {
+ if (StringUtils.isNotNull(roles)) {
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysUserRole> list = new ArrayList<SysUserRole>();
for (Long roleId : roles) {
@@ -294,7 +368,7 @@
list.add(ur);
}
if (list.size() > 0) {
- userRoleMapper.batchUserRole(list);
+ userRoleMapper.insertAll(list);
}
}
}
@@ -306,7 +380,7 @@
*/
public void insertUserPost(SysUser user) {
Long[] posts = user.getPostIds();
- if (Validator.isNotNull(posts)) {
+ if (StringUtils.isNotNull(posts)) {
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
List<SysUserPost> list = new ArrayList<SysUserPost>();
for (Long postId : posts) {
@@ -316,7 +390,29 @@
list.add(up);
}
if (list.size() > 0) {
- userPostMapper.batchUserPost(list);
+ userPostMapper.insertAll(list);
+ }
+ }
+ }
+
+ /**
+ * 鏂板鐢ㄦ埛瑙掕壊淇℃伅
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @param roleIds 瑙掕壊缁�
+ */
+ public void insertUserRole(Long userId, Long[] roleIds) {
+ if (StringUtils.isNotNull(roleIds)) {
+ // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ List<SysUserRole> list = new ArrayList<SysUserRole>();
+ for (Long roleId : roleIds) {
+ SysUserRole ur = new SysUserRole();
+ ur.setUserId(userId);
+ ur.setRoleId(roleId);
+ list.add(ur);
+ }
+ if (list.size() > 0) {
+ userRoleMapper.insertAll(list);
}
}
}
@@ -328,13 +424,13 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
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);
}
/**
@@ -344,68 +440,17 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int deleteUserByIds(Long[] userIds) {
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);
}
- /**
- * 瀵煎叆鐢ㄦ埛鏁版嵁
- *
- * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
- * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
- * @param operName 鎿嶄綔鐢ㄦ埛
- * @return 缁撴灉
- */
- @Override
- public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
- if (Validator.isNull(userList) || userList.size() == 0) {
- throw new CustomException("瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�");
- }
- int successNum = 0;
- int failureNum = 0;
- StringBuilder successMsg = new StringBuilder();
- StringBuilder failureMsg = new StringBuilder();
- String password = configService.selectConfigByKey("sys.user.initPassword");
- for (SysUser user : userList) {
- try {
- // 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
- SysUser u = userMapper.selectUserByUserName(user.getUserName());
- if (Validator.isNull(u)) {
- user.setPassword(SecurityUtils.encryptPassword(password));
- user.setCreateBy(operName);
- this.insertUser(user);
- successNum++;
- successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
- } else if (isUpdateSupport) {
- user.setUpdateBy(operName);
- this.updateUser(user);
- successNum++;
- successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊鎴愬姛");
- } else {
- failureNum++;
- failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 宸插瓨鍦�");
- }
- } catch (Exception e) {
- failureNum++;
- String msg = "<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆澶辫触锛�";
- failureMsg.append(msg + e.getMessage());
- log.error(msg, e);
- }
- }
- if (failureNum > 0) {
- failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
- throw new CustomException(failureMsg.toString());
- } else {
- successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏� " + successNum + " 鏉★紝鏁版嵁濡備笅锛�");
- }
- return successMsg.toString();
- }
}
--
Gitblit v1.9.3