From 3db92a6fff18c1591b298fa0bf8085dfcbdb6747 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 06 Jul 2024 15:08:11 +0800
Subject: [PATCH] 修改智能航线规划,修改南昌机场和西安机场人工接管时图片绑定图斑问题

---
 src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 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 2f94bf1..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,29 +1,28 @@
 package com.dji.sample.patches.utils;
 
-import org.apache.http.entity.ContentType;
-import org.apache.tomcat.util.http.fileupload.FileItem;
-import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import java.io.*;
 import java.util.UUID;
 
 public class MultipartFileTOFileUtil {
-    //MultiparFile转File
-    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();
             }
@@ -38,16 +37,23 @@
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        ZipUtil.deleteFiles(tmpFileDir);
         return file;
     }
 
-    //File转MultiparFile
     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