QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(文档拆分): 识别文件路径

Browse Source
This commit is contained in:
yjz
2024-08-07 09:57:01 +08:00
parent 5640c9ed85
commit c174143dd8
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+5 -11
View File
@@ -242,20 +242,14 @@ public class FileUnZip {
* @return * @return
*/ */
public static List<File> readFileByFilename(String path,String filename) { public static List<File> readFileByFilename(String path,String filename) {
if (filename.contains("/")){ path = path + "/" + filename;
filename = filename.substring(filename.lastIndexOf("/") + 1, filename.length());
}
List<File> resultlist = new ArrayList<>(); List<File> resultlist = new ArrayList<>();
if (StringUtil.isNotEmpty(path)){ if (StringUtil.isNotEmpty(path)){
File file = new File(path); File file = new File(path);
if (file.isDirectory()) { String[] splitFilename = filename.split("/");
File[] files = file.listFiles(); filename = splitFilename[splitFilename.length - 1];
for (File fi : files) { if (file.isFile() && file.getName().equals(filename)) {
// 对文件进行过滤 resultlist.add(file);
if (fi.getName().equals(filename)) {
resultlist.add(fi);
}
}
} }
} }
return resultlist; return resultlist;
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+1 -1
View File
@@ -1879,7 +1879,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
i = 0; i = 0;
datasUpdate.add(sarStandImportDto); datasUpdate.add(sarStandImportDto);
} }
String unzipfilepath = zipEntryName + File.separator + "附件"; String unzipfilepath = zipEntryName;
Result<?> message = importSplitItemsData(datasUpdate,menuId,unzipfilepath,infoId,cut,getSheetTableList); Result<?> message = importSplitItemsData(datasUpdate,menuId,unzipfilepath,infoId,cut,getSheetTableList);
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);