From 0655215f2553118232f61aa163097ac3666c7fce Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 27 九月 2023 15:22:36 +0800
Subject: [PATCH] 操作日志列表新增IP地址查询
---
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 64 +++++++++++++------------------
1 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 9a93f52..a7bf99b 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
+import javax.validation.Validator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +14,7 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
import com.ruoyi.project.system.domain.SysPost;
@@ -55,6 +57,9 @@
@Autowired
private ISysConfigService configService;
+
+ @Autowired
+ protected Validator validator;
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -156,14 +161,15 @@
/**
* 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
*
- * @param userName 鐢ㄦ埛鍚嶇О
+ * @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public String checkUserNameUnique(String userName)
+ public boolean checkUserNameUnique(SysUser user)
{
- int count = userMapper.checkUserNameUnique(userName);
- if (count > 0)
+ Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+ SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
@@ -177,7 +183,7 @@
* @return
*/
@Override
- public String checkPhoneUnique(SysUser user)
+ public boolean checkPhoneUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
@@ -195,7 +201,7 @@
* @return
*/
@Override
- public String checkEmailUnique(SysUser user)
+ public boolean checkEmailUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
@@ -376,23 +382,7 @@
*/
public void insertUserRole(SysUser user)
{
- Long[] roles = user.getRoleIds();
- if (StringUtils.isNotNull(roles))
- {
- // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
- List<SysUserRole> list = new ArrayList<SysUserRole>();
- for (Long roleId : roles)
- {
- SysUserRole ur = new SysUserRole();
- ur.setUserId(user.getUserId());
- ur.setRoleId(roleId);
- list.add(ur);
- }
- if (list.size() > 0)
- {
- userRoleMapper.batchUserRole(list);
- }
- }
+ this.insertUserRole(user.getUserId(), user.getRoleIds());
}
/**
@@ -403,10 +393,10 @@
public void insertUserPost(SysUser user)
{
Long[] posts = user.getPostIds();
- if (StringUtils.isNotNull(posts))
+ if (StringUtils.isNotEmpty(posts))
{
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
- List<SysUserPost> list = new ArrayList<SysUserPost>();
+ List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
for (Long postId : posts)
{
SysUserPost up = new SysUserPost();
@@ -414,10 +404,7 @@
up.setPostId(postId);
list.add(up);
}
- if (list.size() > 0)
- {
- userPostMapper.batchUserPost(list);
- }
+ userPostMapper.batchUserPost(list);
}
}
@@ -429,10 +416,10 @@
*/
public void insertUserRole(Long userId, Long[] roleIds)
{
- if (StringUtils.isNotNull(roleIds))
+ if (StringUtils.isNotEmpty(roleIds))
{
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
- List<SysUserRole> list = new ArrayList<SysUserRole>();
+ List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
for (Long roleId : roleIds)
{
SysUserRole ur = new SysUserRole();
@@ -440,10 +427,7 @@
ur.setRoleId(roleId);
list.add(ur);
}
- if (list.size() > 0)
- {
- userRoleMapper.batchUserRole(list);
- }
+ userRoleMapper.batchUserRole(list);
}
}
@@ -477,6 +461,7 @@
for (Long userId : userIds)
{
checkUserAllowed(new SysUser(userId));
+ checkUserDataScope(userId);
}
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.deleteUserRole(userIds);
@@ -513,16 +498,21 @@
SysUser u = userMapper.selectUserByUserName(user.getUserName());
if (StringUtils.isNull(u))
{
+ BeanValidators.validateWithException(validator, user);
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
- this.insertUser(user);
+ userMapper.insertUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
}
else if (isUpdateSupport)
{
+ BeanValidators.validateWithException(validator, user);
+ checkUserAllowed(u);
+ checkUserDataScope(u.getUserId());
+ user.setUserId(u.getUserId());
user.setUpdateBy(operName);
- this.updateUser(user);
+ userMapper.updateUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊鎴愬姛");
}
--
Gitblit v1.9.3