From 4d22f5928b7ca390538c7c741cca1401eb9ba284 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 二月 2023 19:03:09 +0800
Subject: [PATCH] update 更新 system 相关表接口 (sys_user) 新增 Bo Vo 类 更改请求及响应参数
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 78 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 94ddc4a..9c82ff6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -19,9 +20,14 @@
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.system.domain.*;
+import com.ruoyi.system.domain.SysDept;
+import com.ruoyi.system.domain.SysUser;
+import com.ruoyi.system.domain.SysUserPost;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.domain.bo.SysUserBo;
import com.ruoyi.system.domain.vo.SysPostVo;
import com.ruoyi.system.domain.vo.SysRoleVo;
+import com.ruoyi.system.domain.vo.SysUserVo;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
@@ -51,8 +57,8 @@
private final SysUserPostMapper userPostMapper;
@Override
- public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
- Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
+ public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
+ Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
return TableDataInfo.build(page);
}
@@ -63,11 +69,11 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- public List<SysUser> selectUserList(SysUser user) {
+ public List<SysUserVo> selectUserList(SysUserBo user) {
return baseMapper.selectUserList(this.buildQueryWrapper(user));
}
- private Wrapper<SysUser> buildQueryWrapper(SysUser user) {
+ private Wrapper<SysUser> buildQueryWrapper(SysUserBo user) {
Map<String, Object> params = user.getParams();
QueryWrapper<SysUser> wrapper = Wrappers.query();
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
@@ -95,14 +101,14 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- public TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery) {
+ public TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery) {
QueryWrapper<SysUser> wrapper = Wrappers.query();
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
.eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber());
- Page<SysUser> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
+ Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
return TableDataInfo.build(page);
}
@@ -113,7 +119,7 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
+ public TableDataInfo<SysUserVo> selectUnallocatedList(SysUserBo user, PageQuery pageQuery) {
List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
QueryWrapper<SysUser> wrapper = Wrappers.query();
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
@@ -121,7 +127,7 @@
.notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber());
- Page<SysUser> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
+ Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
return TableDataInfo.build(page);
}
@@ -132,7 +138,7 @@
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
- public SysUser selectUserByUserName(String userName) {
+ public SysUserVo selectUserByUserName(String userName) {
return baseMapper.selectUserByUserName(userName);
}
@@ -143,7 +149,7 @@
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
- public SysUser selectUserByPhonenumber(String phonenumber) {
+ public SysUserVo selectUserByPhonenumber(String phonenumber) {
return baseMapper.selectUserByPhonenumber(phonenumber);
}
@@ -154,7 +160,7 @@
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
- public SysUser selectUserById(Long userId) {
+ public SysUserVo selectUserById(Long userId) {
return baseMapper.selectUserById(userId);
}
@@ -195,7 +201,7 @@
* @return 缁撴灉
*/
@Override
- public String checkUserNameUnique(SysUser user) {
+ public String checkUserNameUnique(SysUserBo user) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getUserName, user.getUserName())
.ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
@@ -211,7 +217,7 @@
* @param user 鐢ㄦ埛淇℃伅
*/
@Override
- public String checkPhoneUnique(SysUser user) {
+ public String checkPhoneUnique(SysUserBo user) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getPhonenumber, user.getPhonenumber())
.ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
@@ -227,7 +233,7 @@
* @param user 鐢ㄦ埛淇℃伅
*/
@Override
- public String checkEmailUnique(SysUser user) {
+ public String checkEmailUnique(SysUserBo user) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getEmail, user.getEmail())
.ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
@@ -243,7 +249,7 @@
* @param user 鐢ㄦ埛淇℃伅
*/
@Override
- public void checkUserAllowed(SysUser user) {
+ public void checkUserAllowed(SysUserBo user) {
if (ObjectUtil.isNotNull(user.getUserId()) && user.isAdmin()) {
throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
}
@@ -257,9 +263,9 @@
@Override
public void checkUserDataScope(Long userId) {
if (!LoginHelper.isAdmin()) {
- SysUser user = new SysUser();
+ SysUserBo user = new SysUserBo();
user.setUserId(userId);
- List<SysUser> users = this.selectUserList(user);
+ List<SysUserVo> users = this.selectUserList(user);
if (CollUtil.isEmpty(users)) {
throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁锛�");
}
@@ -274,9 +280,10 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public int insertUser(SysUser user) {
+ public int insertUser(SysUserBo user) {
+ SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
// 鏂板鐢ㄦ埛淇℃伅
- int rows = baseMapper.insert(user);
+ int rows = baseMapper.insert(sysUser);
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -291,10 +298,11 @@
* @return 缁撴灉
*/
@Override
- public boolean registerUser(SysUser user) {
+ public boolean registerUser(SysUserBo user) {
user.setCreateBy(user.getUserId());
user.setUpdateBy(user.getUserId());
- return baseMapper.insert(user) > 0;
+ SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+ return baseMapper.insert(sysUser) > 0;
}
/**
@@ -305,7 +313,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public int updateUser(SysUser user) {
+ public int updateUser(SysUserBo user) {
Long userId = user.getUserId();
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
@@ -315,7 +323,8 @@
userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
insertUserPost(user);
- return baseMapper.updateById(user);
+ SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+ return baseMapper.updateById(sysUser);
}
/**
@@ -339,8 +348,9 @@
* @return 缁撴灉
*/
@Override
- public int updateUserStatus(SysUser user) {
- return baseMapper.updateById(user);
+ public int updateUserStatus(SysUserBo user) {
+ SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+ return baseMapper.updateById(sysUser);
}
/**
@@ -350,8 +360,9 @@
* @return 缁撴灉
*/
@Override
- public int updateUserProfile(SysUser user) {
- return baseMapper.updateById(user);
+ public int updateUserProfile(SysUserBo user) {
+ SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+ return baseMapper.updateById(sysUser);
}
/**
@@ -376,8 +387,9 @@
* @return 缁撴灉
*/
@Override
- public int resetPwd(SysUser user) {
- return baseMapper.updateById(user);
+ public int resetPwd(SysUserBo user) {
+ SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class);
+ return baseMapper.updateById(sysUser);
}
/**
@@ -400,7 +412,7 @@
*
* @param user 鐢ㄦ埛瀵硅薄
*/
- public void insertUserRole(SysUser user) {
+ public void insertUserRole(SysUserBo user) {
this.insertUserRole(user.getUserId(), user.getRoleIds());
}
@@ -409,7 +421,7 @@
*
* @param user 鐢ㄦ埛瀵硅薄
*/
- public void insertUserPost(SysUser user) {
+ public void insertUserPost(SysUserBo user) {
Long[] posts = user.getPostIds();
if (ArrayUtil.isNotEmpty(posts)) {
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
@@ -468,7 +480,7 @@
@Transactional(rollbackFor = Exception.class)
public int deleteUserByIds(Long[] userIds) {
for (Long userId : userIds) {
- checkUserAllowed(new SysUser(userId));
+ checkUserAllowed(new SysUserBo(userId));
checkUserDataScope(userId);
}
List<Long> ids = List.of(userIds);
--
Gitblit v1.9.3