From 44e6798b93f8c53582817100c6d9d79ca2a42c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 5 Apr 2023 14:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ota/service/impl/OtaBaCxListServiceImpl.java | 9 +++++++--
 .../java/com/jero/modules/ota/utils/ImportFileUtil.java  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
index 767abeb93..1ed0b808a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
@@ -105,7 +105,7 @@ public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBa
      */
     @Override
     public void deleteById(String id) {
-        if(StringUtils.isNotEmpty(id)){
+        if (StringUtils.isNotEmpty(id)) {
             removeById(id);
             otaBaCxJbxxService.deleteByOtaId(id);
             otaBaCxZxsjyqService.deleteByOtaId(id);
@@ -228,7 +228,12 @@ public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBa
         File qtFile = ImportFileUtil.findFile(exportFile, "其他.xlsx");
         otaBaCxQtService.exportData(qtFile, otaId, cut);
 
-        String outPath = uploadPath + "/车型及功能备案" + System.currentTimeMillis() + ".zip";
+        String outPath = uploadPath + "/" + System.currentTimeMillis();
+        File outFile = new File(outPath);
+        if (!outFile.isDirectory()) {
+            outFile.mkdir();
+        }
+        outPath += "/车型及功能备案.zip";
         //FileUtils.forceDelete(template);
         FileOutputStream fos1 = new FileOutputStream(outPath);
         ImportFileUtil.toZip(exportFile.getCanonicalPath(), fos1, true);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
index 1259d0fec..d19156c8a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
@@ -71,7 +71,7 @@ public class ImportFileUtil {
                 throw new JeroBootException("Please upload a zip file or rar file");
             }
         }
-        String path = uploadPath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis();
+        String path = uploadPath + File.separator + "modal" + File.separator + System.currentTimeMillis()+ File.separator + filenameorg;
         File saveDirectory = new File(path);
         if (!saveDirectory.isDirectory()) {
             saveDirectory.mkdir();