From 0a305b633bb743f01cbb636670c2fc02620168d0 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 01 四月 2025 15:06:24 +0800
Subject: [PATCH] 标准库功能修改备份开发
---
basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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 e927343..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.*;
@@ -61,7 +64,7 @@
@ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
@GetMapping("/selectItemParameterList")
- public Result selectItemParameterList(Page page,StructureItemParameter itemParameter) {
+ public Result selectItemParameterList(Page page, StructureItemParameter itemParameter) {
return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
}
@@ -85,7 +88,7 @@
@ApiOperation(value = "鑾峰彇妫�楠屽璞�")
@GetMapping("/selectTestObjectList")
- public Result selectTestObjectList(Page page,PageTestObjectDto pageTestObjectDto) {
+ public Result selectTestObjectList(Page page, PageTestObjectDto pageTestObjectDto) {
return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
}
@@ -121,7 +124,7 @@
@ApiOperation(value = "缁存姢妫�楠屽璞＄殑浜у搧")
@GetMapping("/selectProductListByObjectId")
- public Result selectProductListByObjectId(Page page,ProductDTO1 productDTO) {
+ public Result selectProductListByObjectId(Page page, ProductDTO1 productDTO) {
return Result.success(productService.selectProductListByObjectId(page, productDTO));
}
@@ -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