lostecho/mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

权限管理接口完善

Browse Source
This commit is contained in:
zhh
2018-10-08 16:51:28 +08:00
parent 7faffe541a
commit ddbdfbdf79
15 changed files with 488 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
mall-admin/src/main/java/com/macro/mall/controller/UmsAdminController.java
View File

@@ -4,12 +4,13 @@ import com.macro.mall.dto.CommonResult;
import com.macro.mall.dto.UmsAdminLoginParam;
import com.macro.mall.dto.UmsAdminParam;
import com.macro.mall.model.UmsAdmin;
import com.macro.mall.model.UmsPermission;
import com.macro.mall.model.UmsRole;
import com.macro.mall.service.UmsAdminService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@@ -30,8 +31,6 @@ import java.util.Map;
public class UmsAdminController {
@Autowired
private UmsAdminService adminService;
@Autowired
private UserDetailsService userDetailsService;
@Value("${jwt.tokenHeader}")
private String tokenHeader;
@Value("${jwt.tokenHead}")
@@ -81,7 +80,7 @@ public class UmsAdminController {
@RequestMapping(value = "/info", method = RequestMethod.GET)
@ResponseBody
public Object getAdminInfo(Principal principal) {
String username = principal.getName();
String username = principal.getName();
UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
Map<String, Object> data = new HashMap<>();
data.put("username", umsAdmin.getUsername());
@@ -100,7 +99,7 @@ public class UmsAdminController {
@ApiOperation("根据用户名或姓名分页获取用户列表")
@RequestMapping(value = "/list",method = RequestMethod.GET)
@ResponseBody
public Object list(@RequestParam("name") String name,
public Object list(@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum){
List<UmsAdmin> adminList = adminService.list(name,pageSize,pageNum);
@@ -136,4 +135,44 @@ public class UmsAdminController {
}
return new CommonResult().failed();
}
@ApiOperation("给用户分配角色")
@RequestMapping(value = "/role/update",method = RequestMethod.POST)
@ResponseBody
public Object updateRole(@RequestParam("adminId") Long adminId,
@RequestParam("roleIds") List<Long> roleIds){
int count = adminService.updateRole(adminId,roleIds);
if(count>=0){
return new CommonResult().success(count);
}
return new CommonResult().failed();
}
@ApiOperation("获取指定用户的角色")
@RequestMapping(value = "/role/{adminId}",method = RequestMethod.GET)
@ResponseBody
public Object getRoleList(@PathVariable Long adminId){
List<UmsRole> roleList = adminService.getRoleList(adminId);
return new CommonResult().success(roleList);
}
@ApiOperation("给用户分配+-权限")
@RequestMapping(value = "/permission/update",method = RequestMethod.POST)
@ResponseBody
public Object updatePermission(@RequestParam Long adminId,
@RequestParam("permissionIds") List<Long> permissionIds){
int count = adminService.updatePermission(adminId,permissionIds);
if(count>0){
return new CommonResult().success(count);
}
return new CommonResult().failed();
}
@ApiOperation("获取用户所有权限（包括+-权限）")
@RequestMapping(value = "/permission/{adminId}",method = RequestMethod.GET)
@ResponseBody
public Object getPermissionList(@PathVariable Long adminId){
List<UmsPermission> permissionList = adminService.getPermissionList(adminId);
return new CommonResult().success(permissionList);
}
}

10
mall-admin/src/main/java/com/macro/mall/controller/UmsPermissionController.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
*/
@Controller
@Api(tags = "UmsPermissionController", description = "后台用户权限管理")
@RequestMapping("/admin/permission")
@RequestMapping("/permission")
public class UmsPermissionController {
@Autowired
private UmsPermissionService permissionService;
@@ -62,4 +62,12 @@ public class UmsPermissionController {
List<UmsPermissionNode> permissionNodeList = permissionService.treeList();
return new CommonResult().success(permissionNodeList);
}
@ApiOperation("获取所有权限列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ResponseBody
public Object list() {
List<UmsPermission> permissionList = permissionService.list();
return new CommonResult().success(permissionList);
}
}

10
mall-admin/src/main/java/com/macro/mall/controller/UmsRoleController.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
*/
@Controller
@Api(tags = "UmsRoleController", description = "后台用户角色管理")
@RequestMapping("/admin/role")
@RequestMapping("/role")
public class UmsRoleController {
@Autowired
private UmsRoleService roleService;
@@ -76,4 +76,12 @@ public class UmsRoleController {
return new CommonResult().failed();
}
@ApiOperation("获取所有角色")
@RequestMapping(value = "/list",method = RequestMethod.GET)
@ResponseBody
public Object list(){
List<UmsRole> roleList = roleService.list();
return new CommonResult().success(roleList);
}
}

14
mall-admin/src/main/java/com/macro/mall/dao/UmsAdminPermissionRelationDao.java Normal file
View File

@@ -0,0 +1,14 @@
package com.macro.mall.dao;
import com.macro.mall.model.UmsAdminPermissionRelation;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 用户权限自定义Dao
* Created by macro on 2018/10/8.
*/
public interface UmsAdminPermissionRelationDao {
int insertList(@Param("list") List<UmsAdminPermissionRelation> list);
}

34
mall-admin/src/main/java/com/macro/mall/dao/UmsAdminRoleRelationDao.java Normal file
View File

@@ -0,0 +1,34 @@
package com.macro.mall.dao;
import com.macro.mall.model.UmsAdminRoleRelation;
import com.macro.mall.model.UmsPermission;
import com.macro.mall.model.UmsRole;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 后台用户与角色管理自定义Dao
* Created by macro on 2018/10/8.
*/
public interface UmsAdminRoleRelationDao {
/**
* 批量插入用户角色关系
*/
int insertList(@Param("list") List<UmsAdminRoleRelation> adminRoleRelationList);
/**
* 获取用于所有角色
*/
List<UmsRole> getRoleList(@Param("adminId") Long adminId);
/**
* 获取用户所有角色权限
*/
List<UmsPermission> getRolePermissionList(@Param("adminId") Long adminId);
/**
* 获取用户所有权限(包括+-权限)
*/
List<UmsPermission> getPermissionList(@Param("adminId") Long adminId);
}

25
mall-admin/src/main/java/com/macro/mall/service/UmsAdminService.java
View File

@@ -2,6 +2,9 @@ package com.macro.mall.service;
import com.macro.mall.dto.UmsAdminParam;
import com.macro.mall.model.UmsAdmin;
import com.macro.mall.model.UmsPermission;
import com.macro.mall.model.UmsRole;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -53,4 +56,26 @@ public interface UmsAdminService {
* 删除指定用户
*/
int delete(Long id);
/**
* 修改用户角色关系
*/
@Transactional
int updateRole(Long adminId, List<Long> roleIds);
/**
* 获取用户对于角色
*/
List<UmsRole> getRoleList(Long adminId);
/**
* 修改用户的+-权限
*/
@Transactional
int updatePermission(Long adminId, List<Long> permissionIds);
/**
* 获取用户所有权限（包括角色权限和+-权限）
*/
List<UmsPermission> getPermissionList(Long adminId);
}

5
mall-admin/src/main/java/com/macro/mall/service/UmsPermissionService.java
View File

@@ -29,4 +29,9 @@ public interface UmsPermissionService {
* 以层级结构返回所有权限
*/
List<UmsPermissionNode> treeList();
/**
* 获取所有权限
*/
List<UmsPermission> list();
}

5
mall-admin/src/main/java/com/macro/mall/service/UmsRoleService.java
View File

@@ -36,4 +36,9 @@ public interface UmsRoleService {
*/
@Transactional
int updatePermission(Long roleId, List<Long> permissionIds);
/**
* 获取角色列表
*/
List<UmsRole> list();
}

130
mall-admin/src/main/java/com/macro/mall/service/impl/UmsAdminServiceImpl.java
View File

@@ -1,10 +1,13 @@
package com.macro.mall.service.impl;
import com.github.pagehelper.PageHelper;
import com.macro.mall.dao.UmsAdminPermissionRelationDao;
import com.macro.mall.dao.UmsAdminRoleRelationDao;
import com.macro.mall.dto.UmsAdminParam;
import com.macro.mall.mapper.UmsAdminMapper;
import com.macro.mall.model.UmsAdmin;
import com.macro.mall.model.UmsAdminExample;
import com.macro.mall.mapper.UmsAdminPermissionRelationMapper;
import com.macro.mall.mapper.UmsAdminRoleRelationMapper;
import com.macro.mall.model.*;
import com.macro.mall.service.UmsAdminService;
import com.macro.mall.util.JwtTokenUtil;
import org.slf4j.Logger;
@@ -21,20 +24,22 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* UmsAdminService实现类
* Created by macro on 2018/4/26.
*/
@Service
public class UmsAdminServiceImpl implements UmsAdminService{
public class UmsAdminServiceImpl implements UmsAdminService {
private static final Logger LOGGER = LoggerFactory.getLogger(UmsAdminServiceImpl.class);
@Autowired
private UmsAdminMapper adminMapper;
@Autowired
private AuthenticationManager authenticationManager;
@Autowired
private UserDetailsService userDetailsService;
@@ -44,13 +49,23 @@ public class UmsAdminServiceImpl implements UmsAdminService{
private PasswordEncoder passwordEncoder;
@Value("${jwt.tokenHead}")
private String tokenHead;
@Autowired
private UmsAdminMapper adminMapper;
@Autowired
private UmsAdminRoleRelationMapper adminRoleRelationMapper;
@Autowired
private UmsAdminRoleRelationDao adminRoleRelationDao;
@Autowired
private UmsAdminPermissionRelationMapper adminPermissionRelationMapper;
@Autowired
private UmsAdminPermissionRelationDao adminPermissionRelationDao;
@Override
public UmsAdmin getAdminByUsername(String username) {
UmsAdminExample example = new UmsAdminExample();
example.createCriteria().andUsernameEqualTo(username);
List<UmsAdmin> adminList = adminMapper.selectByExample(example);
if(adminList!=null&&adminList.size()>0){
if (adminList != null && adminList.size() > 0) {
return adminList.get(0);
}
return null;
@@ -59,12 +74,14 @@ public class UmsAdminServiceImpl implements UmsAdminService{
@Override
public UmsAdmin register(UmsAdminParam umsAdminParam) {
UmsAdmin umsAdmin = new UmsAdmin();
BeanUtils.copyProperties(umsAdminParam,umsAdmin);
BeanUtils.copyProperties(umsAdminParam, umsAdmin);
umsAdmin.setCreateTime(new Date());
umsAdmin.setStatus(1);
//查询是否有相同用户名的用户
UmsAdminExample example = new UmsAdminExample();
example.createCriteria().andUsernameEqualTo(umsAdmin.getUsername());
List<UmsAdmin> umsAdminList = adminMapper.selectByExample(example);
if(umsAdminList.size()>0){
if (umsAdminList.size() > 0) {
return null;
}
//将密码进行加密操作
@@ -78,22 +95,34 @@ public class UmsAdminServiceImpl implements UmsAdminService{
public String login(String username, String password) {
String token = null;
//密码需要客户端加密后传递
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username,passwordEncoder.encodePassword(password,null));
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, passwordEncoder.encodePassword(password, null));
try {
Authentication authentication = authenticationManager.authenticate(authenticationToken);
SecurityContextHolder.getContext().setAuthentication(authentication);
UserDetails userDetails = userDetailsService.loadUserByUsername(username);
token = jwtTokenUtil.generateToken(userDetails);
updateLoginTimeByUsername(username);
} catch (AuthenticationException e) {
LOGGER.warn("登录异常:{}",e.getMessage());
LOGGER.warn("登录异常:{}", e.getMessage());
}
return token;
}
/**
* 根据用户名修改登录时间
*/
private void updateLoginTimeByUsername(String username) {
UmsAdmin record = new UmsAdmin();
record.setLoginTime(new Date());
UmsAdminExample example = new UmsAdminExample();
example.createCriteria().andUsernameEqualTo(username);
adminMapper.updateByExampleSelective(record, example);
}
@Override
public String refreshToken(String oldToken) {
String token = oldToken.substring(tokenHead.length());
if(jwtTokenUtil.canRefresh(token)){
if (jwtTokenUtil.canRefresh(token)) {
return jwtTokenUtil.refreshToken(token);
}
return null;
@@ -106,23 +135,92 @@ public class UmsAdminServiceImpl implements UmsAdminService{
@Override
public List<UmsAdmin> list(String name, Integer pageSize, Integer pageNum) {
PageHelper.startPage(pageNum,pageSize);
PageHelper.startPage(pageNum, pageSize);
UmsAdminExample example = new UmsAdminExample();
UmsAdminExample.Criteria criteria = example.createCriteria();
if(!StringUtils.isEmpty(name)){
criteria.andUsernameLike("%"+name+"%");
example.or(example.createCriteria().andNickNameLike("%"+name+"%"));
if (!StringUtils.isEmpty(name)) {
criteria.andUsernameLike("%" + name + "%");
example.or(example.createCriteria().andNickNameLike("%" + name + "%"));
}
return adminMapper.selectByExample(example);
}
@Override
public int update(Long id, UmsAdmin admin) {
return 0;
admin.setId(id);
return adminMapper.updateByPrimaryKey(admin);
}
@Override
public int delete(Long id) {
return adminMapper.deleteByPrimaryKey(id);
}
@Override
public int updateRole(Long adminId, List<Long> roleIds) {
int count = roleIds == null ? 0 : roleIds.size();
//先删除原来的关系
UmsAdminRoleRelationExample adminRoleRelationExample = new UmsAdminRoleRelationExample();
adminRoleRelationExample.createCriteria().andAdminIdEqualTo(adminId);
adminRoleRelationMapper.deleteByExample(adminRoleRelationExample);
//建立新关系
if (!CollectionUtils.isEmpty(roleIds)) {
List<UmsAdminRoleRelation> list = new ArrayList<>();
for (Long roleId : roleIds) {
UmsAdminRoleRelation roleRelation = new UmsAdminRoleRelation();
roleRelation.setAdminId(adminId);
roleRelation.setRoleId(roleId);
list.add(roleRelation);
}
adminRoleRelationDao.insertList(list);
}
return count;
}
@Override
public List<UmsRole> getRoleList(Long adminId) {
return adminRoleRelationDao.getRoleList(adminId);
}
@Override
public int updatePermission(Long adminId, List<Long> permissionIds) {
//删除原所有权限关系
UmsAdminPermissionRelationExample relationExample = new UmsAdminPermissionRelationExample();
relationExample.createCriteria().andAdminIdEqualTo(adminId);
adminPermissionRelationMapper.deleteByExample(relationExample);
//获取用户所有角色权限
List<UmsPermission> permissionList = adminRoleRelationDao.getRolePermissionList(adminId);
List<Long> rolePermissionList = permissionList.stream().map(UmsPermission::getId).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(permissionIds)) {
List<UmsAdminPermissionRelation> relationList = new ArrayList<>();
//筛选出+权限
List<Long> addPermissionIdList = permissionIds.stream().filter(permissionId -> !rolePermissionList.contains(permissionId)).collect(Collectors.toList());
//筛选出-权限
List<Long> subPermissionIdList = rolePermissionList.stream().filter(permissionId -> !permissionIds.contains(permissionId)).collect(Collectors.toList());
//插入+-权限关系
relationList.addAll(convert(adminId,1,addPermissionIdList));
relationList.addAll(convert(adminId,-1,subPermissionIdList));
return adminPermissionRelationDao.insertList(relationList);
}
return 0;
}
/**
* 将+-权限关系转化为对象
*/
private List<UmsAdminPermissionRelation> convert(Long adminId,Integer type,List<Long> permissionIdList) {
List<UmsAdminPermissionRelation> relationList = permissionIdList.stream().map(permissionId -> {
UmsAdminPermissionRelation relation = new UmsAdminPermissionRelation();
relation.setAdminId(adminId);
relation.setType(type);
relation.setPermissionId(permissionId);
return relation;
}).collect(Collectors.toList());
return relationList;
}
@Override
public List<UmsPermission> getPermissionList(Long adminId) {
return adminRoleRelationDao.getPermissionList(adminId);
}
}

5
mall-admin/src/main/java/com/macro/mall/service/impl/UmsPermissionServiceImpl.java
View File

@@ -52,6 +52,11 @@ public class UmsPermissionServiceImpl implements UmsPermissionService {
return result;
}
@Override
public List<UmsPermission> list() {
return permissionMapper.selectByExample(new UmsPermissionExample());
}
/**
* 将权限转换为带有子级的权限对象
* 当找不到子级权限的时候map操作不会再递归调用covert

5
mall-admin/src/main/java/com/macro/mall/service/impl/UmsRoleServiceImpl.java
View File

@@ -67,4 +67,9 @@ public class UmsRoleServiceImpl implements UmsRoleService {
}
return rolePermissionRelationDao.insertList(relationList);
}
@Override
public List<UmsRole> list() {
return roleMapper.selectByExample(new UmsRoleExample());
}
}

13
mall-admin/src/main/resources/dao/UmsAdminPermissionRelationDao.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.macro.mall.dao.UmsAdminPermissionRelationDao">
<!--批量新增回写主键支持-->
<insert id="insertList">
INSERT INTO ums_admin_permission_relation (admin_id, permission_id, type) VALUES
<foreach collection="list" separator="," item="item" index="index">
(#{item.adminId,jdbcType=BIGINT},
#{item.permissionId,jdbcType=BIGINT},
#{item.type,jdbcType=INTEGER})
</foreach>
</insert>
</mapper>

55
mall-admin/src/main/resources/dao/UmsAdminRoleRelationDao.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.macro.mall.dao.UmsAdminRoleRelationDao">
<!--批量新增回写主键支持-->
<insert id="insertList">
INSERT INTO ums_admin_role_relation (admin_id, role_id) VALUES
<foreach collection="list" separator="," item="item" index="index">
(#{item.adminId,jdbcType=BIGINT},
#{item.roleId,jdbcType=BIGINT})
</foreach>
</insert>
<select id="getRoleList" resultMap="com.macro.mall.mapper.UmsRoleMapper.BaseResultMap">
select r.*
from ums_admin_role_relation ar left join ums_role r on ar.role_id = r.id
where ar.admin_id = #{adminId}
</select>
<select id="getRolePermissionList" resultMap="com.macro.mall.mapper.UmsPermissionMapper.BaseResultMap">
select p.*
from ums_admin_role_relation ar left join ums_role r on ar.role_id = r.id
left join ums_role_permission_relation rp on r.id = rp.role_id
left join ums_permission p on rp.permission_id=p.id
where ar.admin_id = #{adminId} and p.id is not null
</select>
<select id="getPermissionList" resultMap="com.macro.mall.mapper.UmsPermissionMapper.BaseResultMap">
SELECT
p.*
FROM
ums_admin_role_relation ar
LEFT JOIN ums_role r ON ar.role_id = r.id
LEFT JOIN ums_role_permission_relation rp ON r.id = rp.role_id
LEFT JOIN ums_permission p ON rp.permission_id = p.id
WHERE
ar.admin_id = #{adminId}
AND p.id IS NOT NULL
AND p.id NOT IN (
SELECT
p.id
FROM
ums_admin_permission_relation pr
LEFT JOIN ums_permission p ON pr.permission_id = p.id
WHERE
pr.type = - 1
AND pr.admin_id = #{adminId}
)
UNION
SELECT
p.*
FROM
ums_admin_permission_relation pr
LEFT JOIN ums_permission p ON pr.permission_id = p.id
WHERE
pr.type = 1
AND pr.admin_id = #{adminId}
</select>
</mapper>