普通用户登录fix

zhanzhiqin

2022-03-09 a8681f6598e064579ce6b3ab16a152258839e211

普通用户登录fix

 dao/src/main/java/com/sandu/ximon/dao/domain/ClientRoleRelation.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;

/**
 * 
 * @TableName client_role_relation
 */
@TableName(value ="client_role_relation")
@Data
public class ClientRoleRelation implements Serializable {
    /**
     * 
     */
    @TableId
    private Long id;

    /**
     * ç”¨æˆ·ID
     */
    private Long clientId;

    /**
     * è§’色ID
     */
    private Long roleId;

    /**
     * 
     */
    private LocalDateTime createTime;

    /**
     * 
     */
    private LocalDateTime updateTime;
}

 dao/src/main/java/com/sandu/ximon/dao/mapper/ClientRoleRelationMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Entity com.sandu.ximon.dao.domain.ClientRoleRelation
 */
@Mapper
public interface ClientRoleRelationMapper extends BaseMapper<ClientRoleRelation> {

}





 dao/src/main/resources/mapper/ClientRoleRelationMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.ClientRoleRelationMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.ClientRoleRelation">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="clientId" column="client_id" jdbcType="BIGINT"/>
            <result property="roleId" column="role_id" jdbcType="BIGINT"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,client_id,role_id,
        create_time,update_time
    </sql>
</mapper>

 sandu-common/src/main/java/com/sandu/common/enums/RoleLevelStatus.java

@@ -9,6 +9,7 @@
     */
    SUPER(1, "超级管理员"),
    COMMON(2, "普通管理员"),
    NORMAL(3, "普通用户"),
    ;

    private final Integer code;

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -107,14 +107,14 @@
            return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
        }

//        Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId());
        Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId());

        LoginUserInfo loginUserInfo = new LoginUserInfo();
        loginUserInfo.setUserId(client.getId());
        loginUserInfo.setAccount(client.getClientName());
        loginUserInfo.setIp(IpUtil.getRealIp());
        loginUserInfo.setAdministratorType(AdministratorEnums.NORMAL.getCode());
//        loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
        loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));

        // ç”Ÿæˆä»¤ç‰Œ
        String token = tokenProvider.createToken(loginUserInfo);

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/AddClientPrarm.java

@@ -3,6 +3,7 @@
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;

/**
 * @author ZZQ
@@ -12,4 +13,7 @@
public class AddClientPrarm extends ClientPrarm {
    @NotEmpty
    private String password;

    @NotNull(message = "角色id不能为空")
    private Long roleId;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientRoleRelationService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.sandu.ximon.admin.service;

import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.mapper.ClientRoleRelationMapper;
import org.springframework.stereotype.Service;

/**
 * @author ZZQ
 * @date 2022/3/9 15:22
 */
@Service
public class ClientRoleRelationService extends BaseServiceImpl<ClientRoleRelationMapper, ClientRoleRelation> {
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -9,6 +10,8 @@
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.mapper.ClientMapper;
import lombok.AllArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -22,6 +25,8 @@

    private final ClientMapper clientMapper;
    private final PasswordEncoder passwordEncoder;
    private final ClientRoleRelationService clientRoleRelationService;
    private final RoleService roleService;


    public boolean addClient(AddClientPrarm addClientPrarm) {
@@ -39,14 +44,31 @@
                throw new BusinessException("上级客户不存在");
            }
        }

        Role role = roleService.getById(addClientPrarm.getRoleId());
        if (role == null) {
            throw new BusinessException("角色不存在");
        }
        if (!RoleLevelStatus.NORMAL.getCode().equals(role.getLevel())) {
            throw new BusinessException("无法添加超级管理员或用户管理员");
        }


        client.setClientName(addClientPrarm.getClientName());
        client.setLinkMan(addClientPrarm.getLinkMan());
        client.setMobile(addClientPrarm.getMobile());
        client.setClientSuperior(addClientPrarm.getClientSuperior());
        client.setPassword(passwordEncoder.encode(addClientPrarm.getPassword()));
        boolean flag = save(client);

        ClientRoleRelation clientRoleRelation = new ClientRoleRelation();
        clientRoleRelation.setClientId(client.getId());
        clientRoleRelation.setRoleId(addClientPrarm.getRoleId());
        if (!clientRoleRelationService.save(clientRoleRelation)) {
            throw new BusinessException("添加管理员角色失败");
        }

        return save(client);
        return flag;
    }