Commit d41b12c3 authored by 王蔡翾's avatar 王蔡翾
Browse files

角色和权限

parent 8be79951
package com.ruzhoukj.sms.controller;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import com.ruzhoukj.sms.pojo.dto.SysPermissionDTO;
import com.ruzhoukj.sms.pojo.vo.SysPermissionVO;
import com.ruzhoukj.sms.service.SysPermissionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@Api(tags = "权限管理")
@RestController
@RequestMapping("/sys/permission")
public class SysPermissionController extends BaseController {
@Resource
private SysPermissionService sysPermissionService;
@ApiOperation(value="权限列表")
@GetMapping("/list")
public Result<List<SysPermissionVO>> list() {
return Result.data(sysPermissionService.queryPermissionList());
}
@ApiOperation(value="权限新增和修改")
@PostMapping("add/update")
public Result<Boolean> add(@RequestBody SysPermissionDTO sysPermissionDTO) {
return Result.data(sysPermissionService.saveOrUpdate(sysPermissionService.levelUpdate(sysPermissionDTO)));
}
@ApiOperation(value="权限删除")
@DeleteMapping("/delete/{id}")
public Result<Boolean> delete(@PathVariable("id") String id) {
return Result.data(sysPermissionService.removeById(id));
}
}
...@@ -2,10 +2,12 @@ package com.ruzhoukj.sms.controller; ...@@ -2,10 +2,12 @@ package com.ruzhoukj.sms.controller;
import com.platform.controller.BaseController; import com.platform.controller.BaseController;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
import com.platform.utils.StringUtils;
import com.ruzhoukj.sms.pojo.dto.SysRoleDTO; import com.ruzhoukj.sms.pojo.dto.SysRoleDTO;
import com.ruzhoukj.sms.pojo.vo.SysRoleVO; import com.ruzhoukj.sms.pojo.vo.SysRoleVO;
import com.ruzhoukj.sms.service.SysRoleService; import com.ruzhoukj.sms.service.SysRoleService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -23,14 +25,28 @@ public class SysRoleController extends BaseController { ...@@ -23,14 +25,28 @@ public class SysRoleController extends BaseController {
return Result.data(sysRoleService.queryRoleList()); return Result.data(sysRoleService.queryRoleList());
} }
@PostMapping("/add") @ApiOperation(value="角色新增和修改,并创建角色和权限关联")
@PostMapping("add/update")
public Result<Boolean> add(@RequestBody SysRoleDTO sysRoleDTO){ public Result<Boolean> add(@RequestBody SysRoleDTO sysRoleDTO){
return Result.data(sysRoleService.saveOrUpdate(sysRoleDTO)); if (StringUtils.isEmpty(sysRoleDTO.getName()))
return Result.fail("名称为空");
if (!sysRoleService.checkRole(sysRoleDTO)&&!sysRoleService.checkName(sysRoleDTO))
return Result.fail("角色名称已存在");
if (sysRoleService.createRoleWithPermissions(sysRoleDTO))
return Result.success("操作成功");
return Result.fail("名称超过20或描述超过限制");
} }
@ApiOperation(value="删除")
@DeleteMapping("/delete/{id}") @DeleteMapping("delete/{id}")
public Result<Boolean> delete(@PathVariable Integer id){ public Result<Boolean> delete(@PathVariable("id") Integer id){
return Result.data(sysRoleService.removeById(id)); if (!sysRoleService.checkUser(id))
return Result.fail("该角色下存在用户,请先删除用户");
return Result.data(sysRoleService.removeByRoleId(id));
}
@ApiOperation(value="查询角色详情")
@GetMapping("query/{id}")
public Result<SysRoleVO> query(@PathVariable("id") Integer id){
return Result.data(sysRoleService.queryRoleByRoleId(id));
} }
} }
...@@ -25,5 +25,5 @@ public interface SysRolePermissionMapper extends BaseMapper<SysRolePermissionEnt ...@@ -25,5 +25,5 @@ public interface SysRolePermissionMapper extends BaseMapper<SysRolePermissionEnt
* @param roleId * @param roleId
* @return * @return
*/ */
Boolean deleteByRoleId(String roleId); Boolean deleteByRoleId(Integer roleId);
} }
...@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruzhoukj.sms.pojo.vo.SysRolePermissionVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List;
@TableName("sys_role") @TableName("sys_role")
@Data @Data
public class SysRoleEntity { public class SysRoleEntity {
...@@ -13,4 +17,7 @@ public class SysRoleEntity { ...@@ -13,4 +17,7 @@ public class SysRoleEntity {
private Integer id; private Integer id;
@TableField("name") @TableField("name")
private String name; private String name;
@ApiModelProperty(value = "功能权限")
@TableField(exist = false)
private List<SysRolePermissionVO> permissionList;
} }
...@@ -94,4 +94,8 @@ public class UserEntity { ...@@ -94,4 +94,8 @@ public class UserEntity {
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "用户ID") @ApiModelProperty(value = "用户ID")
private String userId; private String userId;
@TableField("role_id")
private Integer roleId;
} }
package com.ruzhoukj.sms.filter; //package com.ruzhoukj.sms.filter;
//
import com.ruzhoukj.sms.util.JwtUtil; //import com.ruzhoukj.sms.util.JwtUtil;
import com.sun.istack.NotNull; //import com.sun.istack.NotNull;
import lombok.RequiredArgsConstructor; //import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import lombok.var; //import lombok.var;
import org.springframework.core.Ordered; //import org.springframework.core.Ordered;
import org.springframework.http.HttpHeaders; //import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; //import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
import org.springframework.util.AntPathMatcher; //import org.springframework.util.AntPathMatcher;
import org.springframework.web.filter.OncePerRequestFilter; //import org.springframework.web.filter.OncePerRequestFilter;
//
import javax.servlet.FilterChain; //import javax.servlet.FilterChain;
import javax.servlet.ServletException; //import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; //import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; //import javax.servlet.http.HttpServletResponse;
import java.io.IOException; //import java.io.IOException;
import java.util.Arrays; //import java.util.Arrays;
import java.util.List; //import java.util.List;
//
@Slf4j //@Slf4j
@Component //@Component
@RequiredArgsConstructor //@RequiredArgsConstructor
public class JwtAuthFilter extends OncePerRequestFilter implements Ordered { //public class JwtAuthFilter extends OncePerRequestFilter implements Ordered {
//
private final JwtUtil jwtUtil; // private final JwtUtil jwtUtil;
//
// 在类中定义 // // 在类中定义
private final AntPathMatcher antPathMatcher = new AntPathMatcher(); // private final AntPathMatcher antPathMatcher = new AntPathMatcher();
//
// 定义开放接口路径(支持通配符) // // 定义开放接口路径(支持通配符)
private static final List<String> OPEN_API_PATHS = Arrays.asList( // private static final List<String> OPEN_API_PATHS = Arrays.asList(
"/login", // "/login",
"/ragas/save" // "/ragas/save"
); // );
//
@Override // @Override
protected void doFilterInternal(HttpServletRequest request, // protected void doFilterInternal(HttpServletRequest request,
@NotNull HttpServletResponse response, // @NotNull HttpServletResponse response,
@NotNull FilterChain filterChain) throws ServletException, IOException { // @NotNull FilterChain filterChain) throws ServletException, IOException {
//
String path = request.getRequestURI(); // String path = request.getRequestURI();
//
// 判断是否为公开接口(使用 AntPathMatcher 进行通配符匹配) // // 判断是否为公开接口(使用 AntPathMatcher 进行通配符匹配)
boolean isPublicApi = OPEN_API_PATHS.stream() // boolean isPublicApi = OPEN_API_PATHS.stream()
.anyMatch(pattern -> antPathMatcher.match(pattern, path)); // .anyMatch(pattern -> antPathMatcher.match(pattern, path));
//
if (isPublicApi) { // if (isPublicApi) {
log.info("[JWT 过滤器] 放行公开接口: {}", path); // log.info("[JWT 过滤器] 放行公开接口: {}", path);
filterChain.doFilter(request, response); // ✅ 直接放行,不校验 token // filterChain.doFilter(request, response); // ✅ 直接放行,不校验 token
return; // return;
} // }
//
// 1. 获取请求头中的 Authorization // // 1. 获取请求头中的 Authorization
String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION); // String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
//
// 2. 校验是否携带了 Bearer Token // // 2. 校验是否携带了 Bearer Token
if (authHeader == null || !authHeader.startsWith("Bearer ")) { // if (authHeader == null || !authHeader.startsWith("Bearer ")) {
log.warn("[JWT 校验失败] 缺少或格式错误的 Authorization Header"); // log.warn("[JWT 校验失败] 缺少或格式错误的 Authorization Header");
sendUnauthorized(response, "未提供有效的身份凭证"); // sendUnauthorized(response, "未提供有效的身份凭证");
return; // return;
} // }
//
// 3. 提取 Token(去掉 "Bearer " 前缀) // // 3. 提取 Token(去掉 "Bearer " 前缀)
String token = authHeader.substring(7).trim(); // String token = authHeader.substring(7).trim();
//
try { // try {
// 4. 解析 & 校验 JWT Token // // 4. 解析 & 校验 JWT Token
var claims = jwtUtil.parseToken(token); // var claims = jwtUtil.parseToken(token);
//
// 5. 从 Token 中提取用户身份信息(根据你生成时的 claims 名称) // // 5. 从 Token 中提取用户身份信息(根据你生成时的 claims 名称)
String userName = claims.get("name", String.class); // 你生成时放入的 key // String userName = claims.get("name", String.class); // 你生成时放入的 key
//
if (userName == null) { // if (userName == null) {
log.warn("[JWT 校验失败] Token 中缺少 name"); // log.warn("[JWT 校验失败] Token 中缺少 name");
sendUnauthorized(response, "无效的用户身份信息"); // sendUnauthorized(response, "无效的用户身份信息");
return; // return;
} // }
//
log.info("[JWT 校验成功] , 用户名: {}", userName); // log.info("[JWT 校验成功] , 用户名: {}", userName);
//
// 6. 透传用户身份到下游服务(添加请求头) // // 6. 透传用户身份到下游服务(添加请求头)
// 注意:在普通Servlet环境中,我们设置请求属性而不是修改请求头 // // 注意:在普通Servlet环境中,我们设置请求属性而不是修改请求头
request.setAttribute("X-Username", userName); // request.setAttribute("X-Username", userName);
//
// 如果需要设置请求头供后续控制器使用,可以考虑使用ThreadLocal或其他方式 // // 如果需要设置请求头供后续控制器使用,可以考虑使用ThreadLocal或其他方式
// 或者在某些框架中可以使用自定义的RequestWrapper // // 或者在某些框架中可以使用自定义的RequestWrapper
//
// 7. 继续过滤器链,下游服务可以获取用户信息 // // 7. 继续过滤器链,下游服务可以获取用户信息
filterChain.doFilter(request, response); // filterChain.doFilter(request, response);
//
} catch (RuntimeException e) { // } catch (RuntimeException e) {
log.warn("[JWT 校验失败] Token 无效: {}", e.getMessage()); // log.warn("[JWT 校验失败] Token 无效: {}", e.getMessage());
sendUnauthorized(response, "无效的 Token: " + e.getMessage()); // sendUnauthorized(response, "无效的 Token: " + e.getMessage());
} // }
} // }
//
/** // /**
* 发送401未授权响应 // * 发送401未授权响应
*/ // */
private void sendUnauthorized(HttpServletResponse response, String message) throws IOException { // private void sendUnauthorized(HttpServletResponse response, String message) throws IOException {
response.setStatus(HttpStatus.UNAUTHORIZED.value()); // response.setStatus(HttpStatus.UNAUTHORIZED.value());
response.setContentType("application/json;charset=UTF-8"); // response.setContentType("application/json;charset=UTF-8");
//
// 返回JSON格式的错误信息 // // 返回JSON格式的错误信息
String errorResponse = String.format("{\"code\": %d, \"message\": \"%s\"}", // String errorResponse = String.format("{\"code\": %d, \"message\": \"%s\"}",
HttpStatus.UNAUTHORIZED.value(), message); // HttpStatus.UNAUTHORIZED.value(), message);
response.getWriter().write(errorResponse); // response.getWriter().write(errorResponse);
} // }
//
@Override // @Override
public int getOrder() { // public int getOrder() {
return Ordered.HIGHEST_PRECEDENCE; // 高优先级,最先执行 // return Ordered.HIGHEST_PRECEDENCE; // 高优先级,最先执行
} // }
} //}
\ No newline at end of file \ No newline at end of file
...@@ -2,10 +2,14 @@ package com.ruzhoukj.sms.model.vo; ...@@ -2,10 +2,14 @@ package com.ruzhoukj.sms.model.vo;
import com.ruzhoukj.sms.entity.UserEntity; import com.ruzhoukj.sms.entity.UserEntity;
import com.ruzhoukj.sms.entity.UserExtend; import com.ruzhoukj.sms.entity.UserExtend;
import com.ruzhoukj.sms.pojo.vo.SysRolePermissionVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
import java.util.Set;
/** /**
* @Author:zhuxiang * @Author:zhuxiang
* @Package:com.ruzhoukj.sms.model.vo * @Package:com.ruzhoukj.sms.model.vo
...@@ -20,4 +24,9 @@ public class UserVO extends UserEntity { ...@@ -20,4 +24,9 @@ public class UserVO extends UserEntity {
@ApiModelProperty(value = "用户扩展信息") @ApiModelProperty(value = "用户扩展信息")
private UserExtend userExtend; private UserExtend userExtend;
private List<SysRolePermissionVO> sysRolePermissionVOS;
@ApiModelProperty(value = "用户角色")
private String roleName;
} }
...@@ -4,7 +4,13 @@ import com.ruzhoukj.sms.entity.SysRoleEntity; ...@@ -4,7 +4,13 @@ import com.ruzhoukj.sms.entity.SysRoleEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class SysRoleDTO extends SysRoleEntity { public class SysRoleDTO extends SysRoleEntity {
private Integer pageNum;
private Integer pageSize;
private List<Integer> permissionIds;
} }
...@@ -14,7 +14,7 @@ public interface SysRolePermissionService extends IService<SysRolePermissionEnti ...@@ -14,7 +14,7 @@ public interface SysRolePermissionService extends IService<SysRolePermissionEnti
* @param roleId roleId * @param roleId roleId
* @return Boolean * @return Boolean
*/ */
Boolean deleteByRoleId(String roleId); Boolean deleteByRoleId(Integer roleId);
/** /**
* 根据角色id查询权限 * 根据角色id查询权限
* @param roleId roleId * @param roleId roleId
......
...@@ -2,7 +2,9 @@ package com.ruzhoukj.sms.service; ...@@ -2,7 +2,9 @@ package com.ruzhoukj.sms.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.sms.entity.SysRoleEntity; import com.ruzhoukj.sms.entity.SysRoleEntity;
import com.ruzhoukj.sms.pojo.dto.SysRoleDTO;
import com.ruzhoukj.sms.pojo.vo.SysRoleVO; import com.ruzhoukj.sms.pojo.vo.SysRoleVO;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
...@@ -10,4 +12,17 @@ public interface SysRoleService extends IService<SysRoleEntity> { ...@@ -10,4 +12,17 @@ public interface SysRoleService extends IService<SysRoleEntity> {
List<SysRoleVO> queryRoleList(); List<SysRoleVO> queryRoleList();
@Transactional
boolean createRoleWithPermissions(SysRoleDTO sysRoleDTO);
boolean removeByRoleId(Integer id);
SysRoleVO queryRoleByRoleId(Integer id);
Boolean checkRole(SysRoleDTO sysRoleDTO);
Boolean checkName(SysRoleDTO sysRoleDTO);
Boolean checkUser(Integer id);
} }
...@@ -19,7 +19,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM ...@@ -19,7 +19,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
* @return Boolean * @return Boolean
*/ */
@Override @Override
public Boolean deleteByRoleId(String roleId) { public Boolean deleteByRoleId(Integer roleId) {
return baseMapper.deleteByRoleId(roleId); return baseMapper.deleteByRoleId(roleId);
} }
/** /**
......
package com.ruzhoukj.sms.service.impl; package com.ruzhoukj.sms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.utils.DozerUtils;
import com.ruzhoukj.sms.dao.SysRoleMapper; import com.ruzhoukj.sms.dao.SysRoleMapper;
import com.ruzhoukj.sms.entity.SysRoleEntity; import com.ruzhoukj.sms.entity.SysRoleEntity;
import com.ruzhoukj.sms.entity.SysRolePermissionEntity;
import com.ruzhoukj.sms.model.dto.UserDTO;
import com.ruzhoukj.sms.pojo.dto.SysRoleDTO;
import com.ruzhoukj.sms.pojo.vo.SysRoleVO; import com.ruzhoukj.sms.pojo.vo.SysRoleVO;
import com.ruzhoukj.sms.service.SysRolePermissionService;
import com.ruzhoukj.sms.service.SysRoleService; import com.ruzhoukj.sms.service.SysRoleService;
import com.ruzhoukj.sms.service.UserService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Service @Service
...@@ -17,4 +26,69 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity ...@@ -17,4 +26,69 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity
public List<SysRoleVO> queryRoleList(){ public List<SysRoleVO> queryRoleList(){
return baseMapper.queryRoleList(); return baseMapper.queryRoleList();
} }
@Resource
private SysRolePermissionService sysRolePermissionService;
@Resource
private UserService userService;
@Transactional
@Override
public boolean createRoleWithPermissions(SysRoleDTO sysRoleDTO) {
// 插入新角色
boolean result = saveOrUpdate(sysRoleDTO);
List<Integer> permissionIds = sysRoleDTO.getPermissionIds();
if (result && permissionIds != null &&!permissionIds.isEmpty()) {
List<SysRolePermissionEntity> rolePermissionList = new ArrayList<>();
for (Integer permissionId : permissionIds) {
SysRolePermissionEntity rolePermission = new SysRolePermissionEntity();
rolePermission.setRoleId(sysRoleDTO.getId());
rolePermission.setPermissionId(permissionId);
rolePermissionList.add(rolePermission);
}
if (sysRoleDTO.getId() != null)
sysRolePermissionService.deleteByRoleId(sysRoleDTO.getId());
// 批量插入角色与权限的关联关系
result = sysRolePermissionService.saveBatch(rolePermissionList);
}
return result;
}
@Override
public boolean removeByRoleId(Integer id){
sysRolePermissionService.deleteByRoleId(id);
return removeById(id);
}
@Override
public SysRoleVO queryRoleByRoleId(Integer id) {
SysRoleEntity role = baseMapper.selectById(id);
//查询角色对应的权限
role.setPermissionList(sysRolePermissionService.queryPermission(role.getId()));
return DozerUtils.convertBean(role, SysRoleVO.class);
}
@Override
public Boolean checkRole(SysRoleDTO sysRoleDTO) {
List<SysRoleVO> sysRoleVOList=baseMapper.queryRoleList();
for (SysRoleVO sysRoleVO : sysRoleVOList){
if (sysRoleVO.getName().equals(sysRoleDTO.getName())){
return false;
}
}
return true;
}
@Override
public Boolean checkName(SysRoleDTO sysRoleDTO){
SysRoleEntity sysRoleEntity = baseMapper.selectById(sysRoleDTO.getId());
if (sysRoleDTO.getId()!= null)
return sysRoleEntity.getName().equals(sysRoleDTO.getName());
return false;
}
@Override
public Boolean checkUser(Integer id) {
UserDTO userDTO = new UserDTO();
userDTO.setRoleId(id);
return userService.queryList(userDTO).isEmpty();
}
} }
...@@ -6,10 +6,14 @@ import com.platform.utils.DozerUtils; ...@@ -6,10 +6,14 @@ import com.platform.utils.DozerUtils;
import com.platform.utils.StringUtils; import com.platform.utils.StringUtils;
import com.ruzhoukj.sms.dao.UserDao; import com.ruzhoukj.sms.dao.UserDao;
import com.ruzhoukj.sms.entity.ProjectEntity; import com.ruzhoukj.sms.entity.ProjectEntity;
import com.ruzhoukj.sms.entity.SysRoleEntity;
import com.ruzhoukj.sms.entity.UserEntity; import com.ruzhoukj.sms.entity.UserEntity;
import com.ruzhoukj.sms.entity.UserExtend; import com.ruzhoukj.sms.entity.UserExtend;
import com.ruzhoukj.sms.model.dto.UserDTO; import com.ruzhoukj.sms.model.dto.UserDTO;
import com.ruzhoukj.sms.model.vo.UserVO; import com.ruzhoukj.sms.model.vo.UserVO;
import com.ruzhoukj.sms.pojo.vo.SysRolePermissionVO;
import com.ruzhoukj.sms.service.SysRolePermissionService;
import com.ruzhoukj.sms.service.SysRoleService;
import com.ruzhoukj.sms.service.UserExtendService; import com.ruzhoukj.sms.service.UserExtendService;
import com.ruzhoukj.sms.service.UserService; import com.ruzhoukj.sms.service.UserService;
import com.ruzhoukj.sms.util.IDCardUtils; import com.ruzhoukj.sms.util.IDCardUtils;
...@@ -19,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -19,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
...@@ -32,6 +37,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements ...@@ -32,6 +37,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
@Resource @Resource
private UserExtendService userExtendService; private UserExtendService userExtendService;
@Resource
private SysRoleService sysRoleService;
@Resource
private SysRolePermissionService sysRolePermissionService;
@Override @Override
public List<UserEntity> getUserList(String name, Integer page, Integer pageSize) { public List<UserEntity> getUserList(String name, Integer page, Integer pageSize) {
return baseMapper.getUserList(name, page, pageSize); return baseMapper.getUserList(name, page, pageSize);
...@@ -98,6 +108,15 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements ...@@ -98,6 +108,15 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
} }
UserExtend userExtend = userExtendService.getbyUserId(id); UserExtend userExtend = userExtendService.getbyUserId(id);
userVO.setUserExtend(userExtend); userVO.setUserExtend(userExtend);
//获取用户角色和权限信息
if (userVO.getRoleId()!=null) {
SysRoleEntity sysRoleEntity = sysRoleService.getById(userVO.getRoleId());
userVO.setRoleName(sysRoleEntity.getName());
//获取用户角色权限信息
List<SysRolePermissionVO> permissionList = sysRolePermissionService.queryPermission(userVO.getRoleId());
userVO.setSysRolePermissionVOS(permissionList);
}
return userVO; return userVO;
} }
......
...@@ -4,9 +4,12 @@ server: ...@@ -4,9 +4,12 @@ server:
spring: spring:
datasource: datasource:
username: root username: root
password: ruzhoukj@Pass # password: ruzhoukj@Pass
password: ruzhoukj@2022
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/ruzhou_oa?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true url: jdbc:mysql://192.168.10.3:3307/ops?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# url: jdbc:mysql://47.111.94.26:22/ops?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# url: jdbc:mysql://localhost:3306/ruzhou_oa?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
servlet: servlet:
multipart: multipart:
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</select> </select>
<delete id="deleteByRoleId" parameterType="java.lang.String"> <delete id="deleteByRoleId" parameterType="java.lang.Boolean">
DELETE FROM sys_role_permission WHERE role_id = #{roleId} DELETE FROM sys_role_permission WHERE role_id = #{roleId}
</delete> </delete>
......
...@@ -77,6 +77,9 @@ ...@@ -77,6 +77,9 @@
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
AND dept_id = #{deptId} AND dept_id = #{deptId}
</if> </if>
<if test="roleId != null and roleId != ''">
AND role_id = #{roleId}
</if>
ORDER BY id DESC ORDER BY id DESC
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment