xservice/xservice-auth-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:auth服务 用户鉴权相关

Browse Source
This commit is contained in:
xiang
2026-03-22 00:36:29 +08:00
parent ace15206ec
commit 6ebdec199b
32 changed files with 166 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xs-service/src/main/java/com/xiang/xservice/auth/service/convert/XDeptConvert.java
View File

@@ -1,15 +1,8 @@
package com.xiang.xservice.auth.service.convert;
import com.xiang.xservice.auth.api.dto.req.dept.DeptAddRequest;
import com.xiang.xservice.auth.api.dto.req.dept.DeptQueryRequest;
import com.xiang.xservice.auth.api.dto.req.dept.DeptUpdateRequest;
import com.xiang.xservice.auth.api.dto.resp.DeptDTO;
import com.xiang.xservice.auth.service.entity.XDept;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.List;
/**
* @Author: xiang
* @Date: 2025-08-29 16:54
@@ -17,11 +10,4 @@ import java.util.List;
@Mapper(componentModel = "spring")
public interface XDeptConvert {
XDeptConvert INSTANCE = Mappers.getMapper(XDeptConvert.class);
XDept toDO(DeptQueryRequest request);
XDept toDO(DeptAddRequest request);
XDept toDO(DeptUpdateRequest request);
DeptDTO toDTO(XDept dept);
List<DeptDTO> toDTOList(List<XDept> dept);
}

67
xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XDept.java
View File

@@ -1,67 +0,0 @@
package com.xiang.xservice.auth.service.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* @Author: xiang
* @Date: 2025-08-29 16:42
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class XDept implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private Long id;
/**
* 名称
*/
private String name;
/**
* 父类id
*/
private Long parentId;
/**
* 路径
*/
private String treePath;
/**
* 排序
*/
private Integer sortNo;
/**
* 创建时间
*/
private LocalDateTime createdTime;
/**
* 创建人
*/
private String createBy;
/**
* 修改时间
*/
private LocalDateTime updatedTime;
/**
* 修改人
*/
private String updateBy;
/**
* 删除标识（0：未删除 1：已删除）
*/
private Integer delFlag;
}

2
xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XMenuDO.java
View File

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("x_menu")
@TableName("sys_menu")
public class XMenuDO {
private static final long serialVersionUID = 1L;

60
xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XRole.java
View File

@@ -1,67 +1,87 @@
package com.xiang.xservice.auth.service.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("sys_role")
public class XRole implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
* 角色id
*/
private Long id;
private Long roleId;
/**
* 名称
* 角色名称
*/
private String name;
private String roleName;
/**
* 编码
* 角色权限字符串
*/
private String code;
private String roleKey;
/**
* 状态（0：禁用 1：启用）
* 显示顺序
*/
private Integer status;
private Integer roleSort;
/**
* data_scope
* 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）
*/
private Integer dataScope;
private String dataScope;
/**
* 创建时间
* 菜单树选择项是否关联显示
*/
private LocalDateTime createdTime;
private Integer menuCheckStrictly;
/**
* 创建人
* 部门树选择项是否关联显示
*/
private Integer deptCheckStrictly;
/**
* 角色状态（0正常 1停用）
*/
private String status;
/**
* 删除标志（0代表存在 2代表删除）
*/
private String delFlag;
/**
* 创建者
*/
private String createBy;
/**
* 修改时间
* 创建时间
*/
private LocalDateTime updatedTime;
private LocalDateTime createTime;
/**
* 修改人
* 更新者
*/
private String updateBy;
/**
* 删除标识（0：未删除 1：已删除）
* 更新时间
*/
private Integer delFlag;
private LocalDateTime updateTime;
/**
* 备注
*/
private String remark;
}

18
xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XUserDept.java
View File

@@ -1,18 +0,0 @@
package com.xiang.xservice.auth.service.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: xiang
* @Date: 2025-08-29 16:44
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class XUserDept {
private Long userId;
private Long deptId;
}

2
xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XUserRole.java
View File

@@ -1,5 +1,6 @@
package com.xiang.xservice.auth.service.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("sys_user_role")
public class XUserRole {
/**

15
xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XDeptMapper.java
View File

@@ -1,13 +1,8 @@
package com.xiang.xservice.auth.service.repository.mapper;
import com.xiang.xservice.auth.service.entity.XDept;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
import java.util.List;
/**
* @Author: xiang
* @Date: 2025-08-29 16:40
@@ -15,14 +10,4 @@ import java.util.List;
@Mapper
@Repository
public interface XDeptMapper {
int insert(XDept record);
int update(XDept record);
int delBatch(@Param("ids") List<Long> ids, @Param("time") LocalDateTime time, @Param("operator") String operator);
List<XDept> getDeptList(XDept record);
XDept getDeptById(Long id);
List<XDept> getDeptByIds(@Param("ids") List<Long> ids);
List<XDept> getDeptByparentId(@Param("parentId") Long parentId);
}

8
xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserDeptMapper.java
View File

@@ -1,12 +1,8 @@
package com.xiang.xservice.auth.service.repository.mapper;
import com.xiang.xservice.auth.service.entity.XUserDept;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @Author: xiang
* @Date: 2025-08-29 17:04
@@ -14,9 +10,5 @@ import java.util.List;
@Mapper
@Repository
public interface XUserDeptMapper {
int addBatch(List<XUserDept> list);
int delByDeptId(Long deptId);
XUserDept getByUserId(@Param("id") Long userId);
}

2
xs-service/src/main/java/com/xiang/xservice/auth/service/service/CustomUserDetailsService.java
View File

@@ -37,7 +37,7 @@ public class CustomUserDetailsService implements UserDetailsService {
List<SimpleGrantedAuthority> grantedAuthorities = Lists.newArrayList();
if (CollectionUtils.isNotEmpty(roleIds)) {
List<XRole> roles = roleMapper.getRoleByIds(roleIds);
grantedAuthorities.addAll(roles.stream().map(role -> new SimpleGrantedAuthority("ROLE_" + role.getCode())).toList());
grantedAuthorities.addAll(roles.stream().map(role -> new SimpleGrantedAuthority("ROLE_" + role.getRoleKey())).toList());
}
return org.springframework.security.core.userdetails.User
.withUsername(user.getUsername())

27
xs-service/src/main/java/com/xiang/xservice/auth/service/service/XDeptService.java
View File

@@ -1,27 +0,0 @@
package com.xiang.xservice.auth.service.service;
import com.xiang.xservice.auth.api.dto.req.dept.DeptAddRequest;
import com.xiang.xservice.auth.api.dto.req.dept.DeptQueryRequest;
import com.xiang.xservice.auth.api.dto.req.dept.DeptUpdateRequest;
import com.xiang.xservice.auth.api.dto.req.dept.DeptUserUpdateRequest;
import com.xiang.xservice.auth.api.dto.resp.DeptDTO;
import java.util.List;
/**
* @Author: xiang
* @Date: 2025-08-29 16:36
*/
public interface XDeptService {
List<DeptDTO> getDeptList(DeptQueryRequest request);
DeptDTO getDeptInfo(Long id);
Boolean addDept(DeptAddRequest request);
Boolean updateDept(DeptUpdateRequest request);
Boolean delDept(List<Long> ids);
Boolean setUserDept(DeptUserUpdateRequest request);
}

25
xs-service/src/main/java/com/xiang/xservice/auth/service/service/XRoleService.java
View File

@@ -1,25 +0,0 @@
package com.xiang.xservice.auth.service.service;
import com.xiang.xservice.auth.api.dto.req.role.RoleAddRequest;
import com.xiang.xservice.auth.api.dto.req.role.RoleQueryRequest;
import com.xiang.xservice.auth.api.dto.req.role.RoleUpdateRequest;
import com.xiang.xservice.auth.api.dto.req.role.RoleUserUpdateRequest;
import com.xiang.xservice.auth.api.dto.resp.RoleDTO;
import java.util.List;
public interface XRoleService {
List<RoleDTO> getRoleList(RoleQueryRequest request);
RoleDTO getRoleInfo(Long id);
Boolean addRole(RoleAddRequest request);
Boolean updateRole(RoleUpdateRequest request);
Boolean delRole(List<Long> ids);
Boolean setUserRole(RoleUserUpdateRequest request);
}

19
xs-service/src/main/java/com/xiang/xservice/auth/service/service/XUserService.java
View File

@@ -5,9 +5,7 @@ import com.xiang.xservice.auth.api.dto.req.LoginRequest;
import com.xiang.xservice.auth.api.dto.req.RefreshRequest;
import com.xiang.xservice.auth.api.dto.req.RegisterRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserDeptUpdateRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserRoleUpdateRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
import com.xiang.xservice.auth.api.dto.resp.LoginResp;
import com.xiang.xservice.auth.api.dto.resp.RegisterResp;
@@ -19,31 +17,16 @@ import java.util.List;
public interface XUserService {
LoginResp login(LoginRequest request);
UserResp getUserByUsername(String username);
RegisterResp userRegister(RegisterRequest request);
Page<UserResp> getUserList(UserQueryRequest request);
UserResp getUserInfo(Long id);
Boolean addUser(UserAddRequest request);
Boolean updateUser(UserUpdateRequest request);
Boolean delUser(List<Long> ids);
Boolean setUserDept(UserDeptUpdateRequest request);
Boolean setUserRole(UserRoleUpdateRequest request);
UserDTO getUserDetail(String username);
LoginResp refresh(RefreshRequest request);
Boolean updateStatus(Long id, Integer status);
Long getUserId(String token);
Long getTenantId(String token);
Boolean resetPwd(Long userId, String password);
}

102
xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XDeptServiceImpl.java
View File

@@ -1,102 +0,0 @@
package com.xiang.xservice.auth.service.service.impl;
import com.google.common.collect.Lists;
import com.xiang.xservice.auth.api.code.Code03DeptErrorCode;
import com.xiang.xservice.auth.api.dto.req.dept.DeptAddRequest;
import com.xiang.xservice.auth.api.dto.req.dept.DeptQueryRequest;
import com.xiang.xservice.auth.api.dto.req.dept.DeptUpdateRequest;
import com.xiang.xservice.auth.api.dto.req.dept.DeptUserUpdateRequest;
import com.xiang.xservice.auth.api.dto.resp.DeptDTO;
import com.xiang.xservice.auth.service.convert.XDeptConvert;
import com.xiang.xservice.auth.service.entity.XDept;
import com.xiang.xservice.auth.service.entity.XUserDept;
import com.xiang.xservice.auth.service.repository.mapper.XDeptMapper;
import com.xiang.xservice.auth.service.repository.mapper.XUserDeptMapper;
import com.xiang.xservice.auth.service.service.XDeptService;
import com.xiang.xservice.basic.exception.BusinessException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
/**
* @Author: xiang
* @Date: 2025-08-29 16:39
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class XDeptServiceImpl implements XDeptService {
private final static int BATCH_SIZE = 500;
private final XDeptMapper deptMapper;
private final XDeptConvert deptConvert;
private final XUserDeptMapper userDeptMapper;
@Override
public List<DeptDTO> getDeptList(DeptQueryRequest request) {
return deptConvert.toDTOList(deptMapper.getDeptList(deptConvert.toDO(request)));
}
@Override
public DeptDTO getDeptInfo(Long id) {
return deptConvert.toDTO(deptMapper.getDeptById(id));
}
@Override
public Boolean addDept(DeptAddRequest request) {
XDept dept = deptConvert.toDO(request);
return deptMapper.insert(dept) > 0;
}
@Override
public Boolean updateDept(DeptUpdateRequest request) {
XDept dept = deptConvert.toDO(request);
dept.setCreateBy(request.getOperator());
dept.setUpdateBy(request.getOperator());
return deptMapper.update(dept) > 0;
}
@Override
public Boolean delDept(List<Long> ids) {
return deptMapper.delBatch(ids, LocalDateTime.now(), "admin") > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean setUserDept(DeptUserUpdateRequest request) {
XDept dept = deptMapper.getDeptById(request.getDeptId());
if (Objects.isNull(dept)) {
log.error("查询部门信息不存在！部门id:{}", request.getDeptId());
throw new BusinessException(Code03DeptErrorCode.DEPT_NOT_EXISTS);
}
List<XUserDept> result = Lists.newArrayList();
for (Long userId : request.getUserIds()) {
XUserDept userDept = new XUserDept();
userDept.setDeptId(request.getDeptId());
userDept.setUserId(userId);
result.add(userDept);
}
boolean flag = true;
if (userDeptMapper.delByDeptId(request.getDeptId()) <= 0) {
return Boolean.FALSE;
}
if (CollectionUtils.isNotEmpty(result)) {
if (result.size() > BATCH_SIZE) {
List<List<XUserDept>> partition = Lists.partition(result, BATCH_SIZE);
for (List<XUserDept> list : partition) {
if (userDeptMapper.addBatch(list) <= 0) {
flag = false;
}
}
} else {
return userDeptMapper.addBatch(result) > 0;
}
}
return flag;
}
}

106
xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XRoleServiceImpl.java
View File

@@ -1,106 +0,0 @@
package com.xiang.xservice.auth.service.service.impl;
import com.google.common.collect.Lists;
import com.xiang.xservice.auth.api.code.Code02RoleErrorCode;
import com.xiang.xservice.auth.api.dto.req.role.RoleAddRequest;
import com.xiang.xservice.auth.api.dto.req.role.RoleQueryRequest;
import com.xiang.xservice.auth.api.dto.req.role.RoleUpdateRequest;
import com.xiang.xservice.auth.api.dto.req.role.RoleUserUpdateRequest;
import com.xiang.xservice.auth.api.dto.resp.RoleDTO;
import com.xiang.xservice.auth.service.convert.XRoleConvert;
import com.xiang.xservice.auth.service.entity.XRole;
import com.xiang.xservice.auth.service.entity.XUserRole;
import com.xiang.xservice.auth.service.repository.mapper.XRoleMapper;
import com.xiang.xservice.auth.service.repository.mapper.XUserRoleMapper;
import com.xiang.xservice.auth.service.service.XRoleService;
import com.xiang.xservice.basic.exception.BusinessException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@Slf4j
@Service
@RequiredArgsConstructor
public class XRoleServiceImpl implements XRoleService {
private final static int BATCH_SIZE = 500;
private final XRoleMapper roleMapper;
private final XUserRoleMapper userRoleMapper;
private final XRoleConvert roleConvert;
@Override
public List<RoleDTO> getRoleList(RoleQueryRequest request) {
List<XRole> roleList = roleMapper.getRoleList(roleConvert.toDO(request));
if (CollectionUtils.isEmpty(roleList)) {
return Lists.newArrayList();
}
return roleConvert.toDTOList(roleList);
}
@Override
public RoleDTO getRoleInfo(Long id) {
XRole role = roleMapper.getRoleById(id);
return roleConvert.toDTO(role);
}
@Override
public Boolean addRole(RoleAddRequest request) {
XRole role = roleConvert.toDO(request);
role.setCreateBy(request.getOperator());
role.setUpdateBy(request.getOperator());
return roleMapper.insert(role) > 0;
}
@Override
public Boolean updateRole(RoleUpdateRequest request) {
XRole role = roleConvert.toDO(request);
role.setCreateBy(request.getOperator());
role.setUpdateBy(request.getOperator());
return roleMapper.update(role) > 0;
}
@Override
public Boolean delRole(List<Long> ids) {
return roleMapper.delBatch(ids, LocalDateTime.now(), "System") > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean setUserRole(RoleUserUpdateRequest request) {
XRole role = roleMapper.getRoleById(request.getRoleId());
if (Objects.isNull(role)) {
log.error("查询角色信息不存在！角色id:{}", request.getRoleId());
throw new BusinessException(Code02RoleErrorCode.ROLE_NOT_EXISTS);
}
List<XUserRole> params = Lists.newArrayList();
for (Long userId : request.getUserIds()) {
XUserRole xUserRole = new XUserRole();
xUserRole.setRoleId(request.getRoleId());
xUserRole.setUserId(userId);
params.add(xUserRole);
}
boolean flag = Boolean.TRUE;
if (userRoleMapper.delByRoleIds(Collections.singletonList(request.getRoleId())) <= 0) {
return Boolean.FALSE;
}
if (CollectionUtils.isNotEmpty(params)) {
if (params.size() > BATCH_SIZE) {
List<List<XUserRole>> partition = Lists.partition(params, BATCH_SIZE);
for (List<XUserRole> list : partition) {
if (userRoleMapper.addBatch(list) <= 0) {
flag = false;
}
}
} else {
return userRoleMapper.addBatch(params) > 0;
}
}
return flag;
}
}

86
xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java
View File

@@ -8,14 +8,11 @@ import com.google.common.collect.Sets;
import com.xiang.xmc.service.cache.service.IRedisService;
import com.xiang.xservice.auth.api.code.Code01UserErrorCode;
import com.xiang.xservice.auth.api.code.Code02RoleErrorCode;
import com.xiang.xservice.auth.api.code.Code03DeptErrorCode;
import com.xiang.xservice.auth.api.dto.req.LoginRequest;
import com.xiang.xservice.auth.api.dto.req.RefreshRequest;
import com.xiang.xservice.auth.api.dto.req.RegisterRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserDeptUpdateRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserRoleUpdateRequest;
import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
import com.xiang.xservice.auth.api.dto.resp.LoginResp;
import com.xiang.xservice.auth.api.dto.resp.RegisterResp;
@@ -26,12 +23,10 @@ import com.xiang.xservice.auth.service.convert.XDeptConvert;
import com.xiang.xservice.auth.service.convert.XPermissionConvert;
import com.xiang.xservice.auth.service.convert.XRoleConvert;
import com.xiang.xservice.auth.service.convert.XUserConvert;
import com.xiang.xservice.auth.service.entity.XDept;
import com.xiang.xservice.auth.service.entity.XPermission;
import com.xiang.xservice.auth.service.entity.XRole;
import com.xiang.xservice.auth.service.entity.XRolePermission;
import com.xiang.xservice.auth.service.entity.XUser;
import com.xiang.xservice.auth.service.entity.XUserDept;
import com.xiang.xservice.auth.service.entity.XUserRole;
import com.xiang.xservice.auth.service.enums.UserStatusEnum;
import com.xiang.xservice.auth.service.repository.mapper.XDeptMapper;
@@ -63,7 +58,6 @@ import org.springframework.security.oauth2.jwt.JwtDecoder;
import org.springframework.security.oauth2.jwt.JwtEncoder;
import org.springframework.security.oauth2.jwt.JwtEncoderParameters;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.Instant;
import java.time.LocalDateTime;
@@ -118,7 +112,7 @@ public class XUserServiceImpl implements XUserService {
if (CollectionUtils.isEmpty(roles)) {
throw new BusinessException(Code02RoleErrorCode.ROLE_NOT_EXISTS);
}
roleCodes.addAll(roles.stream().map(XRole::getCode).toList());
roleCodes.addAll(roles.stream().map(XRole::getRoleKey).toList());
}
if (StringUtils.isNotBlank(user.getToken())) {
try {
@@ -175,26 +169,6 @@ public class XUserServiceImpl implements XUserService {
return loginResp;
}
@Override
public UserResp getUserByUsername(String username) {
XUser user = userMapper.selectByUsername(username);
if (Objects.isNull(user)) {
throw new BusinessException(Code01UserErrorCode.USER_NOT_EXISTS);
}
UserResp userResp = new UserResp();
userResp.setName(user.getName());
userResp.setUsername(user.getUsername());
userResp.setEmail(user.getEmail());
userResp.setPhone(user.getPhone());
userResp.setAvatar(user.getAvatar());
userResp.setLoginIp(user.getLoginIp());
userResp.setLoginDate(user.getLoginDate());
userResp.setStatus(user.getStatus());
userResp.setUpdateTime(user.getUpdateTime());
return userResp;
}
@Override
public RegisterResp userRegister(RegisterRequest request) {
// todo 手机号验证码校验
@@ -291,33 +265,6 @@ public class XUserServiceImpl implements XUserService {
return userMapper.deleteBatch(ids, LocalDateTime.now(), "System") > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean setUserDept(UserDeptUpdateRequest request) {
return null;
}
@Override
public Boolean setUserRole(UserRoleUpdateRequest request) {
XUser user = userMapper.getUserById(request.getUserId());
if (Objects.isNull(user)) {
log.error("查询用户信息不存在！用户id:{}", request.getUserId());
throw new BusinessException(Code01UserErrorCode.USER_NOT_EXISTS);
}
List<XUserRole> params = Lists.newArrayList();
for (Long roleId : request.getRoleIds()) {
XUserRole userRole = new XUserRole();
userRole.setRoleId(roleId);
userRole.setUserId(request.getUserId());
params.add(userRole);
}
if (CollectionUtils.isNotEmpty(params)) {
return userRoleMapper.insertUserRole(params) > 0;
}
return Boolean.FALSE;
}
@Override
public UserDTO getUserDetail(String username) {
UserDTO dto = new UserDTO();
@@ -333,15 +280,15 @@ public class XUserServiceImpl implements XUserService {
throw new BusinessException(Code02RoleErrorCode.ROLE_NOT_EXISTS);
}
dto.setRoles(roleConvert.toDTOList(roles));
XUserDept userDept = userDeptMapper.getByUserId(user.getId());
if (Objects.nonNull(userDept)) {
Long deptId = userDept.getDeptId();
XDept dept = deptMapper.getDeptById(deptId);
if (Objects.isNull(dept)) {
throw new BusinessException(Code03DeptErrorCode.DEPT_NOT_EXISTS);
}
dto.setDept(deptConvert.toDTO(dept));
}
// XUserDept userDept = userDeptMapper.getByUserId(user.getId());
// if (Objects.nonNull(userDept)) {
// Long deptId = userDept.getDeptId();
// XDept dept = deptMapper.getDeptById(deptId);
// if (Objects.isNull(dept)) {
// throw new BusinessException(Code03DeptErrorCode.DEPT_NOT_EXISTS);
// }
// dto.setDept(deptConvert.toDTO(dept));
// }
List<XRolePermission> permissionsByRoleIds = rolePermissionMapper.getRolePermissionsByRoleIds(roleIds);
if (CollectionUtils.isNotEmpty(permissionsByRoleIds)) {
List<Long> permissionIds = permissionsByRoleIds.stream().map(XRolePermission::getPermissionId).toList();
@@ -378,7 +325,7 @@ public class XUserServiceImpl implements XUserService {
if (CollectionUtils.isNotEmpty(userRoles)) {
List<XRole> roles = roleMapper.getRoleByIds(userRoles.stream().map(XUserRole::getRoleId).collect(Collectors.toList()));
if (CollectionUtils.isNotEmpty(roles)) {
roleCodes.addAll(roles.stream().map(XRole::getCode).toList());
roleCodes.addAll(roles.stream().map(XRole::getRoleKey).toList());
}
}
// 生成新的 accessToken
@@ -435,4 +382,15 @@ public class XUserServiceImpl implements XUserService {
throw new BusinessException(Code01UserErrorCode.TOKEN_NOT_VALID);
}
}
@Override
public Boolean resetPwd(Long userId, String password) {
XUser user = userMapper.getUserById(userId);
if (Objects.isNull(user)) {
throw new BusinessException(Code01UserErrorCode.USER_NOT_EXISTS);
}
String encodePwd = passwordEncoder.encode(password);
user.setPassword(encodePwd);
return userMapper.update(user) > 0;
}
}

140
xs-service/src/main/resources/mapper/user/XDeptMapper.xml
View File

@@ -3,144 +3,4 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xiang.xservice.auth.service.repository.mapper.XDeptMapper">
<resultMap id="BaseResultMap" type="com.xiang.xservice.auth.service.entity.XDept" >
<result column="name" property="name" />
<result column="parent_id" property="parentId" />
<result column="tree_path" property="treePath" />
<result column="sort_no" property="sortNo" />
<result column="created_time" property="createdTime" />
<result column="create_by" property="createBy" />
<result column="updated_time" property="updatedTime" />
<result column="update_by" property="updateBy" />
<result column="del_flag" property="delFlag" />
</resultMap>
<sql id="Base_Column_List">
name,
parent_id,
tree_path,
sort_no,
created_time,
create_by,
updated_time,
update_by,
del_flag
</sql>
<insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.xiang.xservice.auth.service.entity.XUserDept">
INSERT INTO x_dept
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="null != name and '' != name">
name,
</if>
<if test="null != parentId ">
parent_id,
</if>
<if test="null != treePath and '' != treePath">
tree_path,
</if>
<if test="null != sortNo ">
sort_no,
</if>
<if test="null != createdTime ">
created_time,
</if>
<if test="null != createBy and '' != createBy">
create_by,
</if>
<if test="null != updatedTime ">
updated_time,
</if>
<if test="null != updateBy and '' != updateBy">
update_by,
</if>
<if test="null != delFlag ">
del_flag
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="null != name and '' != name">
#{name},
</if>
<if test="null != parentId ">
#{parentId},
</if>
<if test="null != treePath and '' != treePath">
#{treePath},
</if>
<if test="null != sortNo ">
#{sortNo},
</if>
<if test="null != createdTime ">
#{createdTime},
</if>
<if test="null != createBy and '' != createBy">
#{createBy},
</if>
<if test="null != updatedTime ">
#{updatedTime},
</if>
<if test="null != updateBy and '' != updateBy">
#{updateBy},
</if>
<if test="null != delFlag ">
#{delFlag}
</if>
</trim>
</insert>
<update id="delBatch" >
update x_dept
SET del_flag = 1, updated_time = now(), update_by = #{updateBy}
WHERE id IN
<foreach item="item" collection="ids" separator="," open="(" close=")">
#{item}
</foreach>
</update>
<update id="update" parameterType="com.xiang.xservice.auth.service.entity.XUserDept">
UPDATE x_dept
<set>
<if test="null != name and '' != name">name = #{name},</if>
<if test="null != parentId ">parent_id = #{parentId},</if>
<if test="null != treePath and '' != treePath">tree_path = #{treePath},</if>
<if test="null != sortNo ">sort_no = #{sortNo},</if>
<if test="null != createdTime ">created_time = #{createdTime},</if>
<if test="null != createBy and '' != createBy">create_by = #{createBy},</if>
<if test="null != updatedTime ">updated_time = #{updatedTime},</if>
<if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
<if test="null != delFlag ">del_flag = #{delFlag}</if>
</set>
WHERE id = #{id}
</update>
<select id="getDeptList" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_dept
<trim prefix="AND">
<where>
del_flag = 0
<if test="name != null and name != ''">AND name = #{name}</if>
</where>
</trim>
</select>
<select id="getDeptById" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_dept
where id = #{id}
</select>
<select id="getDeptByIds" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_dept
where id in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</select>
<select id="getDeptByparentId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_dept
where parent_id = #{parentId}
</select>
</mapper>

13
xs-service/src/main/resources/mapper/user/XMenuMapper.xml
View File

@@ -7,7 +7,6 @@
<resultMap type="com.xiang.xservice.auth.service.entity.XMenuDO" id="SysMenuResult">
<id property="menuId" column="menu_id" />
<result property="menuName" column="menu_name" />
<result property="parentName" column="parent_name" />
<result property="parentId" column="parent_id" />
<result property="orderNum" column="order_num" />
<result property="path" column="path" />
@@ -22,12 +21,6 @@
<result property="perms" column="perms" />
<result property="icon" column="icon" />
</resultMap>
<sql id="selectMenuVo">
select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
from x_menu
</sql>
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id,
m.parent_id,
@@ -45,10 +38,10 @@
m.icon,
m.order_num,
m.create_time
from x_menu m
left join x_role_menu rm on m.menu_id = rm.menu_id
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join x_user_role ur on rm.role_id = ur.role_id
left join x_role ro on ur.role_id = ro.id
left join sys_role ro on ur.role_id = ro.id
left join x_user u on ur.user_id = u.id
where u.id = #{userId}
and m.menu_type in ('M', 'C')

10
xs-service/src/main/resources/mapper/user/XPermission.xml
View File

@@ -181,11 +181,11 @@
where id = #{id}
</select>
<select id="loadAllPermission" resultType="com.xiang.xservice.auth.api.dto.resp.PermissionRoleDTO">
select p.api_path api_url, p.method, r.code as role_code
from x_permission p
join x_role_permission rp on p.id = rp.permission_id
join x_role r on rp.role_id = r.id
where p.del_flag = 0 and r.del_flag = 0 and r.status = 1
-- select p.api_path api_url, p.method, r.code as role_code
-- from x_permission p
-- join x_role_permission rp on p.id = rp.permission_id
-- join x_role r on rp.role_id = r.id
-- where p.del_flag = 0 and r.del_flag = 0 and r.status = 1
</select>
</mapper>

126
xs-service/src/main/resources/mapper/user/XRoleMapper.xml
View File

@@ -4,126 +4,56 @@
<mapper namespace="com.xiang.xservice.auth.service.repository.mapper.XRoleMapper">
<resultMap id="BaseResultMap" type="com.xiang.xservice.auth.service.entity.XRole" >
<result column="id" property="id" />
<result column="name" property="name" />
<result column="code" property="code" />
<result column="status" property="status" />
<result column="role_id" property="roleId" />
<result column="role_name" property="roleName" />
<result column="role_key" property="roleKey" />
<result column="role_sort" property="roleSort" />
<result column="data_scope" property="dataScope" />
<result column="created_time" property="createdTime" />
<result column="create_by" property="createBy" />
<result column="updated_time" property="updatedTime" />
<result column="update_by" property="updateBy" />
<result column="menu_check_strictly" property="menuCheckStrictly" />
<result column="dept_check_strictly" property="deptCheckStrictly" />
<result column="status" property="status" />
<result column="del_flag" property="delFlag" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="remark" property="remark" />
</resultMap>
<sql id="Base_Column_List">
id,
name,
code,
status,
role_id,
role_name,
role_key,
role_sort,
data_scope,
created_time,
menu_check_strictly,
dept_check_strictly,
status,
del_flag,
create_by,
updated_time,
create_time,
update_by,
del_flag
update_time,
remark
</sql>
<insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.xiang.xservice.auth.service.entity.XRole">
INSERT INTO x_role
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="null != name and '' != name">
name,
</if>
<if test="null != code and '' != code">
code,
</if>
<if test="null != status ">
status,
</if>
<if test="null != dataScope ">
data_scope,
</if>
<if test="null != createdTime ">
created_time,
</if>
<if test="null != createBy and '' != createBy">
create_by,
</if>
<if test="null != updatedTime ">
updated_time,
</if>
<if test="null != updateBy and '' != updateBy">
update_by,
</if>
<if test="null != delFlag ">
del_flag
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="null != name and '' != name">
#{name},
</if>
<if test="null != code and '' != code">
#{code},
</if>
<if test="null != status ">
#{status},
</if>
<if test="null != dataScope ">
#{dataScope},
</if>
<if test="null != createdTime ">
#{createdTime},
</if>
<if test="null != createBy and '' != createBy">
#{createBy},
</if>
<if test="null != updatedTime ">
#{updatedTime},
</if>
<if test="null != updateBy and '' != updateBy">
#{updateBy},
</if>
<if test="null != delFlag ">
#{delFlag}
</if>
</trim>
</insert>
<update id="delBatch" >
update x_role set del_flag = 0, update_time = #{time}, update_by = #{operator} where id in
update sys_role set del_flag = 0, update_time = #{time}, update_by = #{operator} where id in
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</update>
<update id="update" parameterType="com.xiang.xservice.auth.service.entity.XRole">
UPDATE x_role
<set>
<if test="null != name and '' != name">name = #{name},</if>
<if test="null != code and '' != code">code = #{code},</if>
<if test="null != status ">status = #{status},</if>
<if test="null != dataScope ">data_scope = #{dataScope},</if>
<if test="null != createdTime ">created_time = #{createdTime},</if>
<if test="null != createBy and '' != createBy">create_by = #{createBy},</if>
<if test="null != updatedTime ">updated_time = #{updatedTime},</if>
<if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
<if test="null != delFlag ">del_flag = #{delFlag}</if>
</set>
WHERE id = #{id}
</update>
<select id="getRoleById" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_role
from sys_role
where id = #{id}
</select>
<select id="getRoleList" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_role
from sys_role
<trim prefix="AND">
<if test="name != null and name != ''">
AND name = #{name}
@@ -141,8 +71,8 @@
</select>
<select id="getRoleByIds" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_role
where id in
from sys_role
where role_id in
<foreach collection="ids" item="id" close=")" open="(" separator=",">
#{id}
</foreach>

23
xs-service/src/main/resources/mapper/user/XUserDeptMapper.xml
View File

@@ -3,28 +3,5 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xiang.xservice.auth.service.repository.mapper.XUserDeptMapper">
<resultMap id="BaseResultMap" type="com.xiang.xservice.auth.service.entity.XUserDept" >
<result column="user_id" property="userId" />
<result column="dept_id" property="deptId" />
</resultMap>
<sql id="Base_Column_List">
user_id,
dept_id
</sql>
<insert id="addBatch">
insert into x_user_data_scope_dept(user_id, dept_id) values
<foreach collection="list" item="item" separator=",">
(#{item.userId}, #{item.deptId})
</foreach>
</insert>
<delete id="delByDeptId">
delete from x_user_data_scope_dept where dept_id = #{deptId}
</delete>
<select id="getByUserId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_user_data_scope_dept where user_id = #{id}
</select>
</mapper>

10
xs-service/src/main/resources/mapper/user/XUserRoleMapper.xml
View File

@@ -13,7 +13,7 @@
role_id
</sql>
<insert id="insertUserRole">
insert into x_user_role(user_id, role_id)
insert into sys_user_role(user_id, role_id)
values
<foreach collection="list" item="item" separator=",">
(#{item.userId}, #{item.roleId})
@@ -21,18 +21,18 @@
</insert>
<delete id="delByUserId">
delete from x_user_role where user_id = #{userId}
delete from sys_user_role where user_id = #{userId}
</delete>
<delete id="delByRoleIds">
delete from x_user_role where role_id in
delete from sys_user_role where role_id in
<foreach collection="list" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</delete>
<insert id="addBatch">
insert into x_user_role(user_id, role_id) values
insert into sys_user_role(user_id, role_id) values
<foreach collection="list" item="item" separator=",">
(#{item.userId}, #{item.roleId})
</foreach>
@@ -40,7 +40,7 @@
<select id="getByUserId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"/>
from x_user_role
from sys_user_role
where user_id = #{userId}
</select>