From 5986f5a65f02e478c48a605edecf3c3ac3959fa5 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 8 Nov 2023 16:00:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E5=A4=B9=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 486a6bc1..e56d8a84 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1430,17 +1430,17 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 解压缩 String zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), String.valueOf(path)); + // 需求变更 不做判断 //判断压缩包下是否只有一个文件夹 - File fileTemp = new File(path.toUri()); - int length = fileTemp.listFiles().length; - if (length > 2) { - FileUnZip.deleteDir(saveDirectory); - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.FOLDER_ONLY_ONE)); - } +// File fileTemp = new File(path.toUri()); +// int length = fileTemp.listFiles().length; +// if (length > 2) { +// FileUnZip.deleteDir(saveDirectory); +// throw new JeroBootException(MessageUtils.getMessage(ResultCommon.FOLDER_ONLY_ONE)); +// } List fileList = new ArrayList<>(); - File fileNew = new File(zipEntryName); - for (File file1 : Objects.requireNonNull(fileNew.listFiles())) { + for (File file1 : Objects.requireNonNull(saveDirectory.listFiles())) { if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx")) { fileList.add(file1); } @@ -1452,7 +1452,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { FileUnZip.deleteDir(saveDirectory); throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); } - List excelfilelist = FileUnZip.readImpExcelFile(fileNew.getPath()); + List excelfilelist = FileUnZip.readImpExcelFile(saveDirectory.getPath()); System.gc(); if (excelfilelist.size() != 1) { FileUnZip.deleteDir(saveDirectory); @@ -1483,7 +1483,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 数据内容格式校验 Map fileMap = new HashMap<>(); // 遍历saveDirectory下的所有文件 - populateFileMap(fileNew, fileNew, fileMap); + populateFileMap(saveDirectory, saveDirectory, fileMap); try (Workbook workbook = new XSSFWorkbook(Files.newInputStream(excelfilelist.get(0).toPath()))) { // 检测是否是空Excel