|
@@ -5,13 +5,11 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.macro.mall.bo.AdminUserDetails;
|
|
|
import com.macro.mall.common.exception.Asserts;
|
|
|
-import com.macro.mall.dao.UmsAdminPermissionRelationDao;
|
|
|
import com.macro.mall.dao.UmsAdminRoleRelationDao;
|
|
|
import com.macro.mall.dto.UmsAdminParam;
|
|
|
import com.macro.mall.dto.UpdateAdminPasswordParam;
|
|
|
import com.macro.mall.mapper.UmsAdminLoginLogMapper;
|
|
|
import com.macro.mall.mapper.UmsAdminMapper;
|
|
|
-import com.macro.mall.mapper.UmsAdminPermissionRelationMapper;
|
|
|
import com.macro.mall.mapper.UmsAdminRoleRelationMapper;
|
|
|
import com.macro.mall.model.*;
|
|
|
import com.macro.mall.security.util.JwtTokenUtil;
|
|
@@ -21,7 +19,6 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.security.authentication.BadCredentialsException;
|
|
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
|
|
import org.springframework.security.core.AuthenticationException;
|
|
|
import org.springframework.security.core.context.SecurityContextHolder;
|
|
@@ -38,7 +35,6 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* UmsAdminService实现类
|
|
@@ -58,10 +54,6 @@ public class UmsAdminServiceImpl implements UmsAdminService {
|
|
|
@Autowired
|
|
|
private UmsAdminRoleRelationDao adminRoleRelationDao;
|
|
|
@Autowired
|
|
|
- private UmsAdminPermissionRelationMapper adminPermissionRelationMapper;
|
|
|
- @Autowired
|
|
|
- private UmsAdminPermissionRelationDao adminPermissionRelationDao;
|
|
|
- @Autowired
|
|
|
private UmsAdminLoginLogMapper loginLogMapper;
|
|
|
@Autowired
|
|
|
private UmsAdminCacheService adminCacheService;
|
|
@@ -242,48 +234,6 @@ public class UmsAdminServiceImpl implements UmsAdminService {
|
|
|
}
|
|
|
|
|
|
@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);
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
public int updatePassword(UpdateAdminPasswordParam param) {
|
|
|
if(StrUtil.isEmpty(param.getUsername())
|
|
|
||StrUtil.isEmpty(param.getOldPassword())
|