From 62226f7b8b147a47f0351c6894957802e17fc6c7 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 3 Jun 2020 10:10:23 +0800 Subject: [PATCH] =?UTF-8?q?1.gov-access=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E6=95=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/AccessController.java | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java index 8a68bec452..487c854dd9 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessController.java @@ -1,16 +1,13 @@ package com.epmet.controller; -import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; -import com.epmet.dto.result.LoginUserInfoResultDTO; import com.epmet.dto.result.RoleOpeScopeResultDTO; import com.epmet.service.AccessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotBlank; import java.util.List; import java.util.Set; @@ -46,26 +43,26 @@ public class AccessController { return new Result(); } - /** - * 从缓存中查询用户信息(DataFilterAspect中用到) - * @return - */ - @PostMapping("loginuserinfo") - public Result getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) { - ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class); - GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId()); - LoginUserInfoResultDTO resultDTO = null; - if (govTokenDto != null) { - resultDTO = new LoginUserInfoResultDTO(); - resultDTO.setRoleIdList(govTokenDto.getRoleIdList()); - //resultDTO.setGridId(govTokenDto.getGridId()); - resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath()); - resultDTO.setGridIdList(govTokenDto.getGridIdList()); - resultDTO.setDeptIdList(govTokenDto.getDeptIdList()); - resultDTO.setUserId(govTokenDto.getUserId()); - } - return new Result().ok(resultDTO); - } + ///** + // * 从缓存中查询用户信息(DataFilterAspect中用到) + // * @return + // */ + //@PostMapping("loginuserinfo") + //public Result getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) { + // ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class); + // GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId()); + // LoginUserInfoResultDTO resultDTO = null; + // if (govTokenDto != null) { + // resultDTO = new LoginUserInfoResultDTO(); + // resultDTO.setRoleIdList(govTokenDto.getRoleIdList()); + // //resultDTO.setGridId(govTokenDto.getGridId()); + // resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath()); + // resultDTO.setGridIdList(govTokenDto.getGridIdList()); + // resultDTO.setDeptIdList(govTokenDto.getDeptIdList()); + // resultDTO.setUserId(govTokenDto.getUserId()); + // } + // return new Result().ok(resultDTO); + //} /** * 查询角色的操作key对应操作范围列表(缓存)