blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wangfei
2024-11-08 3c4b340b58d0d0bdbc3db74b5721586dd964f86c 
 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java


@@ -1,6 +1,5 @@


package com.mes.userinfo.service.impl;




import cn.hutool.core.collection.CollectionUtil;


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


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


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


@@ -19,12 +18,12 @@


import com.mes.userinfo.entity.SysUserRole;


import com.mes.userinfo.entity.vo.SysUserVO;


import com.mes.userinfo.mapper.SysUserMapper;


import com.mes.userinfo.mapper.SysUserRoleMapper;


import com.mes.userinfo.service.SysUserRoleService;


import com.mes.userinfo.service.SysUserService;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.security.authentication.AuthenticationManager;


import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;


import org.springframework.security.core.Authentication;


@@ -71,13 +70,11 @@




    @Resource


    BCryptPasswordEncoder passwordEncoder;




    @Value("${test.common}")


    private String value;


    @Resource


    private SysUserRoleMapper sysUserRoleMapper;




    @Override


    public Map<String, String> login(SysUser user) {


        log.info(value);


        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(user.getUserName(), user.getPassword());


        Authentication authenticate = authenticationManager.authenticate(authenticationToken);


        if (Objects.isNull(authenticate)) {


@@ -129,10 +126,12 @@


        this.updateById(sysUser);


        log.info("删除用户角色信息");


        List<Long> roleIds = user.getRoleList().stream().map(SysRole::getId).collect(Collectors.toList());


        sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()


                .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds));


        log.info("保存用户角色信息");


        saveUserRole(user.getRoleList(), sysUser.getId());


//        sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()


//                .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds));


        SysUserRole sysUserRole = new SysUserRole(sysUser.getId(),roleIds.get(0));


        sysUserRoleMapper.updateById(sysUserRole);


//        log.info("保存用户角色信息");


//        saveUserRole(user.getRoleList(), sysUser.getId());


        return user;


    }