|
|
@ -3,16 +3,17 @@ package com.cloud.kicc.system.controller; |
|
|
|
import cn.hutool.core.util.ArrayUtil; |
|
|
|
import cn.hutool.core.util.ArrayUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.cloud.kicc.system.api.entity.Role; |
|
|
|
|
|
|
|
import com.cloud.kicc.system.service.RoleService; |
|
|
|
|
|
|
|
import com.cloud.kicc.common.core.api.R; |
|
|
|
import com.cloud.kicc.common.core.api.R; |
|
|
|
import com.cloud.kicc.common.core.constant.AppConstants; |
|
|
|
import com.cloud.kicc.common.core.constant.AppConstants; |
|
|
|
import com.cloud.kicc.common.core.util.PinyinUtil; |
|
|
|
import com.cloud.kicc.common.core.util.PinyinUtil; |
|
|
|
import com.cloud.kicc.common.log.annotation.SysLog; |
|
|
|
import com.cloud.kicc.common.log.annotation.SysLog; |
|
|
|
|
|
|
|
import com.cloud.kicc.system.api.entity.Role; |
|
|
|
|
|
|
|
import com.cloud.kicc.system.service.RoleService; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
import org.springframework.security.access.prepost.PreAuthorize; |
|
|
|
import org.springframework.security.access.prepost.PreAuthorize; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
@ -34,10 +35,10 @@ public class RoleController { |
|
|
|
|
|
|
|
|
|
|
|
private final RoleService roleService; |
|
|
|
private final RoleService roleService; |
|
|
|
|
|
|
|
|
|
|
|
private QueryWrapper<Role> getQueryWrapper(Role role) { |
|
|
|
private LambdaQueryWrapper<Role> getQueryWrapper(Role role) { |
|
|
|
return new QueryWrapper<Role>() |
|
|
|
return new LambdaQueryWrapper<Role>() |
|
|
|
.like(StrUtil.isNotBlank(role.getName()), "name", role.getName()) |
|
|
|
.like(StrUtil.isNotBlank(role.getName()), Role::getName, role.getName()) |
|
|
|
.eq(StrUtil.isNotBlank(role.getCode()), "code", role.getCode()); |
|
|
|
.eq(StrUtil.isNotBlank(role.getCode()), Role::getCode, role.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/list") |
|
|
|
@GetMapping("/list") |
|
|
@ -75,7 +76,9 @@ public class RoleController { |
|
|
|
@PutMapping("/changeStatus") |
|
|
|
@PutMapping("/changeStatus") |
|
|
|
@PreAuthorize("@pms.hasPermission('role_edit')") |
|
|
|
@PreAuthorize("@pms.hasPermission('role_edit')") |
|
|
|
public R changeStatus(@RequestBody Role role) { |
|
|
|
public R changeStatus(@RequestBody Role role) { |
|
|
|
roleService.update(new UpdateWrapper<Role>().eq("id", role.getId()).set("status", role.getStatus())); |
|
|
|
roleService.update(new LambdaUpdateWrapper<Role>() |
|
|
|
|
|
|
|
.eq(Role::getId, role.getId()) |
|
|
|
|
|
|
|
.set(Role::getStatus, role.getStatus())); |
|
|
|
return R.ok(); |
|
|
|
return R.ok(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -83,7 +86,8 @@ public class RoleController { |
|
|
|
@DeleteMapping("/remove/{id:[\\w,]+}") |
|
|
|
@DeleteMapping("/remove/{id:[\\w,]+}") |
|
|
|
@PreAuthorize("@pms.hasPermission('role_del')") |
|
|
|
@PreAuthorize("@pms.hasPermission('role_del')") |
|
|
|
public R remove(@PathVariable String[] id) { |
|
|
|
public R remove(@PathVariable String[] id) { |
|
|
|
if(ArrayUtil.contains(id, "1")){ |
|
|
|
// todo: 防止管理员角色删除,暂时处理手段
|
|
|
|
|
|
|
|
if(ArrayUtil.contains(id, "1510536230140129280")){ |
|
|
|
return R.error("不允许删除管理员角色"); |
|
|
|
return R.error("不允许删除管理员角色"); |
|
|
|
} |
|
|
|
} |
|
|
|
roleService.removeByIds(Arrays.asList(id)); |
|
|
|
roleService.removeByIds(Arrays.asList(id)); |
|
|
|