From ad853219d4a8c85eaf8c51e66e6efc49df5433bc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 09 七月 2025 18:51:22 +0800
Subject: [PATCH] art: 技术状态鉴定规范3个导入-接口修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java | 82 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 23 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
index d169644..70448c1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java
@@ -15,15 +15,16 @@
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -149,6 +150,7 @@
/**
* 鎻愪氦
+ *
* @param id
* @return
*/
@@ -181,41 +183,45 @@
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
MultipartFile file = entity.getValue();
String fileName = file.getOriginalFilename();
-
Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importSafetyEquipmentCheck(file);
-
if (importResult.isSuccess()) {
- results.put(fileName, "鎴愬姛: " + importResult.getMessage());
successCount++;
} else {
- results.put(fileName, "澶辫触: " + importResult.getMessage());
+ results.put(fileName, importResult.getMessage());
failureCount++;
}
}
// 鏋勫缓鏈�缁堝搷搴�
- Map<String, Object> response = new HashMap<>();
- response.put("results", results);
- response.put("totalFiles", fileMap.size());
- response.put("successCount", successCount);
- response.put("failureCount", failureCount);
-
- if (failureCount > 0) {
- return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触", response);
- }
-
- return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔�"+response);
+ return getResult(results, fileMap.size(), successCount, failureCount);
}
/**
* 瀹夊叏瑁呯疆妫�鏌ユ槑缁嗗鍏�
*
* @param request
- * @param response
* @return
*/
@PostMapping(value = "/importPrecisionCheck")
- public Result<?> importPrecisionCheck(HttpServletRequest request, HttpServletResponse response) {
- return null;
+ public Result<?> importPrecisionCheck(HttpServletRequest request) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, String> results = new LinkedHashMap<>();
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ // 缁熻瀵煎叆缁撴灉
+ int successCount = 0;
+ int failureCount = 0;
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();
+ String fileName = file.getOriginalFilename();
+ Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importPrecisionCheck(file);
+ if (importResult.isSuccess()) {
+ successCount++;
+ } else {
+ results.put(fileName, importResult.getMessage());
+ failureCount++;
+ }
+ }
+ // 鏋勫缓鏈�缁堝搷搴�
+ return getResult(results, fileMap.size(), successCount, failureCount);
}
@@ -223,12 +229,42 @@
* 瀹夊叏瑁呯疆妫�鏌ユ槑缁嗗鍏�
*
* @param request
- * @param response
* @return
*/
@PostMapping(value = "/importOtherCheck")
- public Result<?> importOtherCheck(HttpServletRequest request, HttpServletResponse response) {
- return null;
+ public Result<?> importOtherCheck(HttpServletRequest request) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, String> results = new LinkedHashMap<>();
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ // 缁熻瀵煎叆缁撴灉
+ int successCount = 0;
+ int failureCount = 0;
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();
+ String fileName = file.getOriginalFilename();
+ Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importOtherCheck(file);
+ if (importResult.isSuccess()) {
+ successCount++;
+ } else {
+ results.put(fileName, importResult.getMessage());
+ failureCount++;
+ }
+ }
+ // 鏋勫缓鏈�缁堝搷搴�
+ return getResult(results, fileMap.size(), successCount, failureCount);
+ }
+
+ @NotNull
+ private Result<?> getResult(Map<String, String> results, int fileCount, int successCount, int failureCount) {
+ List<String> response = new ArrayList<>();
+ response.add("鎬绘枃浠舵暟锛�" + fileCount);
+ response.add("鎴愬姛鏁帮細" + successCount);
+ response.add("澶辫触鏁帮細" + failureCount);
+ if (failureCount > 0) {
+ response.add("閿欒淇℃伅锛�" + results.values());
+ return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触锛�" + response);
+ }
+ return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔燂細" + response);
}
--
Gitblit v1.9.3