From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
index bed65de..f7fc0d6 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
@@ -1,51 +1,69 @@
package com.ruoyi.technology.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.technology.bean.dto.TechnologyRoutingDto;
+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 org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
+import java.util.List;
@RestController
@RequestMapping("/technologyRouting")
-@Api(tags = "宸ヨ壓璺嚎")
+@Tag(name = "宸ヨ壓璺嚎")
+@RequiredArgsConstructor
public class TechnologyRoutingController {
- @Autowired
- private TechnologyRoutingService technologyRoutingService;
+ private final TechnologyRoutingService technologyRoutingService;
+ /**
+ * 鍒嗛〉鏌ヨ宸ヨ壓璺嚎銆�
+ */
@GetMapping("/page")
- @ApiOperation("宸ヨ壓璺嚎鍒嗛〉鏌ヨ")
- public R page(Page<TechnologyRouting> page, TechnologyRouting technologyRouting) {
- return R.ok(technologyRoutingService.pageTechnologyRouting(page, technologyRouting));
+ @Operation(summary = "宸ヨ壓璺嚎鍒嗛〉鏌ヨ")
+ public R<IPage<TechnologyRoutingVo>> page(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
+ return R.ok(technologyRoutingService.pageTechnologyRouting(page, technologyRoutingDto));
}
+ /**
+ * 鏌ヨ宸ヨ壓璺嚎璇︽儏銆�
+ */
@GetMapping("/{id}")
- @ApiOperation("宸ヨ壓璺嚎璇︽儏")
- public R getInfo(@PathVariable("id") Long id) {
- return R.ok(technologyRoutingService.getById(id));
+ @Operation(summary = "宸ヨ壓璺嚎璇︽儏")
+ public R<TechnologyRoutingVo> getInfo(@PathVariable("id") Long id) {
+ return R.ok(technologyRoutingService.getTechnologyRoutingInfo(id));
}
- @PostMapping
- @ApiOperation("鏂板宸ヨ壓璺嚎")
+ /**
+ * 鏂板宸ヨ壓璺嚎銆�
+ */
+ @PostMapping("/addTechRoute")
+ @Operation(summary = "鏂板宸ヨ壓璺嚎")
public R add(@RequestBody TechnologyRouting technologyRouting) {
return R.ok(technologyRoutingService.saveTechnologyRouting(technologyRouting));
}
- @PutMapping
- @ApiOperation("淇敼宸ヨ壓璺嚎")
+ /**
+ * 淇敼宸ヨ壓璺嚎銆�
+ */
+ @PutMapping("editTechRoute")
+ @Operation(summary = "淇敼宸ヨ壓璺嚎")
public R edit(@RequestBody TechnologyRouting technologyRouting) {
- return R.ok(technologyRoutingService.updateById(technologyRouting));
+ return R.ok(technologyRoutingService.updateTechnologyRouting(technologyRouting));
}
- @DeleteMapping("/{ids}")
- @ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
- public R remove(@PathVariable("ids") Long[] ids) {
- return R.ok(technologyRoutingService.removeTechnologyRouting(Arrays.asList(ids)));
+ /**
+ * 鎵归噺鍒犻櫎宸ヨ壓璺嚎銆�
+ */
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎宸ヨ壓璺嚎")
+ public R remove(@RequestBody List<Long> ids) {
+ return R.ok(technologyRoutingService.removeTechnologyRouting(ids));
}
}
--
Gitblit v1.9.3