blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d 
 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java


@@ -5,16 +5,18 @@


import com.baomidou.dynamic.datasource.annotation.DS;


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


import com.example.erp.controller.dto.UserDTO;


import com.example.erp.entity.userInfo.PermissionBasic;


import com.example.erp.entity.userInfo.Role;


import com.example.erp.entity.userInfo.SysError;


import com.example.erp.entity.userInfo.User;


import com.example.erp.mapper.userInfo.RoleMapper;


import com.example.erp.mapper.userInfo.UserMapper;


import com.example.erp.mapper.userInfo.*;


import com.example.erp.tools.TokenTools;


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


import org.springframework.cache.annotation.CacheEvict;


import org.springframework.cache.annotation.Cacheable;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import java.util.Collections;


import java.util.HashMap;


@@ -27,10 +29,15 @@




    private final UserMapper userMapper;


    private final RoleMapper roleMapper;


    private final UserRoleMapper userRoleMapper;




    public UserService(UserMapper userMapper, RoleMapper roleMapper) {


   private final PermissionRoleMapper permissionRoleMapper;




    public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {


        this.userMapper = userMapper;


        this.roleMapper = roleMapper;


        this.permissionRoleMapper = permissionRoleMapper;


        this.userRoleMapper = userRoleMapper;


    }






@@ -75,6 +82,32 @@


        return returnUser;


    }




    @Transactional


    public Boolean updatePassWord(Map<String,Object> object) {


        boolean saveState = false;


        int userId =0;


        String oldPassWord = "";


        String passWord = "";


        if (object.get("userId") != null) {


            userId = Integer.parseInt(object.get("userId").toString());


        }


        if (object.get("oldPassword") != null) {


            oldPassWord = object.get("oldPassword").toString();


        }


        if (object.get("password") != null) {


            passWord = object.get("password").toString();


        }




        User user =userMapper.findOnePassWord(userId,oldPassWord);


        if (user!=null){


            if (userMapper.updatePassWordById(userId,passWord)){


                saveState = true;


            }


        }


        return saveState;




    }




    /*----------------新版本登陆*/


    public UserDTO doLogin(UserDTO userDTO) {


        User user = userMapper.selectOne(new QueryWrapper<User>().


@@ -88,6 +121,8 @@


            userDTO.setId(user.getId());


            userDTO.setUserName(user.getUserName());


            userDTO.setToken(StpUtil.getTokenValue());


            Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());


            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));


            return userDTO;


        }else{


            return null;