查询登录用户权限信息,使用UserUtils

This commit is contained in:
2023-11-11 15:21:25 +08:00
parent 6fa87d6fc2
commit 5f44c35d03
14 changed files with 109 additions and 56 deletions

View File

@@ -5,20 +5,14 @@ import com.github.pagehelper.PageInfo;
import com.jsowell.common.constant.HttpStatus;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.domain.model.LoginUser;
import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
import com.jsowell.common.core.page.PageDomain;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.core.page.TableDataInfo;
import com.jsowell.common.core.page.TableSupport;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.JWTUtils;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.*;
import com.jsowell.common.util.sql.SqlUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@@ -26,7 +20,6 @@ import org.springframework.web.bind.annotation.InitBinder;
import javax.servlet.http.HttpServletRequest;
import java.beans.PropertyEditorSupport;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -204,7 +197,7 @@ public class BaseController {
* 平台管理员账号会返回空数组
* @return
*/
public List<String> getDeptIds() {
/*public List<String> getDeptIds() {
// 获取登录账号信息
AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
if (authorizedMap == null) {
@@ -215,5 +208,5 @@ public class BaseController {
return merchantDeptIds;
}
return new ArrayList<>();
}
}*/
}

View File

@@ -1,21 +1,13 @@
package com.jsowell.common.util;
import com.alibaba.fastjson2.JSONObject;
import com.google.common.collect.Lists;
import com.jsowell.common.constant.HttpStatus;
import com.jsowell.common.core.domain.entity.SysDept;
import com.jsowell.common.core.domain.entity.SysRole;
import com.jsowell.common.core.domain.entity.SysUser;
import com.jsowell.common.core.domain.model.LoginUser;
import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
import com.jsowell.common.exception.ServiceException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import java.util.List;
/**
* 安全服务工具类
*
@@ -108,7 +100,7 @@ public class SecurityUtils {
}
// 查询登录用户权限
public static AuthorizedDeptVO getAuthorizedMap() {
/*public static AuthorizedDeptVO getAuthorizedMap() {
// 登录用户
LoginUser loginUser = getLoginUser();
if (loginUser == null) {
@@ -130,7 +122,6 @@ public class SecurityUtils {
resultVO.setDeptId(deptId);
log.info("用户id:{}, 所属部门信息:{}", user.getUserId(), JSONObject.toJSONString(dept));
// 登录用户角色
List<SysRole> roles = user.getRoles();
Long parentId = dept.getParentId();
resultVO.setParentId(String.valueOf(parentId));
List<String> merchantDeptIds = Lists.newArrayList();
@@ -147,5 +138,5 @@ public class SecurityUtils {
resultVO.setStationDeptIds(stationDeptIds);
}
return resultVO;
}
}*/
}