From d34a44a1ffa778c0a95027f67d56544b0faa4930 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:16:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
index e98d216..e433efa 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
@@ -7,8 +7,8 @@
import com.ruoyi.technology.bean.vo.TechnologyRoutingVo;
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.service.TechnologyRoutingService;
-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.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -16,7 +16,7 @@
@RestController
@RequestMapping("/technologyRouting")
-@Api(tags = "宸ヨ壓璺嚎")
+@Tag(name = "宸ヨ壓璺嚎")
@RequiredArgsConstructor
public class TechnologyRoutingController {
@@ -26,7 +26,7 @@
* 鍒嗛〉鏌ヨ宸ヨ壓璺嚎銆�
*/
@GetMapping("/page")
- @ApiOperation("宸ヨ壓璺嚎鍒嗛〉鏌ヨ")
+ @Operation(summary = "宸ヨ壓璺嚎鍒嗛〉鏌ヨ")
public R<IPage<TechnologyRoutingVo>> page(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
return R.ok(technologyRoutingService.pageTechnologyRouting(page, technologyRoutingDto));
}
@@ -35,7 +35,7 @@
* 鏌ヨ宸ヨ壓璺嚎璇︽儏銆�
*/
@GetMapping("/{id}")
- @ApiOperation("宸ヨ壓璺嚎璇︽儏")
+ @Operation(summary = "宸ヨ壓璺嚎璇︽儏")
public R<TechnologyRoutingVo> getInfo(@PathVariable("id") Long id) {
return R.ok(technologyRoutingService.getTechnologyRoutingInfo(id));
}
@@ -43,8 +43,8 @@
/**
* 鏂板宸ヨ壓璺嚎銆�
*/
- @PostMapping
- @ApiOperation("鏂板宸ヨ壓璺嚎")
+ @PostMapping("/addTechRoute")
+ @Operation(summary = "鏂板宸ヨ壓璺嚎")
public R add(@RequestBody TechnologyRouting technologyRouting) {
return R.ok(technologyRoutingService.saveTechnologyRouting(technologyRouting));
}
@@ -52,8 +52,8 @@
/**
* 淇敼宸ヨ壓璺嚎銆�
*/
- @PutMapping
- @ApiOperation("淇敼宸ヨ壓璺嚎")
+ @PutMapping("editTechRoute")
+ @Operation(summary = "淇敼宸ヨ壓璺嚎")
public R edit(@RequestBody TechnologyRouting technologyRouting) {
return R.ok(technologyRoutingService.updateTechnologyRouting(technologyRouting));
}
@@ -62,8 +62,10 @@
* 鎵归噺鍒犻櫎宸ヨ壓璺嚎銆�
*/
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
+ @Operation(summary = "鍒犻櫎宸ヨ壓璺嚎")
public R remove(@RequestBody List<Long> ids) {
return R.ok(technologyRoutingService.removeTechnologyRouting(ids));
}
+
+ //TODO 澧炲姞宸ヨ壓璺嚎闄勪欢涓婁紶 @闄堟捣鏉�
}
--
Gitblit v1.9.3