From 9b5243a4eb50a6e034620f2fb9b2ffd6fb80820a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 三月 2025 09:19:23 +0800
Subject: [PATCH] 1.检验对象导入优化，2.外购件附件提交3.可靠性计划成品和原辅料
---
basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
index 810c430..7923abd 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.ProductDto;
+import com.ruoyi.basic.dto.StructureTestObjectDto;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.service.ISysDictTypeService;
@@ -24,6 +26,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -60,8 +63,8 @@
private StandardTemplateService standardTemplateService;
@ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
- @PostMapping("/selectItemParameterList")
- public Result selectItemParameterList(Page page,StructureItemParameter itemParameter) throws Exception {
+ @GetMapping("/selectItemParameterList")
+ public Result selectItemParameterList(Page page, StructureItemParameter itemParameter) {
return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
}
@@ -72,7 +75,7 @@
}
@ApiOperation(value = "鍒犻櫎椤圭洰妫�楠屽弬鏁�")
- @PostMapping("/delItemParameter")
+ @DeleteMapping("/delItemParameter")
public Result<?> delItemParameter(Integer id) {
return Result.success(capacityScopeService.delItemParameter(id));
}
@@ -84,8 +87,8 @@
}
@ApiOperation(value = "鑾峰彇妫�楠屽璞�")
- @PostMapping("/selectTestObjectList")
- public Result selectTestObjectList(Page page,PageTestObjectDto pageTestObjectDto) throws Exception {
+ @GetMapping("/selectTestObjectList")
+ public Result selectTestObjectList(Page page, PageTestObjectDto pageTestObjectDto) {
return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
}
@@ -96,7 +99,7 @@
}
@ApiOperation(value = "鍒犻櫎妫�楠屽璞�")
- @PostMapping("/delTestObject")
+ @DeleteMapping("/delTestObject")
public Result<?> delTestObject(Integer id) {
return Result.success(capacityScopeService.delTestObject(id));
}
@@ -114,14 +117,14 @@
}
@ApiOperation(value = "璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
- @PostMapping("/getInsProduction")
+ @GetMapping("/getInsProduction")
public Result getInsProduction() {
return Result.success(capacityScopeService.getInsProduction());
}
@ApiOperation(value = "缁存姢妫�楠屽璞＄殑浜у搧")
- @PostMapping("/selectProductListByObjectId")
- public Result selectProductListByObjectId(Page page,ProductDTO1 productDTO) throws Exception {
+ @GetMapping("/selectProductListByObjectId")
+ public Result selectProductListByObjectId(Page page, ProductDTO1 productDTO) {
return Result.success(productService.selectProductListByObjectId(page, productDTO));
}
@@ -138,7 +141,7 @@
}
@ApiOperation(value = "鍒犻櫎浜у搧")
- @PostMapping("/delProduct")
+ @DeleteMapping("/delProduct")
public Result delProduct(Integer id) {
return Result.success(productService.delProduct(id));
}
@@ -359,7 +362,7 @@
buffer.append("]");
str.setRadiusList(buffer.toString());
}
- // 鏀惰垂鏍囧噯
+ //鏀惰垂鏍囧噯
if (list1.get(26) == null) {
str.setRates(null);
} else {
@@ -382,12 +385,32 @@
@ApiOperation(value = "瀵煎叆妫�楠屽璞�")
@PostMapping("/importExcel")
- public Result importExcel(@RequestParam("file") MultipartFile file) {
- try {
- EasyExcel.read(file.getInputStream(), StructureTestObjectData.class, new StructureTestObjectListener(productService)).sheet().doRead();
+ public Result importExcel(@RequestParam("file") MultipartFile file){
+ List<String> processedFiles = new ArrayList<>();
+ try (InputStream inputStream = file.getInputStream()) {
+ String fileHash = DigestUtils.md5Hex(inputStream);
+ if (processedFiles.contains(fileHash)) {
+ return Result.success(); // 宸插鐞嗚繃鐨勬枃浠剁洿鎺ヨ烦杩�
+ }
+ processedFiles.add(fileHash);
+
+ EasyExcel.read(file.getInputStream(), StructureTestObjectData.class, new StructureTestObjectListener(capacityScopeService)).sheet().doRead();
} catch (IOException e) {
- e.printStackTrace();
+ // 杩欓噷鍙互鏍规嵁瀹為檯鎯呭喌杩涜鏇村畬鍠勭殑閿欒澶勭悊锛屾瘮濡傝褰曟棩蹇楃瓑
+ System.err.println("璇诲彇鏂囦欢鏃跺彂鐢熼敊璇�: " + e.getMessage());
}
return Result.success();
}
+
+ @ApiOperation(value = "鏇存柊浜у搧杞﹂棿")
+ @PostMapping("/updateWorkShop")
+ public Result updateWorkShop(@RequestBody ProductDto productDto) {
+ return Result.success(productService.updateWorkShop(productDto.getId(), productDto.getWorkShopId(), productDto.getWorkShopName()));
+ }
+
+ @ApiOperation(value = "鏇存柊妫�娴嬪璞¤溅闂�")
+ @PostMapping("/updateObjectWorkShop")
+ public Result updateObjectWorkShop(@RequestBody StructureTestObjectDto structureTestObjectDto) {
+ return Result.success(productService.updateObjectWorkShop(structureTestObjectDto));
+ }
}
--
Gitblit v1.9.3