| 
						
						
						
					 | 
					@ -1,16 +1,13 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					package com.epmet.controller; | 
					 | 
					 | 
					package com.epmet.controller; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.security.dto.GovTokenDto; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.Result; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.Result; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.validator.ValidatorUtils; | 
					 | 
					 | 
					import com.epmet.commons.tools.validator.ValidatorUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.form.*; | 
					 | 
					 | 
					import com.epmet.dto.form.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.result.LoginUserInfoResultDTO; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.dto.result.RoleOpeScopeResultDTO; | 
					 | 
					 | 
					import com.epmet.dto.result.RoleOpeScopeResultDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.service.AccessService; | 
					 | 
					 | 
					import com.epmet.service.AccessService; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.beans.factory.annotation.Autowired; | 
					 | 
					 | 
					import org.springframework.beans.factory.annotation.Autowired; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.springframework.web.bind.annotation.*; | 
					 | 
					 | 
					import org.springframework.web.bind.annotation.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import javax.validation.constraints.NotBlank; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.List; | 
					 | 
					 | 
					import java.util.List; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import java.util.Set; | 
					 | 
					 | 
					import java.util.Set; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -46,26 +43,26 @@ public class AccessController { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return new Result(); | 
					 | 
					 | 
					        return new Result(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    ///**
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					     * 从缓存中查询用户信息(DataFilterAspect中用到) | 
					 | 
					 | 
					    // * 从缓存中查询用户信息(DataFilterAspect中用到)
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					     * @return | 
					 | 
					 | 
					    // * @return
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					     */ | 
					 | 
					 | 
					    // */
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					    @PostMapping("loginuserinfo") | 
					 | 
					 | 
					    //@PostMapping("loginuserinfo")
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					    public Result<LoginUserInfoResultDTO> getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) { | 
					 | 
					 | 
					    //public Result<LoginUserInfoResultDTO> getLoginUserInfo(@RequestBody StaffPermCacheFormDTO dto) {
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class); | 
					 | 
					 | 
					    //    ValidatorUtils.validateEntity(dto, StaffPermCacheFormDTO.GetStaffCurrPermissions.class);
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId()); | 
					 | 
					 | 
					    //    GovTokenDto govTokenDto = accessService.getUserDetails(dto.getApp(), dto.getClient(), dto.getStaffId());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        LoginUserInfoResultDTO resultDTO = null; | 
					 | 
					 | 
					    //    LoginUserInfoResultDTO resultDTO = null;
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        if (govTokenDto != null) { | 
					 | 
					 | 
					    //    if (govTokenDto != null) {
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            resultDTO = new LoginUserInfoResultDTO(); | 
					 | 
					 | 
					    //        resultDTO = new LoginUserInfoResultDTO();
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            resultDTO.setRoleIdList(govTokenDto.getRoleIdList()); | 
					 | 
					 | 
					    //        resultDTO.setRoleIdList(govTokenDto.getRoleIdList());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            //resultDTO.setGridId(govTokenDto.getGridId());
 | 
					 | 
					 | 
					    //        //resultDTO.setGridId(govTokenDto.getGridId());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath()); | 
					 | 
					 | 
					    //        resultDTO.setOrgIdPath(govTokenDto.getOrgIdPath());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            resultDTO.setGridIdList(govTokenDto.getGridIdList()); | 
					 | 
					 | 
					    //        resultDTO.setGridIdList(govTokenDto.getGridIdList());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            resultDTO.setDeptIdList(govTokenDto.getDeptIdList()); | 
					 | 
					 | 
					    //        resultDTO.setDeptIdList(govTokenDto.getDeptIdList());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            resultDTO.setUserId(govTokenDto.getUserId()); | 
					 | 
					 | 
					    //        resultDTO.setUserId(govTokenDto.getUserId());
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        } | 
					 | 
					 | 
					    //    }
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        return new Result<LoginUserInfoResultDTO>().ok(resultDTO); | 
					 | 
					 | 
					    //    return new Result<LoginUserInfoResultDTO>().ok(resultDTO);
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					    } | 
					 | 
					 | 
					    //}
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    /** | 
					 | 
					 | 
					    /** | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					     * 查询角色的操作key对应操作范围列表(缓存) | 
					 | 
					 | 
					     * 查询角色的操作key对应操作范围列表(缓存) | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |