From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java b/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
index cebda32..40558d6 100644
--- a/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
+++ b/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
@@ -1,26 +1,28 @@
package com.dji.sample.patches.utils;
+import org.springframework.mock.web.MockMultipartFile;
import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
+import java.io.*;
import java.util.UUID;
public class MultipartFileTOFileUtil {
-
- public File multipartFile2File (MultipartFile multipartFile) {
- String tmpFileDir = null;
+ /**
+ * MultiparFile转File
+ * @param multipartFile
+ * @param unzipPath
+ * @return
+ */
+ public static File multipartFile2File(MultipartFile multipartFile, String unzipPath) {
// 创建临时文件
String randomFileName = UUID.randomUUID().toString();
- tmpFileDir = "D:/tmp/"+randomFileName;
+ String tmpFileDir = unzipPath + randomFileName;
File file = new File(tmpFileDir);
InputStream inputStream = null;
FileOutputStream outputStream = null;
try {
// 获取文件输入流
inputStream = multipartFile.getInputStream();
-
if (!file.exists()) {
file.createNewFile();
}
@@ -35,7 +37,23 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
- ZipUtil.deleteFiles(tmpFileDir);
return file;
}
+
+ public static MultipartFile convert(File file) throws IOException {
+ FileInputStream input = new FileInputStream(file);
+ MultipartFile multipartFile = new MockMultipartFile("file",
+ file.getName(), "application/octet-stream", input);
+ return multipartFile;
+ }
+ /**
+ * 将文件转换为MultipartFile类型。
+ * @param file 需要转换的文件对象，不可为null。
+ * @throws IOException 如果在读取文件时发生错误，则抛出IOException。
+ */
+ public static void deleteFile(File file) {
+ if (file.exists()) {
+ file.delete();
+ }
+ }
}
--
Gitblit v1.9.3