From 3cb99f764098d7430dfc8871d9674834020a4fd5 Mon Sep 17 00:00:00 2001
From: xingjinshuang <xingjs@qq.com>
Date: 星期二, 24 十二月 2024 16:40:03 +0800
Subject: [PATCH] @xingjs@20241224@添加解析CSV文件相关实体类、方法；添加文件上传配置;添加开发文件上传相关工具类
---
src/main/java/com/se/simu/controller/SimuController.java | 88 ++++---------------------------------------
1 files changed, 9 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index 00c08ac..de8fccf 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -12,23 +12,15 @@
import com.se.simu.service.*;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
@Api(tags = "浠跨湡绠＄悊")
@Slf4j
@@ -50,6 +42,10 @@
@Resource
PropertiesConfig config;
+
+ @Value("${simu-app.filePath}")
+ private String uploadedFolder;
+
@Resource
ResultService resultService;
@@ -179,48 +175,6 @@
}
}
- @ApiOperation("test-涓婁紶澶氫釜鏂囦欢")
- @ApiImplicitParam(name = "schemeName", value = "鏂规鍚嶇О", required = true, dataType = "String", paramType = "query", example = "edf243d3-3bec-4c51-9930-1ba862d9b5a3", dataTypeClass = String.class)
- @PostMapping("/uploadMultipleFiles")
- public ResponseEntity<String> uploadMultipleFiles(List<MultipartFile> files, @RequestParam("schemeName") String schemeName) throws IOException {
- // 涓婁紶鏂囦欢璺緞
- String targetDir = Paths.get(config.getOutPath(), schemeName).toString();
- log.info("鐩爣鐩綍: {}", targetDir);
- createDirectoriesIfNotExists(targetDir);
- List<CompletableFuture<Void>> uploadTasks = files.stream()
- .map(file -> CompletableFuture.runAsync(() -> {
- try {
- file.transferTo(Paths.get(targetDir, file.getOriginalFilename()));
- } catch (IOException e) {
- log.error("鏂囦欢涓婁紶澶辫触", e);
- throw new RuntimeException("鏂囦欢涓婁紶澶辫触");
- }
- }))
- .collect(Collectors.toList());
-
- CompletableFuture<Void> allUploadTasks = CompletableFuture.allOf(uploadTasks.toArray(new CompletableFuture[0]));
-
- try {
- allUploadTasks.get();
- return ResponseEntity.ok("鎵�鏈夋枃浠朵笂浼犳垚鍔�");
- } catch (InterruptedException | ExecutionException e) {
- log.error("鏂囦欢涓婁紶澶辫触", e);
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("鏂囦欢涓婁紶澶辫触");
- }
- }
-
-
- /**
- * @param targetDir 鐩爣鐩綍
- * @throws IOException
- */
- private void createDirectoriesIfNotExists(String targetDir) throws IOException {
- Path path = Paths.get(targetDir);
- if (!Files.exists(path)) {
- Files.createDirectories(path);
- }
- }
-
/**
* 鏂囦欢鍒涘缓妯℃嫙
*
@@ -229,28 +183,10 @@
*/
@ApiOperation(value = "鏂囦欢鍒涘缓")
@PostMapping(value = "/file_create", produces = "application/json; charset=UTF-8")
- public R<Object> fileCreate(List<MultipartFile> files,@RequestBody @ApiParam("鍒涘缓浠跨湡瑙嗗浘绫�") CreateSimuVo vo) throws IOException {
- // 涓婁紶鏂囦欢璺緞
- String targetDir = Paths.get(config.getOutPath(), "files").toString();
- log.info("鐩爣鐩綍: {}", targetDir);
- createDirectoriesIfNotExists(targetDir);
- List<CompletableFuture<Void>> uploadTasks = files.stream()
- .map(file -> CompletableFuture.runAsync(() -> {
- try {
- file.transferTo(Paths.get(targetDir, file.getOriginalFilename()));
- } catch (IOException e) {
- log.error("鏂囦欢涓婁紶澶辫触", e);
- throw new RuntimeException("鏂囦欢涓婁紶澶辫触");
- }
- }))
- .collect(Collectors.toList());
- CompletableFuture<Void> allUploadTasks = CompletableFuture.allOf(uploadTasks.toArray(new CompletableFuture[0]));
- try {
- allUploadTasks.get();
- log.info("鏂囦欢涓婁紶鎴愬姛");
- } catch (InterruptedException | ExecutionException e) {
- log.error("鏂囦欢涓婁紶澶辫触", e);
- }
+ public R<Object> fileCreate(@RequestBody @ApiParam("鍒涘缓浠跨湡瑙嗗浘绫�") CreateSimuVo vo) throws IOException {
+ // 鑾峰彇涓婁紶鏂囦欢璺緞
+ String targetDir = uploadedFolder;
+
try {
if (null == vo.getTotal() || vo.getTotal() < 1 || vo.getTotal() > 1000) {
@@ -301,12 +237,6 @@
return fail(ex, null);
}
}
-
-
-
-
-
-
}
--
Gitblit v1.9.3