|
|
|
@ -10,11 +10,13 @@ import com.chanko.yunxi.mes.framework.security.config.SecurityProperties;
|
|
|
|
|
import com.chanko.yunxi.mes.framework.security.core.util.SecurityFrameworkUtils;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.controller.admin.auth.vo.*;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.convert.auth.AuthConvert;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.dept.PostDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.permission.MenuDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.permission.RoleDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.enums.logger.LoginLogTypeEnum;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.service.auth.AdminAuthService;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.service.dept.PostService;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.service.permission.MenuService;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.service.permission.PermissionService;
|
|
|
|
|
import com.chanko.yunxi.mes.module.system.service.permission.RoleService;
|
|
|
|
@ -32,6 +34,7 @@ import javax.annotation.Resource;
|
|
|
|
|
import javax.annotation.security.PermitAll;
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Collections;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Set;
|
|
|
|
@ -59,9 +62,10 @@ public class AuthController {
|
|
|
|
|
private PermissionService permissionService;
|
|
|
|
|
@Resource
|
|
|
|
|
private SocialClientService socialClientService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private SecurityProperties securityProperties;
|
|
|
|
|
@Resource
|
|
|
|
|
private PostService postService;
|
|
|
|
|
|
|
|
|
|
@PostMapping("/login")
|
|
|
|
|
@PermitAll
|
|
|
|
@ -105,7 +109,7 @@ public class AuthController {
|
|
|
|
|
// 1.2 获得角色列表
|
|
|
|
|
Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(getLoginUserId());
|
|
|
|
|
if (CollUtil.isEmpty(roleIds)) {
|
|
|
|
|
return success(AuthConvert.INSTANCE.convert(user, Collections.emptyList(), Collections.emptyList()));
|
|
|
|
|
return success(AuthConvert.INSTANCE.convert(user, Collections.emptyList(), Collections.emptyList(), Collections.emptyList()));
|
|
|
|
|
}
|
|
|
|
|
List<RoleDO> roles = roleService.getRoleList(roleIds);
|
|
|
|
|
roles.removeIf(role -> !CommonStatusEnum.ENABLE.getStatus().equals(role.getStatus())); // 移除禁用的角色
|
|
|
|
@ -115,8 +119,15 @@ public class AuthController {
|
|
|
|
|
List<MenuDO> menuList = menuService.getMenuList(menuIds);
|
|
|
|
|
menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单
|
|
|
|
|
|
|
|
|
|
// 1.4 获得岗位信息
|
|
|
|
|
List<PostDO> postList = new ArrayList<>(8);
|
|
|
|
|
if(user.getPostIds() != null && user.getPostIds().size() > 0){
|
|
|
|
|
postList = postService.getPostList(user.getPostIds());
|
|
|
|
|
postList.removeIf(post -> !CommonStatusEnum.ENABLE.getStatus().equals(post.getStatus())); // 移除禁用的岗位
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 2. 拼接结果返回
|
|
|
|
|
return success(AuthConvert.INSTANCE.convert(user, roles, menuList));
|
|
|
|
|
return success(AuthConvert.INSTANCE.convert(user, roles, menuList, postList));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ========== 短信登录相关 ==========
|
|
|
|
|