bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

获取登录信息方式修改

This commit is contained in:
syruan 2024-01-10 15:51:25 +08:00 committed by syruan
parent 43c3bd1484
commit e54d3673be
6 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysMenuController.java
View File

@ -1,18 +1,5 @@
package com.bonus.sgzb.system.controller; package com.bonus.sgzb.system.controller;
import java.util.List;
import com.bonus.sgzb.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.bonus.sgzb.common.core.constant.UserConstants; import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.controller.BaseController;
@ -23,6 +10,11 @@ import com.bonus.sgzb.common.security.annotation.RequiresPermissions;
import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.system.domain.SysMenu; import com.bonus.sgzb.system.domain.SysMenu;
import com.bonus.sgzb.system.service.ISysMenuService; import com.bonus.sgzb.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
@ -63,7 +55,7 @@ public class SysMenuController extends BaseController
@GetMapping("/treeselect") @GetMapping("/treeselect")
public AjaxResult treeselect(SysMenu menu) public AjaxResult treeselect(SysMenu menu)
{ {
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getLoginUser().getUserid();
List<SysMenu> menus = menuService.selectMenuList(menu, userId); List<SysMenu> menus = menuService.selectMenuList(menu, userId);
return success(menuService.buildMenuTreeSelect(menus)); return success(menuService.buildMenuTreeSelect(menus));
} }
@ -74,7 +66,7 @@ public class SysMenuController extends BaseController
@GetMapping(value = "/roleMenuTreeselect/{roleId}") @GetMapping(value = "/roleMenuTreeselect/{roleId}")
public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
{ {
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getLoginUser().getUserid();
List<SysMenu> menus = menuService.selectMenuList(userId); List<SysMenu> menus = menuService.selectMenuList(userId);
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
@ -153,7 +145,7 @@ public class SysMenuController extends BaseController
@GetMapping("getRouters") @GetMapping("getRouters")
public AjaxResult getRouters() public AjaxResult getRouters()
{ {
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getLoginUser().getUserid();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId); List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return success(menuService.buildMenus(menus)); return success(menuService.buildMenus(menus));
} }

5
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
View File

@ -169,7 +169,8 @@ public class SysUserController extends BaseController
@GetMapping("getInfo") @GetMapping("getInfo")
public AjaxResult getInfo() public AjaxResult getInfo()
{ {
SysUser user = userService.selectUserById(SecurityUtils.getUserId()); LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = userService.selectUserById(SecurityUtils.getLoginUser().getUserid());
// 角色集合 // 角色集合
Set<String> roles = permissionService.getRolePermission(user); Set<String> roles = permissionService.getRolePermission(user);
// 权限集合 // 权限集合
@ -261,7 +262,7 @@ public class SysUserController extends BaseController
@DeleteMapping("/{userIds}") @DeleteMapping("/{userIds}")
public AjaxResult remove(@PathVariable Long[] userIds) public AjaxResult remove(@PathVariable Long[] userIds)
{ {
if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) if (ArrayUtils.contains(userIds, SecurityUtils.getLoginUser().getUserid()))
{ {
return error("当前用户不能删除"); return error("当前用户不能删除");
} }

8
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysAuthServiceImpl.java
View File

@ -11,9 +11,11 @@ import com.bonus.sgzb.system.api.domain.SysUser;
import com.bonus.sgzb.system.domain.SysRoleDept; import com.bonus.sgzb.system.domain.SysRoleDept;
import com.bonus.sgzb.system.domain.SysRoleMenu; import com.bonus.sgzb.system.domain.SysRoleMenu;
import com.bonus.sgzb.system.domain.SysUserRole; import com.bonus.sgzb.system.domain.SysUserRole;
import com.bonus.sgzb.system.mapper.*; import com.bonus.sgzb.system.mapper.SysAuthMapper;
import com.bonus.sgzb.system.mapper.SysRoleDeptMapper;
import com.bonus.sgzb.system.mapper.SysRoleMenuMapper;
import com.bonus.sgzb.system.mapper.SysUserRoleMapper;
import com.bonus.sgzb.system.service.ISysAuthService; import com.bonus.sgzb.system.service.ISysAuthService;
import com.bonus.sgzb.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -190,7 +192,7 @@ public class SysAuthServiceImpl implements ISysAuthService
@Override @Override
public void checkRoleDataScope(Long roleId) public void checkRoleDataScope(Long roleId)
{ {
if (!SysUser.isAdmin(SecurityUtils.getUserId())) if (!SysUser.isAdmin(SecurityUtils.getLoginUser().getUserid()))
{ {
SysRole role = new SysRole(); SysRole role = new SysRole();
role.setRoleId(roleId); role.setRoleId(roleId);

15
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysDeptServiceImpl.java
View File

@ -1,11 +1,5 @@
package com.bonus.sgzb.system.service.impl; package com.bonus.sgzb.system.service.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.sgzb.common.core.constant.UserConstants; import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.text.Convert; import com.bonus.sgzb.common.core.text.Convert;
@ -20,6 +14,13 @@ import com.bonus.sgzb.system.domain.vo.TreeSelect;
import com.bonus.sgzb.system.mapper.SysDeptMapper; import com.bonus.sgzb.system.mapper.SysDeptMapper;
import com.bonus.sgzb.system.mapper.SysRoleMapper; import com.bonus.sgzb.system.mapper.SysRoleMapper;
import com.bonus.sgzb.system.service.ISysDeptService; import com.bonus.sgzb.system.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* 部门管理 服务实现 * 部门管理 服务实现
@ -190,7 +191,7 @@ public class SysDeptServiceImpl implements ISysDeptService
@Override @Override
public void checkDeptDataScope(Long deptId) public void checkDeptDataScope(Long deptId)
{ {
if (!SysUser.isAdmin(SecurityUtils.getUserId())) if (!SysUser.isAdmin(SecurityUtils.getLoginUser().getUserid()))
{ {
SysDept dept = new SysDept(); SysDept dept = new SysDept();
dept.setDeptId(deptId); dept.setDeptId(deptId);

15
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysRoleServiceImpl.java
View File

@ -1,13 +1,5 @@
package com.bonus.sgzb.system.service.impl; package com.bonus.sgzb.system.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.bonus.sgzb.common.core.constant.UserConstants; import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.SpringUtils; import com.bonus.sgzb.common.core.utils.SpringUtils;
@ -24,6 +16,11 @@ import com.bonus.sgzb.system.mapper.SysRoleMapper;
import com.bonus.sgzb.system.mapper.SysRoleMenuMapper; import com.bonus.sgzb.system.mapper.SysRoleMenuMapper;
import com.bonus.sgzb.system.mapper.SysUserRoleMapper; import com.bonus.sgzb.system.mapper.SysUserRoleMapper;
import com.bonus.sgzb.system.service.ISysRoleService; import com.bonus.sgzb.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
/** /**
* 角色 业务层处理 * 角色 业务层处理
@ -197,7 +194,7 @@ public class SysRoleServiceImpl implements ISysRoleService
@Override @Override
public void checkRoleDataScope(Long roleId) public void checkRoleDataScope(Long roleId)
{ {
if (!SysUser.isAdmin(SecurityUtils.getUserId())) if (!SysUser.isAdmin(SecurityUtils.getLoginUser().getUserid()))
{ {
SysRole role = new SysRole(); SysRole role = new SysRole();
role.setRoleId(roleId); role.setRoleId(roleId);

33
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
View File

@ -1,19 +1,5 @@
package com.bonus.sgzb.system.service.impl; package com.bonus.sgzb.system.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
import com.bonus.sgzb.system.api.domain.SysDept;
import com.bonus.sgzb.system.mapper.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import com.bonus.sgzb.common.core.constant.UserConstants; import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.SpringUtils; import com.bonus.sgzb.common.core.utils.SpringUtils;
@ -21,13 +7,28 @@ import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.utils.bean.BeanValidators; import com.bonus.sgzb.common.core.utils.bean.BeanValidators;
import com.bonus.sgzb.common.datascope.annotation.DataScope; import com.bonus.sgzb.common.datascope.annotation.DataScope;
import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.system.api.domain.SysDept;
import com.bonus.sgzb.system.api.domain.SysRole; import com.bonus.sgzb.system.api.domain.SysRole;
import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.domain.SysUser;
import com.bonus.sgzb.system.domain.SysPost; import com.bonus.sgzb.system.domain.SysPost;
import com.bonus.sgzb.system.domain.SysUserPost; import com.bonus.sgzb.system.domain.SysUserPost;
import com.bonus.sgzb.system.domain.SysUserRole; import com.bonus.sgzb.system.domain.SysUserRole;
import com.bonus.sgzb.system.mapper.*;
import com.bonus.sgzb.system.service.ISysConfigService; import com.bonus.sgzb.system.service.ISysConfigService;
import com.bonus.sgzb.system.service.ISysUserService; import com.bonus.sgzb.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import javax.validation.Validator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* 用户 业务层处理 * 用户 业务层处理
@ -54,7 +55,7 @@ public class SysUserServiceImpl implements ISysUserService
@Autowired @Autowired
private SysUserPostMapper userPostMapper; private SysUserPostMapper userPostMapper;
@Autowired @Resource
private ISysConfigService configService; private ISysConfigService configService;
@Autowired @Autowired
@ -235,7 +236,7 @@ public class SysUserServiceImpl implements ISysUserService
@Override @Override
public void checkUserDataScope(Long userId) public void checkUserDataScope(Long userId)
{ {
if (!SysUser.isAdmin(SecurityUtils.getUserId())) if (!SysUser.isAdmin(SecurityUtils.getLoginUser().getUserid()))
{ {
SysUser user = new SysUser(); SysUser user = new SysUser();
user.setUserId(userId); user.setUserId(userId);