fix

zhanzhiqin

2022-05-13 9066298c5da93b8a9bff47cd8f73d9ff2cca15b5

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

@@ -74,9 +74,7 @@
        if (admin == null) {
            return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
        }
//        String session_vcode = (String) request.getSession().getAttribute(loginParam.getKey());
        String s = RedisUtils.getBean().get(loginParam.getKey());
        System.out.println(s + "===========================");
        if (!loginParam.getVlue().equals(s)) {
            log.error(loginParam.getVlue() + "验证码");
            return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
@@ -170,10 +168,6 @@

    @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("退出登录成功");
@@ -196,31 +190,6 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, 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);
//                    });
//        }
//        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("后台用户注册")
@@ -237,7 +206,6 @@
        }
    }

//    @PreAuthorize("@el.check('admin:edit')")

    /**
     * 修改管理员信息
@@ -295,16 +263,6 @@
        }
    }

//    @PutMapping("/updateStatus/{id}")
//    public ResponseVO<Object> updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
//        checkLevel(id);
//        Admin update = new Admin();
//        update.setId(id);
//        update.setStatus(status);
//        adminService.updateById(update);
//        return ResponseUtil.success(null);
//    }

    @Log("后台用户删除")
    @PostMapping("/del/{adminId}")
    public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
@@ -341,37 +299,21 @@
        }
    }

//    /**
//     * 给管理员分配角色
//     *
//     * @return
//     */
//    @PostMapping("/updateAdminRole")
//    @PreAuthorize("@el.check('admin:edit')")
//    public ResponseVO<Object> updateAdminRole(@RequestParam("adminId") Long adminId,
//                                              @RequestParam("roleIds") List<Long> roleIds) {
//        checkLevel(adminId);
//        adminsRolesService.updateAdminRole(adminId, roleIds);
//        return ResponseUtil.success("");
//    }

    /**
     * 获取用户权限
     *
     * @return
     */
    @GetMapping("/getUserPermissionList")
    public ResponseVO<Object> getUserPermissionList() {
        List<MenuNode> userPermissionList;
        if (SecurityUtils.getClientId() == null) {
            userPermissionList = adminService.getUserPermissionList();
        } else {
            userPermissionList = clientService.getUserPermissionList();
        }

//    /**
//     * 编辑我的信息
//     *
//     * @param resources
//     * @return
//     */
//    @PutMapping("/editUserInfo")
//    public ResponseVO<Object> editUserInfo(@RequestBody AdminParam resources) {
//        Long userId = SecurityUtils.getUserId();
//        Admin admin = new Admin();
//        admin.setId(userId);
//        admin.setMobile(resources.getMobile());
//        admin.setEmail(resources.getEmail());
//        admin.setNickName(resources.getNickName());
//        adminService.updateById(admin);
//        return ResponseUtil.success(null);
//    }

        return ResponseUtil.success(userPermissionList);
    }
}