From e1c92332d8e3044143311ceb8700fda095e53fde Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 7 Jul 2022 11:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9-?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E9=99=84=E4=BB=B6=E6=94=BE=E5=85=A5NIO?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsInfoEOServiceImpl.java | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 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 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<ParamsInfoEOMapper, Par
 		}
 
 		List<OSSFile> fileTemplateList = new ArrayList<>();
+		Map<String, String> fileNowPathMap = new HashMap<>();
 		for (ParamsInfoEO paramsInfoEO : paramsInfoEOList) {
 			String fileTemplateConnectId = paramsInfoEO.getFileTemplateConnectId();
 			if (StringUtils.isNotBlank(fileTemplateConnectId)) {
 				List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(fileTemplateConnectId);
-				List<String> 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<ParamsInfoEOMapper, Par
 		//下载附件模板对应文件
 		if (fileTemplateList != null && !fileTemplateList.isEmpty()) {
 			fileTemplateList = fileTemplateList.stream().distinct().collect(Collectors.toList());
-			downLoadFileList(fileTemplateList,fileNowPath);
+			downLoadFileList(fileTemplateList, fileNowPathMap);
 		}
 
 		return sheetsList;
@@ -603,14 +604,17 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		}
 
 		List<OSSFile> fileTemplateList = new ArrayList<>();
+		Map<String, String> fileNowPathMap = new HashMap<>();
 		for (ParamsInfoEnExport paramsInfoEnExport : paramsInfoEnExportList) {
 			String fileTemplateConnectId = paramsInfoEnExport.getFileTemplateConnectId();
 			if (StringUtils.isNotBlank(fileTemplateConnectId)) {
 				List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(fileTemplateConnectId);
-				List<String> 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<ParamsInfoEOMapper, Par
 		//下载附件模板对应文件
 		if (fileTemplateList != null && !fileTemplateList.isEmpty()) {
 			fileTemplateList = fileTemplateList.stream().distinct().collect(Collectors.toList());
-			downLoadFileList(fileTemplateList,fileNowPath);
+			downLoadFileList(fileTemplateList, fileNowPathMap);
 		}
 
 		return sheetsList;
 	}
 
-	private void downLoadFileList(List<OSSFile> fileTemplateList,String fileNowPath) {
+	private void downLoadFileList(List<OSSFile> fileTemplateList,Map<String ,String> 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)){