#

luxiaotao1123

2024-02-16 3b1672c22fe83d442e81092a6efac71b284cf4a7

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java

@@ -12,7 +12,8 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Arrays;
import java.util.Map;

/**
 * Created by vincent on 2/13/2024
@@ -24,23 +25,28 @@
    @Autowired
    private RoleService roleService;

//    @PreAuthorize("hasAuthority('sys:role:list')")
//    @PostMapping("/role/page")
//    public R page(@RequestBody BaseParam param) {
//        PageParam<Role, BaseParam> page = new PageParam<>(param);
//        return R.ok().add(roleService.page(page, page.getWrapper()));
//    }

    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @PostMapping("/role/page")
    public R page(@RequestBody BaseParam param) {
        PageParam<Role, BaseParam> page = new PageParam<>(param);
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = getBaseParam(map);
        PageParam<Role, BaseParam> page = new PageParam<>(baseParam);
        return R.ok().add(roleService.page(page, page.getWrapper()));
    }

    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @PostMapping("/role/list")
    public R list(@RequestBody BaseParam param) {
        return R.ok().add(roleService.list());
    }

    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @GetMapping("/role/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(roleService.getById(id));
@@ -58,10 +64,10 @@
                && roleService.count(new LambdaQueryWrapper<Role>().eq(Role::getCode, role.getCode())) > 0) {
            return R.error("角色标识已存在");
        }
        if (roleService.save(role)) {
            return R.ok("添加成功");
        if (!roleService.save(role)) {
            return R.error("添加失败");
        }
        return R.error("添加失败");
        return R.ok("添加成功");
    }

    @PreAuthorize("hasAuthority('sys:role:update')")
@@ -78,21 +84,26 @@
                .ne(Role::getId, role.getId())) > 0) {
            return R.error("角色名称已存在");
        }
        if (roleService.updateById(role)) {
            return R.ok("修改成功");
        if (!roleService.updateById(role)) {
            return R.error("修改失败");
        }
        return R.error("修改失败");
        return R.ok("修改成功");
    }

    @PreAuthorize("hasAuthority('sys:role:remove')")
    @OperationLog("删除角色")
    @PostMapping("/role/remove")
    public R remove(@RequestBody List<Long> ids) {
        if (roleService.removeByIds(ids)) {
            return R.ok("删除成功");
    @PostMapping("/role/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!roleService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.error("删除失败");
        return R.ok("删除成功");
    }

    @PreAuthorize("hasAuthority('sys:role:list')")
    @PostMapping("/role/export")
    public R export(@RequestBody Role role) {
        return R.ok("导出成功");
    }

}