From af6ffc009f92628023d183ffd4971e7e60084ecd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 20 五月 2026 17:53:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/projectManagement/controller/PlanController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
index f3a4745..5ec8191 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
@@ -1,17 +1,18 @@
package com.ruoyi.projectManagement.controller;
-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.service.PlanService;
import com.ruoyi.projectManagement.vo.SavePlanNodeVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
import com.ruoyi.projectManagement.vo.SearchPlanVo;
-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 lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
/**
* @author buhuazhen
@@ -20,30 +21,30 @@
*/
@RestController
@RequestMapping("/projectManagement/plan")
-@Api(value = "PlanController", tags = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
+@Tag(name = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
-public class PlanController {
+public class PlanController extends BaseController {
private final PlanService planService;
@PostMapping("/save")
- @ApiOperation("淇濆瓨")
- public AjaxResult save(@RequestBody @Valid SavePlanVo savePlanVo) {
+ @Operation(summary = "淇濆瓨")
+ public R<?> save(@RequestBody @Valid SavePlanVo savePlanVo) {
planService.savePlan(savePlanVo);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/delete/{id}")
- @ApiOperation("鍒犻櫎")
- public AjaxResult delete(@PathVariable Long id) {
+ @Operation(summary = "鍒犻櫎")
+ public R<?> delete(@PathVariable Long id) {
planService.deletePlan(id);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/listPage")
- @ApiOperation("鍒嗛〉鍒楄〃")
- public AjaxResult listPage(@RequestBody SearchPlanVo searchPlanVo) {
- return AjaxResult.success(planService.searchPlan(searchPlanVo));
+ @Operation(summary = "鍒嗛〉鍒楄〃")
+ public R<?> listPage(@RequestBody SearchPlanVo searchPlanVo) {
+ return R.ok(planService.searchPlan(searchPlanVo));
}
}
--
Gitblit v1.9.3