From b157b27802ec1a6cf81b9aac8bad6c8c5130d683 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 9 May 2022 18:14:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5--=E4=BA=A4=E4=BB=98=E7=89=A9=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 2 +- .../BussDocumentLibraryEOServiceImpl.java | 2 +- .../impl/DummyInventoryInfoEOServiceImpl.java | 14 +++---- .../ProjectLawsInventoryEOServiceImpl.java | 14 +++---- .../jero/modules/split/common/FileUnZip.java | 42 ++++++++++++++++--- .../impl/FileSplitItemsEOServiceImpl.java | 8 ++-- .../impl/SarFileSplitItemsEOServiceImpl.java | 6 +-- 7 files changed, 59 insertions(+), 29 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 784f30a38..b7fed2a1c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -1032,7 +1032,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(filepath, fileName); + List nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null); if (nowFileList.size() == 0) { if(CutEnum.CN.getValue().equals(cut)) { errorMsg += "附件模板压缩包中没有" + fileName + "文件; "; 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 6d0d6e35f..103b7c6f2 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 @@ -4342,7 +4342,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName); + List nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,cut,errorMsg,null,key,key); if (nowFileList.size() == 0) { if(CutEnum.CN.getValue().equals(cut)){ errorMsg += key + "压缩包中没有" + fileName + "文件; "; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index beea207d2..b4a585b69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1087,14 +1087,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName); + List nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,dummyInventoryInfoEO.getCut(),errorMsg,msgList,nameCn,nameEn); if (nowFileList.size() == 0) { - if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ - errorMsg += "压缩包中没有" + fileName + "文件; "; - }else{ - errorMsg += " Not in the zip package" + fileName + "file; "; - } - msgList.add(errorMsg); +// if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ +// errorMsg += "压缩包中没有" + fileName + "文件; "; +// }else{ +// errorMsg += " Not in the zip package" + fileName + "file; "; +// } +// msgList.add(errorMsg); } else { try { FileInputStream input = new FileInputStream(nowFileList.get(0)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 7beb06b21..e2275259b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2309,14 +2309,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName); + List nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,projectLawsInventoryEO.getCut(),errorMsg,msgList,nameCn,nameEn); if (nowFileList.size() == 0) { - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - errorMsg += "压缩包中没有" + fileName + "文件; "; - }else{ - errorMsg += " Not in the zip package" + fileName + "file; "; - } - msgList.add(errorMsg); +// if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ +// errorMsg += "压缩包中没有" + fileName + "文件; "; +// }else{ +// errorMsg += " Not in the zip package" + fileName + "file; "; +// } +// msgList.add(errorMsg); } else { try { FileInputStream input = new FileInputStream(nowFileList.get(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 6cd2886b5..2b3ef0ac2 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 @@ -1,12 +1,18 @@ package com.jero.modules.split.common; +import com.jero.common.constant.enums.CutEnum; import com.xkcoding.http.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; @@ -114,9 +120,18 @@ public class FileUnZip { * gaoyan * @param filename */ - public static List readFileByFilename(String path,String filename) { + public static List readFileByFilename(String path, + String filename, + String cut, + String errorMsg, + List msgList, + String nameCn, + String nameEn) { + String filenameOne = ""; + String filenameTwo = ""; if(filename.contains("/")){ - filename = filename.split("/")[1]; + filenameOne = filename.split("/")[0]; + filenameTwo = filename.split("/")[1]; } List resultlist = new ArrayList<>(); if (StringUtil.isNotEmpty(path)){ @@ -128,20 +143,35 @@ public class FileUnZip { File[] filesTemp = fi.listFiles(); for (File fileTemp : filesTemp) { // 对文件进行过滤 - if (fileTemp.getName().equals(filename)) { + if (fileTemp.getName().equals(filenameTwo) && fileTemp.getPath().contains(filenameOne) && StringUtils.isNotBlank(filenameOne)) { resultlist.add(fileTemp); } } }else{ // 对文件进行过滤 - if (fi.getName().equals(filename)) { + if (fi.getName().equals(filenameTwo) && fi.getPath().contains(filenameOne) && StringUtils.isNotBlank(filenameOne)) { resultlist.add(fi); } } - } } } + if(resultlist.size() == 0){ + String name = ""; + if(filename.contains("/")){ + name = filenameTwo; + }else{ + name = filename; + } + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += nameCn + name + "格式不正确或者压缩包中没有" + name + "文件,请参考模板下载中的说明"; + }else{ + errorMsg += nameEn + name + " Incorrect format or not present in compressed package " + name + " file please refer to the description in template download;"; + } + if(msgList != null){ + msgList.add(errorMsg); + } + } return resultlist; } // public static List readFileByFilename(String path,String filename) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 8d1642928..31347c765 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1217,7 +1217,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + List nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i],null,null,null,null,null); if (nowfilelist != null && !nowfilelist.isEmpty()) { String url = nowfilelist.get(0).getPath(); MultipartFile multipartFile = createMfileByPath(url); @@ -1262,7 +1262,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + List nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i],null,null,null,null,null); if (nowfilelist != null && !nowfilelist.isEmpty()) { String url = nowfilelist.get(0).getPath(); MultipartFile multipartFile = createMfileByPath(url); @@ -1311,7 +1311,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + List nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i],null,null,null,null,null); if (nowfilelist != null && !nowfilelist.isEmpty()) { String url = nowfilelist.get(0).getPath(); MultipartFile multipartFile = createMfileByPath(url); @@ -2223,7 +2223,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(filepath, fileName); + List nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null); if (nowFileList.size() == 0) { if(CutEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "压缩包中没有" + fileName + "文件; "; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java index 04e9c8377..5e566814c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -993,7 +993,7 @@ public class SarFileSplitItemsEOServiceImpl extends ServiceImpl nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + List nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i],null,null,null,null,null); if (nowfilelist != null && !nowfilelist.isEmpty()) { OSSFile ossFile = new OSSFile(); ossFile.setFileName(nowfilelist.get(0).getName()); @@ -1030,7 +1030,7 @@ public class SarFileSplitItemsEOServiceImpl extends ServiceImpl nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + List nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i],null,null,null,null,null); if (nowfilelist != null && !nowfilelist.isEmpty()) { OSSFile ossFile = new OSSFile(); ossFile.setFileName(nowfilelist.get(0).getName()); @@ -1069,7 +1069,7 @@ public class SarFileSplitItemsEOServiceImpl extends ServiceImpl nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); + List nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i],null,null,null,null,null); if (nowfilelist != null && !nowfilelist.isEmpty()) { OSSFile ossFile = new OSSFile(); ossFile.setFileName(nowfilelist.get(0).getName());