fix

zhanzhiqin

2022-04-24 b33cc5833ea02e3c330ef4d98ba3b5b02126cf73

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

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

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
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.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.redis.RedisService;
import com.sandu.common.redis.UserModel;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.security.config.SecurityProperties;
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.AdminDto;
import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.validation.annotation.Validated;
@@ -57,6 +62,8 @@
    private final RoleService roleService;
    private final TokenProvider tokenProvider;
    private final AdminRoleRelationService adminRoleRelationService;
    private PermissionConfig permissionConfig;
    private final RedisService redisService;

    @Log("后台用户登录")
    @AnonymousAccess
@@ -81,7 +88,16 @@
        loginUserInfo.setAccount(admin.getUsername());
        loginUserInfo.setStatus(admin.getStatus());
        loginUserInfo.setIp(IpUtil.getRealIp());
        loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());

        //确定用户角色权限
        AdminRoleRelation adminRoleRelation = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, loginUserInfo.getUserId()));
        Role role = roleService.getOne(Wrappers.lambdaQuery(Role.class).eq(Role::getId, adminRoleRelation.getRoleId()));
        if (role != null && role.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
            loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
        } else {
            loginUserInfo.setAdministratorType(AdministratorEnums.CUSTOMER.getCode());
        }

        loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));

        // 生成令牌
@@ -101,9 +117,10 @@
        return ResponseUtil.success(authInfo);
    }

//    @Log("后台用户信息")
    //    @Log("后台用户信息")
    @GetMapping(value = "/info")
    public ResponseVO<Object> getUserInfo() {
        System.out.println(SecurityUtils.getUserDetails().getAdministratorType() + "         ---------");
        Long userId = SecurityUtils.getUserId();
        List<Role> roles;
        MapBuilder<Object, Object> builder;
@@ -116,7 +133,15 @@
        } else {
            Client client = clientService.getById(userId);
            roles = roleService.listByClientId(client.getId());
            builder = MapUtil.builder().put("admin", client);
            //为了保持返回数据格式一致
            Admin admin = new Admin();
            admin.setId(client.getId());
            admin.setIcon(client.getIcon());
            admin.setNickName(client.getLinkMan());
            admin.setMobile(client.getMobile());
            admin.setLoginTime(client.getLoginTime());
            admin.setCreateTime(client.getCreateTime());
            builder = MapUtil.builder().put("admin", admin);

        }
        if (CollectionUtil.isEmpty(roles)) {
@@ -125,38 +150,68 @@
        List<Menu> menus = menuService.listByRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
        if (CollectionUtil.isNotEmpty(menus)) {
            List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0 || menu.getType() == 1).collect(Collectors.toList());
            builder.put("menus", collect);

            List<MenuNode> menuNodeList = collect.stream()
                    .filter(menu -> menu.getPid().equals(0L))
                    .map(menu -> covertMenuNode(menu, collect)).collect(Collectors.toList());
            builder.put("menus", menuNodeList);
        }
        return ResponseUtil.success(builder.build());
    }

    @GetMapping(value = "/logout")
    public ResponseVO<Object> LogOut() {
//        redisService.set(UserModel.USER_INFO.key(SecurityUtils.getUserId().toString() + SecurityUtils.getUserDetails().getAdministratorType()), null);
//        redisService.set(UserModel.USER_TOKEN.key(UserModel.USER_TOKEN.key(SecurityUtils.getUserDetails().getToken())), null);


        String key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
        redisService.set(key, null);
        return ResponseUtil.success("退出登录成功");
    }

    private MenuNode covertMenuNode(Menu menu, List<Menu> menuList) {
        MenuNode node = new MenuNode();
        BeanUtils.copyProperties(menu, node);
        List<MenuNode> children = menuList.stream()
                .filter(subMenu -> subMenu.getPid().equals(menu.getId()))
                .map(subMenu -> covertMenuNode(subMenu, menuList)).collect(Collectors.toList());
        node.setChildren(children);
        return node;
    }

    @Log("后台用户列表")
    @GetMapping(value = "/list")
    public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
        if (keyword != null) {
            wrapper.like(Admin::getNickName, keyword)
                    .or(adminLambdaQueryWrapper -> {
                        adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
                    });
        if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<Admin> list = adminService.list(wrapper);
        return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));

        List<AdminDto> adminDtoList = new ArrayList<>();
        for (Admin demo : list) {
            AdminDto adminDto = new AdminDto();
            BeanUtil.copyProperties(demo, adminDto);
            AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
                    .eq(AdminRoleRelation::getAdminId, demo.getId()));

            if (one != null) {
                adminDto.setRoleId(one.getRoleId());
            }
            adminDtoList.add(adminDto);

        }
        return ResponseUtil.successPage(adminDtoList);
//        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
//        LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
//        if (keyword != null) {
//            wrapper.like(Admin::getNickName, keyword)
//                    .or(adminLambdaQueryWrapper -> {
//                        adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
//                    });
//        }
//        List<Admin> list = adminService.list(wrapper);
//
//        List<AdminDto> adminDtoList = new ArrayList<>();
//        for (Admin demo : list) {
//            AdminDto adminDto = new AdminDto();
//            BeanUtil.copyProperties(demo, adminDto);
//            AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
//                    .eq(AdminRoleRelation::getAdminId, demo.getId()));
//
//            if (one != null) {
//                adminDto.setRoleId(one.getRoleId());
//            }
//            adminDtoList.add(adminDto);
//
//        }
//        return ResponseUtil.successPage(adminDtoList);
    }

    @Log("后台用户注册")
@@ -189,10 +244,16 @@
    /**
     * 修改我的密码
     */
    @Log("后台用户修改密码")
    @Log("修改当前用户密码")
    @PutMapping("/updateMyPassword")
    public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
        boolean result = adminService.updateMyPassword(param);
        boolean result;
        if (SecurityUtils.getClientId() == null) {
            result = adminService.updateMyPassword(param);
        } else {
            result = clientService.resetPassword(param);
        }

        if (result) {
            return ResponseUtil.success("修改成功");
        } else {
@@ -221,6 +282,28 @@
        }
    }

    @Log("用户修改头像")
    @PostMapping("/updateIcon")
    public ResponseVO<Object> updateIcon(@RequestBody ReceiveParam receiveParam) {
        if (receiveParam.getIconUrl().trim() == null) {
            throw new BusinessException("头像URL不能为空！");
        }
        boolean result;
        //普通用户修改头像
        if (SecurityUtils.getAdministratorIdentity().equals(AdministratorEnums.NORMAL.getCode())) {
            result = clientService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
        } else {
            //超级管理员、管理员修改头像
            result = adminService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
        }

        if (result) {
            return ResponseUtil.success("修改成功");
        } else {
            return ResponseUtil.fail("修改失败");
        }
    }

//    /**
//     * 给管理员分配角色
//     *