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 7a690c725..ad9bf75f1 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 @@ -35,11 +35,9 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.aspectj.util.FileUtil; -import org.checkerframework.checker.units.qual.C; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.enmus.ExcelType; @@ -516,14 +514,17 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl fileTemplateList = new ArrayList<>(); + Map fileNowPathMap = new HashMap<>(); for (ParamsInfoEO paramsInfoEO : paramsInfoEOList) { String fileTemplateConnectId = paramsInfoEO.getFileTemplateConnectId(); if (StringUtils.isNotBlank(fileTemplateConnectId)) { List ossFileList = ossFileService.getFileInfosByConnectId(fileTemplateConnectId); - List fileNameList = ossFileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - paramsInfoEO.setFileTemplateName(StringUtils.join(fileNameList, ",")); + if (CollectionUtil.isNotEmpty(ossFileList)) { + paramsInfoEO.setFileTemplateName(paramsInfoEO.getNioNumber() + "/" + ossFileList.get(0).getFileName()); - fileTemplateList.addAll(ossFileList); + fileNowPathMap.put(ossFileList.get(0).getId(), fileNowPath + File.separator + paramsInfoEO.getNioNumber()); + fileTemplateList.add(ossFileList.get(0)); + } } } @@ -590,7 +591,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl fileTemplateList = new ArrayList<>(); + Map fileNowPathMap = new HashMap<>(); for (ParamsInfoEnExport paramsInfoEnExport : paramsInfoEnExportList) { String fileTemplateConnectId = paramsInfoEnExport.getFileTemplateConnectId(); if (StringUtils.isNotBlank(fileTemplateConnectId)) { List ossFileList = ossFileService.getFileInfosByConnectId(fileTemplateConnectId); - List fileNameList = ossFileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - paramsInfoEnExport.setFileTemplateName(StringUtils.join(fileNameList, ",")); + if (CollectionUtil.isNotEmpty(ossFileList)) { + paramsInfoEnExport.setFileTemplateName(paramsInfoEnExport.getNioNumber() + "/" + ossFileList.get(0).getFileName()); - fileTemplateList.addAll(ossFileList); + fileNowPathMap.put(ossFileList.get(0).getId(), fileNowPath + File.separator + paramsInfoEnExport.getNioNumber()); + fileTemplateList.add(ossFileList.get(0)); + } } } @@ -677,14 +681,21 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl fileTemplateList,String fileNowPath) { + private void downLoadFileList(List fileTemplateList,Map fileNowPathMap) { for(OSSFile fileExportDto : fileTemplateList){ + String fileNowPath = fileNowPathMap.get(fileExportDto.getId()); + File nowFile = new File(fileNowPath); + if (nowFile.exists()){ + nowFile.delete(); + } + nowFile.mkdirs(); + String oldPath = fileExportDto.getUrl(); String newPath = fileNowPath + File.separator + fileExportDto.getFileName(); if (CosBootUtil.doesObjectExist(oldPath)){