From c8c0f4c93862bf18f804dcdc017ea7affc09bc90 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 21 十一月 2024 14:38:02 +0800
Subject: [PATCH] 11.21

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |  543 +-----------------------------------------------------
 1 files changed, 10 insertions(+), 533 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 6807712..9da5057 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,543 +1,20 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
-import javax.validation.Validator;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.system.api.query.ChangeUserQuery;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.domain.SysUserPost;
-import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.query.GetSysUserList;
-import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserRoleService;
-import com.ruoyi.system.service.ISysUserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.account.mapper.SysUserMapper;
+import com.ruoyi.system.api.model.SysUser;
+import com.ruoyi.account.service.SysUserService;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.bean.BeanValidators;
-import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
 
 /**
- * 用户 业务层处理
+ * <p>
+ *  服务实现类
+ * </p>
  *
- * @author ruoyi
+ * @author luodangjia
+ * @since 2024-11-21
  */
 @Service
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-	private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-	
-	@Resource
-	private SysUserMapper userMapper;
-	
-	@Resource
-	private SysRoleMapper roleMapper;
-	
-	@Resource
-	private SysPostMapper postMapper;
-	
-	@Resource
-	private SysUserRoleMapper userRoleMapper;
-	
-	@Resource
-	private SysUserPostMapper userPostMapper;
-	
-	@Resource
-	private ISysConfigService configService;
-	
-	@Resource
-	protected Validator validator;
-	
-	@Resource
-	private ISysUserRoleService sysUserRoleService;
-	
-	@Resource
-	private ISysRoleService sysRoleService;
-	
-	@Resource
-	private TokenService tokenService;
-	
-	
-	/**
-	 * 根据条件分页查询用户列表
-	 *
-	 * @param user 用户信息
-	 * @return 用户信息集合信息
-	 */
-	@Override
-	@DataScope(deptAlias = "d", userAlias = "u")
-	public List<SysUser> selectUserList(SysUser user) {
-		return userMapper.selectUserList(user);
-	}
-	
-	/**
-	 * 根据条件分页查询已分配用户角色列表
-	 *
-	 * @param user 用户信息
-	 * @return 用户信息集合信息
-	 */
-	@Override
-	@DataScope(deptAlias = "d", userAlias = "u")
-	public List<SysUser> selectAllocatedList(SysUser user) {
-		return userMapper.selectAllocatedList(user);
-	}
-	
-	/**
-	 * 根据条件分页查询未分配用户角色列表
-	 *
-	 * @param user 用户信息
-	 * @return 用户信息集合信息
-	 */
-	@Override
-	@DataScope(deptAlias = "d", userAlias = "u")
-	public List<SysUser> selectUnallocatedList(SysUser user) {
-		return userMapper.selectUnallocatedList(user);
-	}
-	
-	/**
-	 * 通过用户名查询用户
-	 *
-	 * @param userName 用户名
-	 * @return 用户对象信息
-	 */
-	@Override
-	public SysUser selectUserByUserName(String userName) {
-		return userMapper.selectUserByUserName(userName);
-	}
-	
-	/**
-	 * 通过用户ID查询用户
-	 *
-	 * @param userId 用户ID
-	 * @return 用户对象信息
-	 */
-	@Override
-	public SysUser selectUserById(Long userId) {
-		return userMapper.selectUserById(userId);
-	}
-	
-	/**
-	 * 查询用户所属角色组
-	 *
-	 * @param userName 用户名
-	 * @return 结果
-	 */
-	@Override
-	public String selectUserRoleGroup(String userName) {
-		List<SysRole> list = roleMapper.selectRolesByUserName(userName);
-		if (CollectionUtils.isEmpty(list)) {
-			return StringUtils.EMPTY;
-		}
-		return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
-	}
-	
-	/**
-	 * 查询用户所属岗位组
-	 *
-	 * @param userName 用户名
-	 * @return 结果
-	 */
-	@Override
-	public String selectUserPostGroup(String userName) {
-		List<SysPost> list = postMapper.selectPostsByUserName(userName);
-		if (CollectionUtils.isEmpty(list)) {
-			return StringUtils.EMPTY;
-		}
-		return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
-	}
-	
-	/**
-	 * 校验用户名称是否唯一
-	 *
-	 * @param user 用户信息
-	 * @return 结果
-	 */
-	@Override
-	public boolean checkUserNameUnique(SysUser user) {
-		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;
-		}
-		return UserConstants.UNIQUE;
-	}
-	
-	/**
-	 * 校验手机号码是否唯一
-	 *
-	 * @param user 用户信息
-	 * @return
-	 */
-	@Override
-	public boolean checkPhoneUnique(SysUser user) {
-		Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-		SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-		if (StringUtils.isNotNull(info)) {
-			return UserConstants.NOT_UNIQUE;
-		}
-		return UserConstants.UNIQUE;
-	}
-	
-	
-	/**
-	 * 校验email是否唯一
-	 *
-	 * @param user 用户信息
-	 * @return
-	 */
-	@Override
-	public boolean checkEmailUnique(SysUser user) {
-		Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-		SysUser info = userMapper.checkEmailUnique(user.getEmail());
-		if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
-			return UserConstants.NOT_UNIQUE;
-		}
-		return UserConstants.UNIQUE;
-	}
-	
-	/**
-	 * 校验用户是否允许操作
-	 *
-	 * @param user 用户信息
-	 */
-	@Override
-	public void checkUserAllowed(SysUser user) {
-		Long userid = tokenService.getLoginUser().getUserid();
-		if (StringUtils.isNotNull(user.getUserId()) && !userid.equals(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("没有权限访问用户数据!");
-			}
-		}
-	}
-	
-	/**
-	 * 新增保存用户信息
-	 *
-	 * @param user 用户信息
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int insertUser(SysUser user) {
-		// 新增用户信息
-		int rows = userMapper.insertUser(user);
-//        // 新增用户岗位关联
-//        insertUserPost(user);
-//        // 新增用户与角色管理
-//        insertUserRole(user);
-		return rows;
-	}
-	
-	/**
-	 * 注册用户信息
-	 *
-	 * @param user 用户信息
-	 * @return 结果
-	 */
-	@Override
-	public boolean registerUser(SysUser user) {
-		return userMapper.insertUser(user) > 0;
-	}
-	
-	/**
-	 * 修改保存用户信息
-	 *
-	 * @param user 用户信息
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int updateUser(SysUser user) {
-//        Long userId = user.getUserId();
-//        // 删除用户与角色关联
-//        userRoleMapper.deleteUserRoleByUserId(userId);
-//        // 新增用户与角色管理
-//        insertUserRole(user);
-//        // 删除用户与岗位关联
-//        userPostMapper.deleteUserPostByUserId(userId);
-//        // 新增用户与岗位管理
-//        insertUserPost(user);
-		return userMapper.updateUser(user);
-	}
-	
-	/**
-	 * 用户授权角色
-	 *
-	 * @param userId  用户ID
-	 * @param roleIds 角色组
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void insertUserAuth(Long userId, Long[] roleIds) {
-		userRoleMapper.deleteUserRoleByUserId(userId);
-		insertUserRole(userId, roleIds);
-	}
-	
-	/**
-	 * 修改用户状态
-	 *
-	 * @param user 用户信息
-	 * @return 结果
-	 */
-	@Override
-	public int updateUserStatus(SysUser user) {
-		return userMapper.updateUser(user);
-	}
-	
-	/**
-	 * 修改用户基本信息
-	 *
-	 * @param user 用户信息
-	 * @return 结果
-	 */
-	@Override
-	public int updateUserProfile(SysUser user) {
-		return userMapper.updateUser(user);
-	}
-	
-	/**
-	 * 修改用户头像
-	 *
-	 * @param userName 用户名
-	 * @param avatar   头像地址
-	 * @return 结果
-	 */
-	@Override
-	public boolean updateUserAvatar(String userName, String avatar) {
-		return userMapper.updateUserAvatar(userName, avatar) > 0;
-	}
-	
-	/**
-	 * 重置用户密码
-	 *
-	 * @param user 用户信息
-	 * @return 结果
-	 */
-	@Override
-	public int resetPwd(SysUser user) {
-		return userMapper.updateUser(user);
-	}
-	
-	/**
-	 * 重置用户密码
-	 *
-	 * @param userName 用户名
-	 * @param password 密码
-	 * @return 结果
-	 */
-	@Override
-	public int resetUserPwd(String userName, String password) {
-		return userMapper.resetUserPwd(userName, password);
-	}
-	
-	/**
-	 * 新增用户角色信息
-	 *
-	 * @param user 用户对象
-	 */
-	public void insertUserRole(SysUser user) {
-		this.insertUserRole(user.getUserId(), user.getRoleIds());
-	}
-	
-	/**
-	 * 新增用户岗位信息
-	 *
-	 * @param user 用户对象
-	 */
-	public void insertUserPost(SysUser user) {
-		Long[] posts = user.getPostIds();
-		if (StringUtils.isNotEmpty(posts)) {
-			// 新增用户与岗位管理
-			List<SysUserPost> list = new ArrayList<SysUserPost>();
-			for (Long postId : posts) {
-				SysUserPost up = new SysUserPost();
-				up.setUserId(user.getUserId());
-				up.setPostId(postId);
-				list.add(up);
-			}
-			userPostMapper.batchUserPost(list);
-		}
-	}
-	
-	/**
-	 * 新增用户角色信息
-	 *
-	 * @param userId  用户ID
-	 * @param roleIds 角色组
-	 */
-	public void insertUserRole(Long userId, Long[] roleIds) {
-		if (StringUtils.isNotEmpty(roleIds)) {
-			// 新增用户与角色管理
-			List<SysUserRole> list = new ArrayList<SysUserRole>();
-			for (Long roleId : roleIds) {
-				SysUserRole ur = new SysUserRole();
-				ur.setUserId(userId);
-				ur.setRoleId(roleId);
-				list.add(ur);
-			}
-			userRoleMapper.batchUserRole(list);
-		}
-	}
-	
-	/**
-	 * 通过用户ID删除用户
-	 *
-	 * @param userId 用户ID
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int deleteUserById(Long userId) {
-		// 删除用户与角色关联
-		userRoleMapper.deleteUserRoleByUserId(userId);
-		// 删除用户与岗位表
-		userPostMapper.deleteUserPostByUserId(userId);
-		return userMapper.deleteUserById(userId);
-	}
-	
-	/**
-	 * 批量删除用户信息
-	 *
-	 * @param userIds 需要删除的用户ID
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int deleteUserByIds(Long[] userIds) {
-		for (Long userId : userIds) {
-			checkUserAllowed(new SysUser(userId));
-//            checkUserDataScope(userId);
-		}
-		// 删除用户与角色关联
-//        userRoleMapper.deleteUserRole(userIds);
-//        // 删除用户与岗位关联
-//        userPostMapper.deleteUserPost(userIds);
-		return userMapper.deleteUserByIds(userIds);
-	}
-	
-	/**
-	 * 导入用户数据
-	 *
-	 * @param userList        用户数据列表
-	 * @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据
-	 * @param operName        操作用户
-	 * @return 结果
-	 */
-	@Override
-	public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
-		if (StringUtils.isNull(userList) || userList.size() == 0) {
-			throw new ServiceException("导入用户数据不能为空!");
-		}
-		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 (StringUtils.isNull(u)) {
-					BeanValidators.validateWithException(validator, user);
-					user.setPassword(SecurityUtils.encryptPassword(password));
-					user.setCreateBy(operName);
-					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);
-					userMapper.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 ServiceException(failureMsg.toString());
-		} else {
-			successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:");
-		}
-		return successMsg.toString();
-	}
-	
-	@Override
-	public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList) {
-		List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
-		return pageInfo.setRecords(list);
-	}
-	
-	@Override
-	public PageInfo<SysUser> getAllList(PageInfo<SysUser> pageInfo, List<Integer> collect) {
-		return this.baseMapper.getAllList(pageInfo, collect);
-	}
-	
-	@Override
-	public List<Long> getSysUserFromPhone(String phoneNumber) {
-		return this.baseMapper.getSysUserFromPhone(phoneNumber);
-	}
-	
-	@Override
-	public void deleteSysUser(ArrayList<Integer> userIds) {
-		this.baseMapper.deleteSysUser(userIds);
-	}
-	
-	@Override
-	public PageInfo<SysUser> getChangeUserList(ChangeUserQuery query) {
-		PageInfo<SysUser> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
-		List<SysUser> list = this.baseMapper.getChangeUserList(pageInfo, query);
-		return pageInfo.setRecords(list);
-	}
-	
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
+
 }

--
Gitblit v1.7.1