|
@@ -3,6 +3,7 @@ package com.taais.biz.service.impl;
|
|
|
import java.io.File;
|
|
|
import java.nio.file.Path;
|
|
|
import java.nio.file.Paths;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -224,21 +225,25 @@ public class DataSeqServiceImpl extends BaseServiceImpl<DataSeqMapper, DataSeq>
|
|
|
String unzipPath = resourcePath.substring(0, resourcePath.lastIndexOf(".")) + BizConstant.UNZIP_SUFFIX + "/" + dir;
|
|
|
String resultPath = resourcePath.substring(0, resourcePath.lastIndexOf(".")) + subsystem + "/" + dir;
|
|
|
|
|
|
-
|
|
|
- if (isInput) {
|
|
|
- String urlPrefix = ossEntity.getUrl().substring(0, ossEntity.getUrl().lastIndexOf(".")) + BizConstant.UNZIP_SUFFIX + "/" + dir;
|
|
|
- // 列出unzipPath下所有图片文件
|
|
|
- File directory = new File(unzipPath);
|
|
|
- File[] files = directory.listFiles();
|
|
|
- List<String> imageList = Arrays.asList(files).stream().filter(file -> isImageFile(file)).map(file -> urlPrefix + "/" + file.getName()).toList();
|
|
|
- return imageList;
|
|
|
- } else {
|
|
|
- String urlPrefix = ossEntity.getUrl().substring(0, ossEntity.getUrl().lastIndexOf(".")) + subsystem + "/" + dir;
|
|
|
- // 列出unzipPath下所有图片文件
|
|
|
- File directory = new File(resultPath);
|
|
|
- File[] files = directory.listFiles();
|
|
|
- List<String> imageList = Arrays.asList(files).stream().filter(file -> isImageFile(file)).map(file -> urlPrefix + "/" + file.getName()).toList();
|
|
|
- return imageList;
|
|
|
+ try {
|
|
|
+ if (isInput) {
|
|
|
+ String urlPrefix = ossEntity.getUrl().substring(0, ossEntity.getUrl().lastIndexOf(".")) + BizConstant.UNZIP_SUFFIX + "/" + dir;
|
|
|
+ // 列出unzipPath下所有图片文件
|
|
|
+ File directory = new File(unzipPath);
|
|
|
+ File[] files = directory.listFiles();
|
|
|
+ List<String> imageList = Arrays.asList(files).stream().filter(file -> isImageFile(file)).map(file -> urlPrefix + "/" + file.getName()).toList();
|
|
|
+ return imageList;
|
|
|
+ } else {
|
|
|
+ String urlPrefix = ossEntity.getUrl().substring(0, ossEntity.getUrl().lastIndexOf(".")) + subsystem + "/" + dir;
|
|
|
+ // 列出unzipPath下所有图片文件
|
|
|
+ File directory = new File(resultPath);
|
|
|
+ File[] files = directory.listFiles();
|
|
|
+ List<String> imageList = Arrays.asList(files).stream().filter(file -> isImageFile(file)).map(file -> urlPrefix + "/" + file.getName()).toList();
|
|
|
+ return imageList;
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ System.out.println("getImages error: " + e.getMessage());
|
|
|
+ return new ArrayList<>();
|
|
|
}
|
|
|
}
|
|
|
|