From aed1dd23e277163c4ba09b65a688931acb5c8262 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 7 Apr 2022 13:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BussDocumentLibraryEOServiceImpl.java | 18 ++++++++++++------
 .../jero/modules/split/common/FileUnZip.java   |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 02135ea64..8a09c69dc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -3563,7 +3563,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         if (!str.equals("zip") && !str.equals("rar")) {
             throw new JeroBootException("请上传zip格式的文件或rar格式的文件");
         }
-        String path = uploadpath + File.separator + "modal" + File.separator + filenameorg;
+        String path = uploadpath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis();
         File saveDirectory = new File(path);
         if (!saveDirectory.isDirectory()) {
             saveDirectory.mkdir();
@@ -3693,13 +3693,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 }
             }
         }
+        workbook.close();
         //树形数据字典
         List<SysCategory> categoryList = sysCategoryService.list();
         //普通数据字典
         List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
         //表头
         List<Map<String, Object>> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), "cn", "add");
-        exportDatas(dataList, addForm, categoryList, dictItemList, zipEntryName);
+        exportDatas(dataList, addForm, categoryList, dictItemList, zipEntryName,saveDirectory);
         //删除原上传文件
         FileUnZip.deleteDir(saveDirectory);
 
@@ -3709,7 +3710,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                              List<Map<String, Object>> fieldList,
                              List<SysCategory> categoryList,
                              List<SysDictItem> dictItemList,
-                             String zipEntryName) {
+                             String zipEntryName,
+                             File saveDirectory) {
         //树形数据字典
         List<String> treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
         //普通数据字典
@@ -3996,11 +3998,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     }
                 }
 
-                if (countError > 0) {
-                    msgList.add(errorMsg);
-                }
+//                if (countError > 0) {
+//                    msgList.add(errorMsg);
+//                }
                 mapResult.put(field, value);
             }
+            if (countError > 0) {
+                msgList.add(errorMsg);
+            }
             mapList.add(mapResult);
         }
         if (msgList.size() > 0) {
@@ -4009,6 +4014,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             for (String s : msgList) {
                 html += s + "</br>";
             }
+            FileUnZip.deleteDir(saveDirectory);
             throw new JeroBootException(html);
         } else {
             if (mapList.size() != 0) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
index b74ecdecf..6cd2886b5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
@@ -81,6 +81,8 @@ public class FileUnZip {
                     return false;
                 }
             }
+        }else if(dir.isFile()){
+            return dir.delete();
         }
         // 目录此时为空，可以删除
         return dir.delete();