From 00bc2f8702167b926a9fd639c3d2a49f0ddab5b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:42:12 +0800
Subject: [PATCH] refactor(production): 将javax.servlet.http替换为jakarta.servlet.http
---
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index 1dd597b..e95a9d7 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -3,18 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProductProcessRouteItemDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
import com.ruoyi.production.service.ProductionProductMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
import java.util.List;
@RequestMapping("productionProductMain")
@@ -36,6 +32,18 @@
return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
}
+ @GetMapping("/page")
+ @ApiOperation("鐢熶骇鎶ュ伐鍒嗛〉鏌ヨ")
+ public R pageProductionProductMain(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
+ return R.ok(productionProductMainService.pageProductionProductMain(page, productionProductMainDto));
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation("鐢熶骇鎶ュ伐璇︽儏")
+ public R getInfo(@PathVariable("id") Long id) {
+ return R.ok(productionProductMainService.getProductionProductMainInfo(id));
+ }
+
/**
* 鎶ュ伐鏂板鏇存柊
* @param productionProductMainDto
@@ -46,14 +54,30 @@
return R.ok(productionProductMainService.addProductMain(productionProductMainDto));
}
+ @PostMapping
+ @ApiOperation("鏂板鐢熶骇鎶ュ伐")
+ public R add(@RequestBody ProductionProductMainDto productionProductMainDto) {
+ return R.ok(productionProductMainService.saveProductionProductMain(productionProductMainDto));
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼鐢熶骇鎶ュ伐")
+ public R edit(@RequestBody ProductionProductMainDto productionProductMainDto) {
+ return R.ok(productionProductMainService.saveProductionProductMain(productionProductMainDto));
+ }
+
@ApiOperation("鍒犻櫎鎶ュ伐")
@DeleteMapping("/delete")
- @Transactional(rollbackFor = Exception.class)
public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {
-
return R.ok(productionProductMainService.removeProductMain(productionProductMainDto.getId()));
}
+ @DeleteMapping("/{id}")
+ @ApiOperation("鍒犻櫎鐢熶骇鎶ュ伐")
+ public R remove(@PathVariable("id") Long id) {
+ return R.ok(productionProductMainService.removeProductMain(id));
+ }
+
/**
* 瀵煎嚭
--
Gitblit v1.9.3