菜单角色更新
This commit is contained in:
@@ -1,14 +1,12 @@
|
||||
package org.nl.system.controller.role;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.nl.common.TableDataInfo;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.modules.logging.annotation.Log;
|
||||
import org.nl.modules.wql.core.bean.WQLObject;
|
||||
import org.nl.system.service.role.ISysRoleService;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -29,6 +27,7 @@ import java.util.Set;
|
||||
@RequestMapping("/api/sysRole")
|
||||
@RequiredArgsConstructor
|
||||
public class SysRoleController {
|
||||
|
||||
private final ISysRoleService roleService;
|
||||
|
||||
@ApiOperation("分页查询角色")
|
||||
|
||||
@@ -14,7 +14,7 @@ import java.util.Set;
|
||||
* 菜单表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author generator
|
||||
* @author ldjun
|
||||
* @since 2022-12-15
|
||||
*/
|
||||
public interface ISysMenuService extends IService<SysMenu> {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package org.nl.system.service.menu.dao.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.nl.system.service.menu.dao.SysMenu;
|
||||
@@ -37,4 +38,12 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
|
||||
* @return
|
||||
*/
|
||||
List<String> getPermissionByUserId(String userId);
|
||||
|
||||
/**
|
||||
* 解绑角色菜单
|
||||
*
|
||||
* @param menuId 菜单ID
|
||||
*/
|
||||
@Delete(value = "delete from sys_roles_menus where menu_id = #{menuId}")
|
||||
void untiedMenu(String menuId);
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
||||
public void delete(Set<SysMenu> menuSet) {
|
||||
for (SysMenu menu : menuSet) {
|
||||
//解绑菜单
|
||||
// roleService.untiedMenu(menu.getId());
|
||||
baseMapper.untiedMenu(menu.getMenuId());
|
||||
baseMapper.deleteById(menu.getMenuId());
|
||||
updateSubCnt(menu.getPid());
|
||||
}
|
||||
|
||||
@@ -10,23 +10,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.modules.common.exception.BadRequestException;
|
||||
import org.nl.modules.common.utils.SecurityUtils;
|
||||
import org.nl.modules.wql.WQL;
|
||||
import org.nl.system.service.menu.dao.SysMenu;
|
||||
import org.nl.system.service.menu.dao.mapper.SysMenuMapper;
|
||||
import org.nl.system.service.role.ISysRoleService;
|
||||
import org.nl.system.service.role.dao.SysRole;
|
||||
import org.nl.system.service.role.dao.SysRolesMenus;
|
||||
import org.nl.system.service.role.dao.mapper.SysRoleMapper;
|
||||
import org.nl.system.service.role.dao.mapper.SysRolesMenusMapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -37,16 +37,14 @@ import java.util.function.Consumer;
|
||||
* @since 2022-12-15
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
|
||||
|
||||
@Autowired
|
||||
private SysRoleMapper roleMapper;
|
||||
private final SysRoleMapper roleMapper;
|
||||
|
||||
@Autowired
|
||||
private SysMenuMapper sysMenuMapper;
|
||||
private final SysMenuMapper sysMenuMapper;
|
||||
|
||||
@Autowired
|
||||
private SysRolesMenusMapper rolesMenusMapper;
|
||||
private final SysRolesMenusMapper rolesMenusMapper;
|
||||
|
||||
@Override
|
||||
public IPage<SysRole> query(Map param, PageQuery page) {
|
||||
@@ -77,7 +75,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
||||
String nickName = SecurityUtils.getCurrentNickName();
|
||||
String now = DateUtil.now();
|
||||
// 插入
|
||||
sysRole.setRoleId(IdUtil.getSnowflake(1,1).nextIdStr());
|
||||
sysRole.setRoleId(IdUtil.getSnowflake(1, 1).nextIdStr());
|
||||
sysRole.setCreateId(userId);
|
||||
sysRole.setCreateName(nickName);
|
||||
sysRole.setCreateTime(now);
|
||||
|
||||
Reference in New Issue
Block a user