迁移pro

liyong

5 小时以前 1ca5584d7e3200a9af65a099bd26d3593e2ba702

 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -1,15 +1,6 @@
package com.ruoyi.project.system.service.impl;



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;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.util.CollectionUtils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.exception.ServiceException;

import com.ruoyi.common.utils.SecurityUtils;

@@ -17,18 +8,21 @@
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;

import com.ruoyi.project.system.domain.SysRole;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.domain.SysUserPost;

import com.ruoyi.project.system.domain.SysUserRole;

import com.ruoyi.project.system.mapper.SysPostMapper;

import com.ruoyi.project.system.mapper.SysRoleMapper;

import com.ruoyi.project.system.mapper.SysUserMapper;

import com.ruoyi.project.system.mapper.SysUserPostMapper;

import com.ruoyi.project.system.mapper.SysUserRoleMapper;

import com.ruoyi.project.system.domain.*;

import com.ruoyi.project.system.mapper.*;

import com.ruoyi.project.system.service.ISysConfigService;

import com.ruoyi.project.system.service.ISysUserService;

import jakarta.validation.Validator;

import lombok.RequiredArgsConstructor;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.util.CollectionUtils;



import java.util.ArrayList;

import java.util.List;

import java.util.stream.Collectors;



/**

 * 用户 业务层处理

@@ -36,30 +30,19 @@
 * @author ruoyi

 */

@Service

@RequiredArgsConstructor

public class SysUserServiceImpl implements ISysUserService

{

    private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);



    @Autowired

    private SysUserMapper userMapper;



    @Autowired

    private SysRoleMapper roleMapper;



    @Autowired

    private SysPostMapper postMapper;



    @Autowired

    private SysUserRoleMapper userRoleMapper;



    @Autowired

    private SysUserPostMapper userPostMapper;



    @Autowired

    private ISysConfigService configService;



    @Autowired

    protected Validator validator;

    private final SysUserDeptMapper sysUserDeptMapper;

    private final SysUserMapper userMapper;

    private final SysRoleMapper roleMapper;

    private final SysPostMapper postMapper;

    private final SysUserRoleMapper userRoleMapper;

    private final SysUserPostMapper userPostMapper;

    private final ISysConfigService configService;

    protected final Validator validator;



    /**

     * 根据条件分页查询用户列表

@@ -161,14 +144,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;

        }

@@ -182,7 +166,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());

@@ -200,7 +184,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());

@@ -261,6 +245,8 @@
        insertUserPost(user);

        // 新增用户与角色管理

        insertUserRole(user);

        // 新增部门关联

        bindUserDept(user);

        return rows;

    }



@@ -449,7 +435,7 @@


    /**

     * 批量删除用户信息

     * 
     *

     * @param userIds 需要删除的用户ID

     * @return 结果

     */

@@ -466,6 +452,9 @@
        userRoleMapper.deleteUserRole(userIds);

        // 删除用户与岗位关联

        userPostMapper.deleteUserPost(userIds);

        // 删除用户与部门数据

        sysUserDeptMapper.delete(new LambdaQueryWrapper<SysUserDept>()

                .in(SysUserDept::getUserId, userIds));

        return userMapper.deleteUserByIds(userIds);

    }



@@ -488,7 +477,6 @@
        int failureNum = 0;

        StringBuilder successMsg = new StringBuilder();

        StringBuilder failureMsg = new StringBuilder();

        String password = configService.selectConfigByKey("sys.user.initPassword");

        for (SysUser user : userList)

        {

            try

@@ -498,17 +486,21 @@
                if (StringUtils.isNull(u))

                {

                    BeanValidators.validateWithException(validator, user);

                    String password = configService.selectConfigByKey("sys.user.initPassword");

                    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() + " 更新成功");

                }

@@ -537,4 +529,35 @@
        }

        return successMsg.toString();

    }



    /**

     * 不分页用户查询

     * @param user

     * @return

     */

    @Override

    public List<SysUser> userListNoPage(SysUser user) {

        return userMapper.selectUserList(user);

    }



    /**

     * 绑定用户部门

     * @param user

     * @return

     */

    @Override

    public int bindUserDept(SysUser user) {

        // 删除所有关联绑定

        LambdaQueryWrapper<SysUserDept> delWrapper = new LambdaQueryWrapper<>();

        delWrapper.eq(SysUserDept::getUserId, user.getUserId());

        sysUserDeptMapper.delete(delWrapper);

        // 重新绑定

        for (int i = 0; i < user.getDeptIds().length; i++) {

            SysUserDept sysUserDept = new SysUserDept();

            sysUserDept.setDeptId(user.getDeptIds()[i]);

            sysUserDept.setUserId(user.getUserId());

            sysUserDeptMapper.insert(sysUserDept);

        }

        return user.getDeptIds().length;

    }

}