q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户权限

Browse Source
This commit is contained in:
Jerry Yan
2025-07-22 14:47:56 +08:00
parent 1dc9e16c55
commit 38e9763033
15 changed files with 81 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/ycwl/basic/controller/pc/MenuController.java
View File

@@ -1,45 +0,0 @@
package com.ycwl.basic.controller.pc;
import com.ycwl.basic.annotation.IgnoreToken;
import com.ycwl.basic.model.pc.menu.entity.MenuEntity;
import com.ycwl.basic.service.pc.MenuService;
import com.ycwl.basic.utils.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
/**
* @Author：longbinbin
* @Date：2024/12/3 10:03
*/
@RestController
@RequestMapping("/api/menu/v1")
@Api(tags = "系统菜单管理")
public class MenuController {
private MenuService menuService;
@GetMapping(value = "/list/{type}")
@ApiOperation(value = " 菜单列表")
@IgnoreToken
public ApiResponse list(@PathVariable("type") Integer type) {
return menuService.list(type);
}
@PostMapping("/add")
@ApiOperation(value = "添加菜单")
public ApiResponse add(@RequestBody MenuEntity menu) {
return menuService.add(menu);
}
@PostMapping("/update")
@ApiOperation(value = "修改菜单")
public ApiResponse update(@RequestBody MenuEntity menu) {
return menuService.update(menu);
}
@GetMapping("/delete/{id}")
@ApiOperation(value = "删除菜单")
public ApiResponse delete(@PathVariable("id") Long id) {
return menuService.deleteById(id);
}
}

26
src/main/java/com/ycwl/basic/controller/pc/PermissionController.java
View File

@@ -1,10 +1,14 @@
package com.ycwl.basic.controller.pc;
import com.ycwl.basic.constant.BaseContextHandler;
import com.ycwl.basic.mapper.AdminUserMapper;
import com.ycwl.basic.model.pc.adminUser.entity.LoginEntity;
import com.ycwl.basic.model.pc.permission.entity.PermissionEntity;
import com.ycwl.basic.model.pc.permission.req.PermissionSaveReq;
import com.ycwl.basic.model.pc.permission.resp.PermissionResp;
import com.ycwl.basic.model.pc.role.resp.RolePermissionResp;
import com.ycwl.basic.service.pc.PermissionService;
import com.ycwl.basic.service.pc.RoleService;
import com.ycwl.basic.utils.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,15 +32,29 @@ import static com.ycwl.basic.constant.JwtRoleConstant.MERCHANT;
public class PermissionController {
@Autowired
private PermissionService permissionService;
@Autowired
private AdminUserMapper adminUserMapper;
@Autowired
private RoleService roleService;
@GetMapping("/get/")
public ApiResponse<PermissionResp> getPermissionByUser() {
String userId = BaseContextHandler.getUserId();
PermissionEntity permission = permissionService.getPermissionByUserId(Long.parseLong(userId));
if (permission == null || StringUtils.isEmpty(permission.getPermString())) {
return ApiResponse.success(new PermissionResp(new ArrayList<>(), new ArrayList<>()));
if (MERCHANT.type.equals(BaseContextHandler.getRoleId())) {
PermissionEntity permission = permissionService.getPermissionByUserId(Long.parseLong(userId));
if (permission == null || StringUtils.isEmpty(permission.getPermString())) {
return ApiResponse.success(new PermissionResp(new ArrayList<>(), new ArrayList<>()));
}
return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permission.getPermString(), ",")), Arrays.asList(StringUtils.split(permission.getMenuString(), ","))));
} else {
// admin
LoginEntity login = adminUserMapper.getById(Long.parseLong(userId));
RolePermissionResp permissionByRoleId = roleService.getPermissionByRoleId(login.getRoleId());
if (permissionByRoleId == null) {
return ApiResponse.success(new PermissionResp(new ArrayList<>(), new ArrayList<>()));
}
return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permissionByRoleId.getPermStr(), ",")), Arrays.asList(StringUtils.split(permissionByRoleId.getMenuStr(), ","))));
}
return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permission.getPermString(), ",")), Arrays.asList(StringUtils.split(permission.getMenuString(), ","))));
}
@ApiOperation("根据用户ID查询权限信息")

19
src/main/java/com/ycwl/basic/controller/pc/RoleController.java
View File

@@ -2,16 +2,20 @@ package com.ycwl.basic.controller.pc;
import com.github.pagehelper.PageInfo;
import com.ycwl.basic.annotation.IgnoreToken;
import com.ycwl.basic.model.pc.permission.resp.PermissionResp;
import com.ycwl.basic.model.pc.role.req.AddOrUpdateRoleReqVO;
import com.ycwl.basic.model.pc.role.req.RoleListReqVO;
import com.ycwl.basic.model.pc.role.resp.RoleListRespVO;
import com.ycwl.basic.model.pc.role.resp.RolePermissionResp;
import com.ycwl.basic.service.pc.RoleService;
import com.ycwl.basic.utils.ApiResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
@RestController
@@ -24,34 +28,38 @@ public class RoleController {
@PostMapping(value = "/page")
@ApiOperation(value = "角色列表分页查询")
@IgnoreToken
public ApiResponse<PageInfo<RoleListRespVO>> page(@RequestBody RoleListReqVO roleListReqVO) {
return roleService.pageQuery(roleListReqVO);
}
@PostMapping(value = "/list")
@ApiOperation(value = "角色列表")
@IgnoreToken
public ApiResponse<List<RoleListRespVO>> list(@RequestBody RoleListReqVO roleListReqVO) {
return roleService.list(roleListReqVO);
}
@GetMapping("/{roleId}/permission")
@ApiOperation(value = "角色权限列表")
public ApiResponse<PermissionResp> getPermissionByRoleId(@PathVariable("roleId") Long roleId) {
RolePermissionResp permission = roleService.getPermissionByRoleId(roleId);
if (permission == null) {
return ApiResponse.fail("角色不存在");
}
return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permission.getPermStr(), ",")), Arrays.asList(StringUtils.split(permission.getMenuStr(), ","))));
}
@PostMapping(value = "/addOrUpdate")
@ApiOperation(value = "添加或更新角色")
@IgnoreToken
public ApiResponse addOrUpdate(@RequestBody AddOrUpdateRoleReqVO addOrUpdateRoleReqVO) {
return roleService.addOrUpdate(addOrUpdateRoleReqVO);
}
@GetMapping(value = "/delete/{id}")
@ApiOperation(value = "删除")
@IgnoreToken
public ApiResponse delete(@PathVariable("id") String id) {
return roleService.delete(id);
}
@GetMapping(value = "/updateReturnMenu/{id}")
@ApiOperation(value = "编辑回显该角色当前菜单")
@IgnoreToken
public ApiResponse updateReturnMenu(@PathVariable("id") String id) {
return roleService.updateReturnMenu(id);
}
@@ -60,7 +68,6 @@ public class RoleController {
@GetMapping(value = "/updateStatus/{id}")
@ApiOperation(value = "更改角色类型状态")
//@IgnoreToken
public ApiResponse updateStatus(@PathVariable("id") String id) {
return roleService.updateStatus(id);
}

17
src/main/java/com/ycwl/basic/mapper/MenuMapper.java
View File

@@ -2,6 +2,7 @@ package com.ycwl.basic.mapper;
import com.ycwl.basic.model.pc.menu.MenuNode;
import com.ycwl.basic.model.pc.menu.entity.MenuEntity;
import com.ycwl.basic.model.pc.role.resp.RolePermissionResp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -15,18 +16,6 @@ public interface MenuMapper {
* @return
*/
int deleteRoleMenuByRoleId(@Param("id")String roleId);
int addRoleMenu(@Param("id")String roleId,@Param("list") List<Integer> list);
int add(MenuEntity menuEntity);
List<MenuNode>getListByType(@Param("type")Integer type);
int update(MenuEntity menuEntity);
int deleteById(@Param("id")Long id);
/**
* 根据菜单id删除角色菜单
* @param menuId
* @return
*/
int deleteRoleMenuByMenuId(@Param("id")String menuId);
int addRoleMenu(@Param("id")String roleId,@Param("menuStr") String menuStr, @Param("permStr") String permStr);
RolePermissionResp getPermissionByRoleId(Long roleId);
}

2
src/main/java/com/ycwl/basic/model/pc/adminUser/entity/LoginEntity.java
View File

@@ -10,7 +10,7 @@ public class LoginEntity {
private String staffName;
private String account;
private String password;
private String roleId;
private Long roleId;
private String typeName;
private Date updateAt;
}

2
src/main/java/com/ycwl/basic/model/pc/adminUser/resp/LoginRespVO.java
View File

@@ -17,7 +17,5 @@ public class LoginRespVO {
private String name;
@ApiModelProperty(value = "角色名")
private String typeName;
@ApiModelProperty(value = "菜单列表")
private List<MenuNode> menuNodeList;
private boolean superAdmin;
}

4
src/main/java/com/ycwl/basic/model/pc/role/req/AddOrUpdateRoleReqVO.java
View File

@@ -13,7 +13,7 @@ public class AddOrUpdateRoleReqVO {
private String name;
// @ApiModelProperty(value = "0系统角色 1业务角色")
// private Integer type;
@ApiModelProperty(value = "菜单ID列表")
private List<Integer> menuIdList;
private List<String> permissions;
private List<String> menus;
}

10
src/main/java/com/ycwl/basic/model/pc/role/resp/RolePermissionResp.java Normal file
View File

@@ -0,0 +1,10 @@
package com.ycwl.basic.model.pc.role.resp;
import lombok.Data;
@Data
public class RolePermissionResp {
private String roleId;
private String permStr;
private String menuStr;
}

18
src/main/java/com/ycwl/basic/service/pc/MenuService.java
View File

@@ -1,18 +0,0 @@
package com.ycwl.basic.service.pc;
import com.ycwl.basic.model.pc.menu.MenuNode;
import com.ycwl.basic.model.pc.menu.entity.MenuEntity;
import com.ycwl.basic.utils.ApiResponse;
import java.util.List;
/**
* @Author：longbinbin
* @Date：2024/12/3 10:40
*/
public interface MenuService {
ApiResponse<List<MenuNode>> list(Integer type);
ApiResponse<Integer> add(MenuEntity menu);
ApiResponse<Integer> update(MenuEntity menu);
ApiResponse<Integer> deleteById(Long id);
}

3
src/main/java/com/ycwl/basic/service/pc/RoleService.java
View File

@@ -4,11 +4,14 @@ import com.github.pagehelper.PageInfo;
import com.ycwl.basic.model.pc.role.req.AddOrUpdateRoleReqVO;
import com.ycwl.basic.model.pc.role.req.RoleListReqVO;
import com.ycwl.basic.model.pc.role.resp.RoleListRespVO;
import com.ycwl.basic.model.pc.role.resp.RolePermissionResp;
import com.ycwl.basic.utils.ApiResponse;
import java.util.List;
public interface RoleService {
RolePermissionResp getPermissionByRoleId(Long roleId);
ApiResponse<PageInfo<RoleListRespVO>> pageQuery(RoleListReqVO roleListReqVO);
ApiResponse list(RoleListReqVO roleListReqVO);
ApiResponse addOrUpdate(AddOrUpdateRoleReqVO addOrUpdateRoleReqVO);

18
src/main/java/com/ycwl/basic/service/pc/impl/AdminUserServiceImpl.java
View File

@@ -111,7 +111,7 @@ public class AdminUserServiceImpl implements AdminUserService {
if (!login.getPassword().equals(DigestUtil.md5Hex(password))) {
return ApiResponse.fail("账号不存在或密码错误");
}
String roleId = login.getRoleId();
Long roleId = login.getRoleId();
Object roleObject = redisTemplate.opsForValue().get(ROLE_STATUS + roleId);
@@ -120,27 +120,11 @@ public class AdminUserServiceImpl implements AdminUserService {
throw new RoleStatusException("该角色下的账号已被封禁，请联系管理员");
}
}
List<MenuNode> menuById = roleMapper.getMenuById(roleId);
List<MenuNode> MenuList = new ArrayList<>();
for (MenuNode item : menuById) {
if ("-1".equals(item.getParentId())) {
MenuList.add(item);
}
for (MenuNode item2 : menuById) {
if (item2.getParentId().equals(item.getId())) {
if (item.getChildrenList() == null) {
item.setChildrenList(new ArrayList<>());
}
item.getChildrenList().add(item2);
}
}
}
LoginRespVO loginRespVO = new LoginRespVO();
String token = jwtTokenUtil.generateToken(new JwtInfo(login.getStaffName(), login.getStaffId(), ADMIN.type, login.getAccount(), login.getAccount(), null), login.getUpdateAt());
loginRespVO.setToken(token);
loginRespVO.setName(login.getStaffName());
loginRespVO.setTypeName(login.getTypeName());
loginRespVO.setMenuNodeList(MenuList);
loginRespVO.setSuperAdmin(Long.valueOf(1L).equals(login.getStaffId()));
return ApiResponse.success(loginRespVO);
}

78
src/main/java/com/ycwl/basic/service/pc/impl/MenuServiceImpl.java
View File

@@ -1,78 +0,0 @@
package com.ycwl.basic.service.pc.impl;
import com.ycwl.basic.mapper.MenuMapper;
import com.ycwl.basic.model.pc.menu.MenuNode;
import com.ycwl.basic.model.pc.menu.entity.MenuEntity;
import com.ycwl.basic.service.pc.MenuService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.SnowFlakeUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @Author：longbinbin
* @Date：2024/12/3 10:16
*/
@Service
public class MenuServiceImpl implements MenuService {
@Autowired
private MenuMapper menuMapper;
@Override
public ApiResponse<List<MenuNode>> list(Integer type) {
// if(type==null){
// type=1;
// }
List<MenuNode> listByType = menuMapper.getListByType(type);
List<MenuNode> MenuList = new ArrayList<>();
for (MenuNode item :listByType) {
if ("-1".equals(item.getParentId())) {
MenuList.add(item);
}
for (MenuNode item2 : listByType) {
if (item2.getParentId().equals(item.getId())) {
if (item.getChildrenList() == null) {
item.setChildrenList(new ArrayList<>());
}
item.getChildrenList().add(item2);
}
}
}
return ApiResponse.success(MenuList);
}
@Override
public ApiResponse<Integer> add(MenuEntity menu) {
menu.setId(SnowFlakeUtil.getId());
int add = menuMapper.add(menu);
if(add>0){
return ApiResponse.success(add);
}else {
return ApiResponse.fail("添加失败");
}
}
@Override
public ApiResponse<Integer> update(MenuEntity menu) {
int update = menuMapper.update(menu);
if(update>0){
return ApiResponse.success(update);
}else {
return ApiResponse.fail("更新失败");
}
}
@Override
public ApiResponse<Integer> deleteById(Long id) {
int deleteById = menuMapper.deleteById(id);
if(deleteById>0){
return ApiResponse.success(deleteById);
}else {
return ApiResponse.fail("删除失败");
}
}
}

29
src/main/java/com/ycwl/basic/service/pc/impl/RoleServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.ycwl.basic.model.pc.menu.MenuNode;
import com.ycwl.basic.model.pc.role.req.AddOrUpdateRoleReqVO;
import com.ycwl.basic.model.pc.role.req.RoleListReqVO;
import com.ycwl.basic.model.pc.role.resp.RoleListRespVO;
import com.ycwl.basic.model.pc.role.resp.RolePermissionResp;
import com.ycwl.basic.service.pc.RoleService;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.SnowFlakeUtil;
@@ -34,6 +35,11 @@ public class RoleServiceImpl implements RoleService {
@Autowired
RedisTemplate redisTemplate;
@Override
public RolePermissionResp getPermissionByRoleId(Long roleId) {
return menuMapper.getPermissionByRoleId(roleId);
}
@Override
public ApiResponse<PageInfo<RoleListRespVO>> pageQuery(RoleListReqVO roleListReqVO) {
PageHelper.startPage(roleListReqVO.getPageNum(),roleListReqVO.getPageSize());
@@ -55,23 +61,22 @@ public class RoleServiceImpl implements RoleService {
}
@Override
public ApiResponse addOrUpdate(AddOrUpdateRoleReqVO addOrUpdateRoleReqVO) {
String id = addOrUpdateRoleReqVO.getId();
public ApiResponse addOrUpdate(AddOrUpdateRoleReqVO vo) {
String id = vo.getId();
if(StringUtils.isBlank(id)){
String roleId = SnowFlakeUtil.getId();
addOrUpdateRoleReqVO.setId(roleId);
if(roleMapper.add(addOrUpdateRoleReqVO)>0){
if (addOrUpdateRoleReqVO.getMenuIdList() != null && !addOrUpdateRoleReqVO.getMenuIdList().isEmpty()) {
menuMapper.addRoleMenu(roleId, addOrUpdateRoleReqVO.getMenuIdList());
}
vo.setId(roleId);
if(roleMapper.add(vo)>0){
String menuStr = StringUtils.join(vo.getMenus(), ",");
String permStr = StringUtils.join(vo.getPermissions(), ",");
menuMapper.addRoleMenu(roleId, menuStr, permStr);
return ApiResponse.success(null);
}
}else {
if(roleMapper.update(addOrUpdateRoleReqVO)>0){
menuMapper.deleteRoleMenuByRoleId(addOrUpdateRoleReqVO.getId());
if (addOrUpdateRoleReqVO.getMenuIdList() != null && !addOrUpdateRoleReqVO.getMenuIdList().isEmpty()) {
menuMapper.addRoleMenu(addOrUpdateRoleReqVO.getId(), addOrUpdateRoleReqVO.getMenuIdList());
}
if(roleMapper.update(vo)>0){
String menuStr = StringUtils.join(vo.getMenus(), ",");
String permStr = StringUtils.join(vo.getPermissions(), ",");
menuMapper.addRoleMenu(id, menuStr, permStr);
return ApiResponse.success(null);
}
}