2021与蓝度共同重构项目,服务端
zhanzhiqin
2022-04-15 42190b82f67483e3db3b5b1a66ddc8bdbd22a3ca
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -10,6 +10,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
@@ -23,10 +24,13 @@
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.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.security.core.GrantedAuthority;
@@ -57,6 +61,7 @@
    private final RoleService roleService;
    private final TokenProvider tokenProvider;
    private final AdminRoleRelationService adminRoleRelationService;
    private PermissionConfig permissionConfig;
    @Log("后台用户登录")
    @AnonymousAccess
@@ -80,7 +85,6 @@
        loginUserInfo.setName(admin.getNickName());
        loginUserInfo.setAccount(admin.getUsername());
        loginUserInfo.setStatus(admin.getStatus());
        loginUserInfo.setIcon(admin.getIcon());
        loginUserInfo.setIp(IpUtil.getRealIp());
        loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
        loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
@@ -134,6 +138,9 @@
    @Log("后台用户列表")
    @GetMapping(value = "/list")
    public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
        if (keyword != null) {
@@ -224,14 +231,17 @@
    @Log("用户修改头像")
    @PostMapping("/updateIcon")
    public ResponseVO<Object> updateIcon(@RequestBody String IconUrl) {
    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(), IconUrl);
        }else{
            result = clientService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
        } else {
            //超级管理员、管理员修改头像
            result= adminService.updateIcon(SecurityUtils.getUserId(), IconUrl);
            result = adminService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
        }
        if (result) {