|
@@ -22,10 +22,13 @@ import com.xy.vo.RoleMenuVo;
|
|
|
import com.xy.vo.SysRoleGroupBySysVo;
|
|
|
import com.xy.vo.SysRoleVo;
|
|
|
import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import javax.validation.Valid;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -50,8 +53,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
private final SysUserRoleService sysUserRoleService;
|
|
|
private final SysSystemMapper sysSystemMapper;
|
|
|
|
|
|
- @Override
|
|
|
- public R<Long> saveOrUpdate(SysRoleDto sysRoleDto) {
|
|
|
+ @ApiOperation(value = "新增、更新角色信息", notes = "新增、更新角色信息")
|
|
|
+ @PostMapping("saveOrUpdate")
|
|
|
+ public R<Long> saveOrUpdate(@Valid @RequestBody SysRoleDto sysRoleDto) {
|
|
|
Long id = sysRoleDto.getId();
|
|
|
long currentUser = Long.parseLong(SaTokenUtils.getId().toString());
|
|
|
LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<SysRole>()
|
|
@@ -71,8 +75,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
return R.ok(sysRole.getId());
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public R<Boolean> batchDelete(BatchDeleteDto batchDeleteDto) {
|
|
|
+ @ApiOperation(value = "删除角色", notes = "删除角色")
|
|
|
+ @DeleteMapping
|
|
|
+ public R<Boolean> batchDelete(@Valid @RequestBody BatchDeleteDto batchDeleteDto) {
|
|
|
List<Long> ids = batchDeleteDto.getIds();
|
|
|
if (CollUtil.isNotEmpty(ids)) {
|
|
|
for (Long id : ids) {
|
|
@@ -83,8 +88,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
return R.ok(Boolean.TRUE);
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public R<SysRoleVo> getById(Long id) {
|
|
|
+ @ApiOperation(value = "获取角色详情", notes = "获取角色详情")
|
|
|
+ @GetMapping("{id}")
|
|
|
+ public R<SysRoleVo> getById(@PathVariable("id") Long id) {
|
|
|
SysRole role = super.getById(id);
|
|
|
SysRoleVo sysRoleVo = copy(SysRoleVo.class, role);
|
|
|
//角色菜单
|
|
@@ -92,7 +98,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
return R.ok(sysRoleVo);
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
+ @ApiOperation(value = "分页获取角色信息", notes = "分页获取角色信息")
|
|
|
+ @GetMapping("page")
|
|
|
public R<PageBean<SysRoleVo>> getRolePage(PageBean pageBean, SysRoleDto sysRoleDto) {
|
|
|
IPage<SysRole> page = page(toIPage(pageBean), Wrappers.<SysRole>lambdaQuery()
|
|
|
.like(StrUtil.isNotBlank(sysRoleDto.getName()), SysRole::getName, sysRoleDto.getName())
|
|
@@ -101,14 +108,16 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public R<Boolean> saveRoleMenus(RoleMenuVo roleMenuVo) {
|
|
|
+ @ApiOperation(value = "编辑角色菜单", notes = "编辑角色菜单")
|
|
|
+ @PostMapping("saveRoleMenus")
|
|
|
+ public R<Boolean> saveRoleMenus(@RequestBody RoleMenuVo roleMenuVo) {
|
|
|
return R.ok(sysRoleMenuService.saveRoleMenus(roleMenuVo));
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
+ @ApiOperation(value = "删除角色", notes = "删除角色")
|
|
|
+ @DeleteMapping("{id}")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public R<Boolean> deleteRoleById(Long id) {
|
|
|
+ public R<Boolean> deleteRoleById(@PathVariable("id") Long id) {
|
|
|
//角色 sys_role
|
|
|
removeById(id);
|
|
|
//角色菜单 sys_role_menu
|
|
@@ -120,13 +129,15 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
|
return R.ok(Boolean.TRUE);
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
- public R<List<SysRoleVo>> listBySysId(Long sysId) {
|
|
|
+ @ApiOperation(value = "根据系统获取角色列表", notes = "根据系统获取角色列表")
|
|
|
+ @GetMapping("listBySys/{sysId}")
|
|
|
+ public R<List<SysRoleVo>> listBySysId(@PathVariable("sysId") Long sysId) {
|
|
|
List<SysRole> list = this.list(Wrappers.<SysRole>lambdaQuery().eq(SysRole::getSysId, sysId));
|
|
|
return R.ok(copy(SysRoleVo.class, list));
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
+ @ApiOperation(value = "获取当前登录用户创建的角色列表", notes = "获取当前登录用户创建的角色列表")
|
|
|
+ @GetMapping("myCreatedRoles}")
|
|
|
public R<List<SysRoleGroupBySysVo>> myCreatedRoles() {
|
|
|
List<SysRoleGroupBySysVo> sysRoleGroupBySysVos = new ArrayList<>(16);
|
|
|
Long curUserId = Long.parseLong(SaTokenUtils.getId().toString());
|