优化

zhanghua

2023-09-08 7ef4892f9f24f941aca37e6b3991b808a0aca619

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

@@ -1,9 +1,14 @@
package com.ycl.service.user.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.PageUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.druid.sql.PagerUtils;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.AdminUserDetails;
@@ -45,9 +50,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.time.LocalDateTime;
import java.util.*;
import java.util.function.Consumer;
import java.util.stream.Collectors;

@@ -85,8 +89,9 @@

    @Override
    public UmsAdmin getAdminByUsername(String username) {
        UmsAdmin admin = getCacheService().getAdmin(username);
        if (admin != null) return admin;
        // UmsAdmin admin = getCacheService().getAdmin(username);
        // if (admin != null) return admin;
        UmsAdmin admin = null;
        QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(UmsAdmin::getUsername, username);
        List<UmsAdmin> adminList = list(wrapper);
@@ -109,6 +114,9 @@
        //查询是否有相同用户名的用户
        QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(UmsAdmin::getUsername, umsAdmin.getUsername());
        if (umsAdmin.getId() != null) {
            wrapper.lambda().ne(UmsAdmin::getId, umsAdmin.getId());
        }
        List<UmsAdmin> umsAdminList = list(wrapper);
        if (umsAdminList.size() > 0) {
            return null;
@@ -116,15 +124,35 @@
        //将密码进行加密操作
        String encodePassword = passwordEncoder.encode(umsAdmin.getPassword());

        if ( !umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
        if (umsAdmin.getId() == null && !umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
            Asserts.fail("密码长度8到16位且密码中的字符必须包含字母（大写或者小写）和必须包含数字，不能包含空格");
        }
        if(umsAdmin.getUsername().equals(umsAdmin.getPassword())){
           Asserts.fail("密码不能和登录名完全一致");
        if (umsAdmin.getUsername().equals(umsAdmin.getPassword())) {
            Asserts.fail("密码不能和登录名完全一致");
        }
        umsAdmin.setPassword(encodePassword);
        baseMapper.insert(umsAdmin);
        if (umsAdminParam.getDays() != null) {
            Date date = new Date();
            Calendar calendar = new GregorianCalendar();
            calendar.setTime(date);
            // 把日期往后增加一天,整数  往后推,负数往前移动
            calendar.add(Calendar.DATE, umsAdminParam.getDays());
            // 这个时间就是日期往后推一天的结果
            date = calendar.getTime();
            umsAdmin.setExpirationDate(date);
        } else {
            umsAdmin.setExpirationDate(new Date(2090,1,1));
        }
        if (umsAdmin.getId() != null) {
            baseMapper.updateById(umsAdmin);
        } else {
            baseMapper.insert(umsAdmin);
        }

        LambdaQueryWrapper<UmsAdminRoleRelation> deleteWrapper = new QueryWrapper<UmsAdminRoleRelation>().lambda()
                .eq(UmsAdminRoleRelation::getAdminId, umsAdmin.getId());

        umsAdminRoleRelationService.remove(deleteWrapper);
        //添加角色授权
        List<Long> ids = umsAdminParam.getRoleIds();
        if (!ids.isEmpty()) {
@@ -138,6 +166,8 @@
            umsAdminRoleRelationService.saveBatch(roleIds);
        }

        umsDepartManageMapper.deletedByDepartId(umsAdmin.getId());

        //添加部门
        UmsDepartManage departManage = new UmsDepartManage();
        departManage.setUserId(umsAdmin.getId());
@@ -146,7 +176,7 @@
        departManage.setUpdateTime(new Date());
        umsDepartManageMapper.insert(departManage);

        baseMapper.updateById(umsAdmin);
        // baseMapper.updateById(umsAdmin);
        return umsAdmin;
    }

@@ -167,10 +197,10 @@
        //将密码进行加密操作
        String encodePassword = passwordEncoder.encode(umsAdmin.getPassword());

        if ( !umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
        if (!umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
            Asserts.fail("密码长度8到16位且密码中的字符必须包含字母（大写或者小写）和必须包含数字，不能包含空格");
        }
        if(umsAdmin.getUsername().equals(umsAdmin.getPassword())){
        if (umsAdmin.getUsername().equals(umsAdmin.getPassword())) {
            Asserts.fail("密码不能和登录名完全一致");
        }
        umsAdmin.setPassword(encodePassword);
@@ -230,12 +260,51 @@
        //密码需要客户端加密后传递
        try {
            AdminUserDetails userDetails = (AdminUserDetails) loadUserByUsername(username);

            UmsAdmin admin = userDetails.getUmsAdmin();
            LocalDateTime nowTime = LocalDateTime.now();
            nowTime = nowTime.plusMinutes(-15);
            if (admin.getPasswordErrorNum() != null && admin.getPasswordErrorNum() >= 5
                    && admin.getPasswordErrorLastTime().isAfter(nowTime)) {
                admin.setPasswordErrorLastTime(LocalDateTime.now());
                updateById(admin);
                Asserts.fail("登录失败超过5次，此账号被锁定，请15分钟后再试。");
            }
            if (!passwordEncoder.matches(password, userDetails.getPassword())) {
                if (admin.getPasswordErrorNum() == null) {
                    admin.setPasswordErrorNum(1);
                } else {
                    admin.setPasswordErrorNum(admin.getPasswordErrorNum() + 1);
                }
                admin.setPasswordErrorLastTime(LocalDateTime.now());
                updateById(admin);
                Asserts.fail("密码不正确");
            }
            if (!userDetails.isEnabled()) {
                Asserts.fail("帐号已被禁用");
            }
            admin.setPasswordErrorNum(0);
            updateById(admin);

            UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
            SecurityContextHolder.getContext().setAuthentication(authentication);
            //根据用户id，用户姓名
            token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername());
            redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time);
//            updateLoginTimeByUsername(username);
            //insertLoginLog(username);
        } catch (AuthenticationException e) {
            LOGGER.warn("登录异常:{}", e.getMessage());
        }
        return token;
    }
	
    @Override
    public String getOAuthToken(String username) {
        String token = null;
        //密码需要客户端加密后传递
        try {
            AdminUserDetails userDetails = (AdminUserDetails) loadUserByUsername(username);
            UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
            SecurityContextHolder.getContext().setAuthentication(authentication);
            //根据用户id，用户姓名
@@ -369,7 +438,7 @@
                && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
            return -1;
        }
        if(param.getUsername().equals(param.getNewPassword())){
        if (param.getUsername().equals(param.getNewPassword())) {
            return -4;
        }
        QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
@@ -393,10 +462,15 @@
        //获取用户信息
        UmsAdmin admin = getAdminByUsername(username);
        if (admin != null) {
            if (admin.getExpirationDate() != null) {
                if (!admin.getExpirationDate().after(new Date())) {
                    Asserts.fail("账号已过期请联系管理员");
                }
            }
            List<UmsMenu> resourceList = getResourceList(admin.getId());
            return new AdminUserDetails(admin, resourceList);
        }
        throw new UsernameNotFoundException("用户名或密码错误");
        throw new UsernameNotFoundException("用户不存在");
    }

    @Override
@@ -432,9 +506,13 @@
        if (pageUserVO.getJobTitle() != null && !("".equals(pageUserVO.getJobTitle()))) {
            umsAdmin.setJobTitle(pageUserVO.getJobTitle());
        }
        Page<UmsAdmin> page1 = baseMapper.selectCondPage(page, umsAdmin);

        return page1;
        PageUtil.setFirstPageNo(1);
        int offset = PageUtil.getStart(current, pageSize);
        List<UmsAdmin> list = baseMapper.selectCondList(umsAdmin, offset, pageSize);
        Long total = baseMapper.selectCondTotal(umsAdmin);
        page.setRecords(list);
        page.setTotal(total);
        return page;
    }

    @Override
@@ -456,7 +534,7 @@
                            roleStrBuffer.append(",");
                        }
                    });
                    roleStrBuffer.deleteCharAt(roleStrBuffer.length()-1);
                    roleStrBuffer.deleteCharAt(roleStrBuffer.length() - 1);
                    res1.setRoles(roleStrBuffer.toString());
                    StringBuffer departStrBuffer = new StringBuffer();
                    List<UmsDepart> departs = item.getDepart();
@@ -467,19 +545,19 @@
                            departStrBuffer.append(",");
                        }
                    });
                    departStrBuffer.deleteCharAt(departStrBuffer.length()-1);
                    departStrBuffer.deleteCharAt(departStrBuffer.length() - 1);
                    res1.setDepart(departStrBuffer.toString());
                    res1.setJobTitle(item.getJobTitle());
                    Date createTime = item.getCreateTime();
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                    if (createTime != null){
                    if (createTime != null) {
                        res1.setCreateTime(sdf.format(createTime));
                    }

                    Integer status = item.getStatus();
                    if (status.equals(1)){
                    if (status.equals(1)) {
                        res1.setStatus("启用");
                    }else {
                    } else {
                        res1.setStatus("禁用");
                    }
                    return res1;
@@ -537,5 +615,10 @@
        return str;
    }

    @Override
    public UmsAdmin getByOpenid(String openid) {
        LambdaQueryWrapper<UmsAdmin> wrapper = new LambdaQueryWrapper<UmsAdmin>().eq(UmsAdmin::getOpenid, openid).last("limit 1");

        return baseMapper.selectOne(wrapper);
    }
}