#

luxiaotao1123

2024-02-16 f386cde7f06d6148595b9c07b5bb37433c9c5b87

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

@@ -1,10 +1,12 @@
package com.zy.asrs.wcs.sys.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.sys.service.RoleService;
@@ -12,7 +14,9 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

/**
@@ -25,24 +29,17 @@
    @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')")
    @PostMapping("/role/page")
    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()));
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Role, BaseParam> pageParam = new PageParam<>(baseParam, Role.class);
        return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper()));
    }

    @PreAuthorize("hasAuthority('sys:role:list')")
    @PostMapping("/role/list")
    public R list(@RequestBody BaseParam param) {
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(roleService.list());
    }

@@ -101,6 +98,20 @@
    }

    @PreAuthorize("hasAuthority('sys:role:list')")
    @PostMapping("/role/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Role::getName, condition);
        }
        roleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getName()))
        );
        return R.ok().add(vos);
    }

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