Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

6 天以前 d06ef3f44d6dc19dae223ab420165369ea13cc16

 src/main/java/com/ruoyi/projectManagement/controller/RolesController.java

@@ -4,13 +4,14 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -19,42 +20,42 @@
@RestController
@AllArgsConstructor
@RequestMapping("/projectManagement/roles")
@Api(value = "Roles", tags = "")
public class RolesController {
@Tag(name = "")
public class RolesController extends BaseController {

    private RolesService rolesservice;
    private RolesMapper rolesMapper;

    @GetMapping("/listPage")
    @ApiOperation("分页查询所有")
    public AjaxResult listPage(Page<Roles> page, Roles roles) {
        return AjaxResult.success(rolesservice.listPage(page, roles));
    @Operation(summary = "分页查询所有")
    public R<?> listPage(Page<Roles> page, Roles roles) {
        return R.ok(rolesservice.listPage(page, roles));
    }

    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody RoleDto roleDto) {
    @Operation(summary = "新增")
    public R<?> add(@RequestBody RoleDto roleDto) {
        if (roleDto.getIsDefaultNo()) {
            roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no"));
        }
        return AjaxResult.success(rolesservice.save(roleDto));
        return R.ok(rolesservice.save(roleDto));
    }

    @PostMapping("/update")
    @ApiOperation("修改")
    public AjaxResult update(@RequestBody Roles roles) {
        return AjaxResult.success(rolesservice.updateById(roles));
    @Operation(summary = "修改")
    public R<?> update(@RequestBody Roles roles) {
        return R.ok(rolesservice.updateById(roles));
    }

    @DeleteMapping("/delete")
    @ApiOperation("删除")
    public AjaxResult delete(@RequestBody List<Long> ids) {
        if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("请传入要删除的ID");
        return AjaxResult.success(rolesservice.removeBatchByIds(ids));
    @Operation(summary = "删除")
    public R<?> delete(@RequestBody List<Long> ids) {
        if (CollectionUtils.isEmpty(ids)) return R.fail("请传入要删除的ID");
        return R.ok(rolesservice.removeBatchByIds(ids));
    }

    @PostMapping("/listSimpleRole")
    public AjaxResult listSimpleRole() {
        return AjaxResult.success(rolesservice.listSimpleRole());
    public R<?> listSimpleRole() {
        return R.ok(rolesservice.listSimpleRole());
    }
}