From 864037580c3e4d9f8c756b66ef40464d23262e6c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 20 五月 2026 17:53:42 +0800
Subject: [PATCH] feat(home): 添加生产看板功能并优化订单查询性能
---
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index d19b4fc..93fadf7 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/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,37 +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"));
+ 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("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(rolesservice.removeBatchByIds(ids));
+ @Operation(summary = "鍒犻櫎")
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(rolesservice.removeBatchByIds(ids));
+ }
+
+ @PostMapping("/listSimpleRole")
+ public R<?> listSimpleRole() {
+ return R.ok(rolesservice.listSimpleRole());
}
}
--
Gitblit v1.9.3