fix

zhanzhiqin

2022-03-17 67485b16168ee64a57296eefd8f74e7a07374e06

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

@@ -1,10 +1,10 @@
package com.sandu.ximon.admin.controller;

import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
@@ -13,17 +13,17 @@
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.context.CustomerInspectContextHolder;
import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.param.UpdateClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientRoleRelationService;
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.admin.service.RoleService;
import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import jodd.cli.Cli;
import lombok.AllArgsConstructor;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -31,9 +31,7 @@
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -48,6 +46,7 @@
    private final ClientService clientService;
    private final PasswordEncoder passwordEncoder;
    private final RoleService roleService;
    private final ClientRoleRelationService clientRoleRelationService;
    private final TokenProvider tokenProvider;

    @PostMapping("/add")
@@ -62,8 +61,8 @@


    @PostMapping("/update/{id}")
    public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated ClientPrarm clientPrarm) {
        boolean b = clientService.updateClient(id, clientPrarm);
    public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated UpdateClientPrarm updateClientPrarm) {
        boolean b = clientService.updateClient(id, updateClientPrarm);
        if (b) {
            return ResponseUtil.success("更新成功");
        } else {
@@ -93,7 +92,22 @@
                    .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
                    .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
        }
        return ResponseUtil.successPage(clientService.list(wrapper));
        List<Client> clientList = clientService.list(wrapper);
        List<ClientDto> clientDtoList = new ArrayList<>();

        for (Client demo : clientList) {
            ClientDto clientDto = new ClientDto();
            BeanUtil.copyProperties(demo, clientDto);
            ClientRoleRelation one = clientRoleRelationService.getOne(Wrappers.lambdaQuery(ClientRoleRelation.class)
                    .eq(ClientRoleRelation::getClientId, demo.getId()));

            if (one != null) {
                clientDto.setRoleId(one.getRoleId());
            }
            clientDtoList.add(clientDto);

        }
        return ResponseUtil.successPage(clientDtoList);
    }

    @AnonymousAccess
@@ -107,14 +121,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(), false);

        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);