From 871dd9686aa74328461b0f0796c09135472180fd Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 22 Jul 2022 09:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=EF=BC=9A=E5=AF=BC=E5=87=BA=E6=B6=88=E6=81=AF=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 346534b85..50ebb976f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -49,7 +49,6 @@ import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
-import com.jero.modules.split.common.ReadExcel;
 import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
@@ -2009,7 +2008,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request) {
-		OutputStream os = null;
+//		OutputStream os = null;
 		OutputStream excelOS = null;
 		XSSFWorkbook workbook = new XSSFWorkbook();
 		String fileOriName = "参数项清单导出信息";
@@ -2105,20 +2104,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			String repFileName = fileName.replaceAll("/","_");
 			excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName);
-			response.setHeader("Content-Disposition",
-					"attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request)  +"\"");
-			response.setContentType("application/force-download");
-			response.flushBuffer();
-			os = response.getOutputStream();
+//			response.setHeader("Content-Disposition",
+//					"attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request)  +"\"");
+//			response.setContentType("application/force-download");
+//			response.flushBuffer();
+//			os = response.getOutputStream();
 			workbook.write(excelOS);
 			excelOS.flush();
 			excelOS.close();
 			ZipUtil.zip(fileNowPath,fileNowPath+".zip");
-			FileInputStream fis = new FileInputStream(fileNowPath+".zip");
-			int len = 0;
-			while ((len = fis.read()) != -1) {
-				os.write(len);
-			}
+//			FileInputStream fis = new FileInputStream(fileNowPath+".zip");
+//			int len = 0;
+//			while ((len = fis.read()) != -1) {
+//				os.write(len);
+//			}
 
 			// 将导出文件上传到cos上
 			String uploadFileName = fileOriName + ".zip";
@@ -2128,11 +2127,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			// 系统向用户发消息
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
-			String msgTitle = "您导出的" + paramsCollectManifestVO.getExportName()  + "已经生成完毕";
-			String content = "您导出的" + paramsCollectManifestVO.getExportName()  + "已经生成完毕，请点击下载。";
+			String msgTitle = "The file " + paramsCollectManifestVO.getExportName()  + " that you exported has been generated.";
+			String content = "The file " + paramsCollectManifestVO.getExportName()  + " that you exported has been generated, please click download.";
 
-			String href = "<a href='/jero-boot/sys/common/downLoadFile?id=" + ossFile.getId() + "'" + " target='_blank'>下载</a>。";
-			String contentInfo = "您导出的" + paramsCollectManifestVO.getExportName()  + "已经生成完毕，请点击" + href;
+			String href = "<a href='/jero-boot/sys/common/downLoadFile?id=" + ossFile.getId() + "'" + " target='_blank'>download</a>.";
+			String contentInfo = "The file " + paramsCollectManifestVO.getExportName()  + " that you exported has been generated, please click " + href;
 
 			SysAnnouncement sysAnnouncement = new SysAnnouncement();
 			sysAnnouncement.setDelFlag("0");
@@ -2154,14 +2153,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			webSocket.sendMessage(obj.toJSONString());
 
 			uploadFileio.close();
-			os.flush();
-			os.close(); // 后开先关
-			fis.close(); // 先开后关
+//			os.flush();
+//			os.close(); // 后开先关
+//			fis.close(); // 先开后关
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			throw new JeroBootException("下载文件失败，请重试");
 		} finally {
-			IOUtils.closeQuietly(os);
+//			IOUtils.closeQuietly(os);
 			IOUtils.closeQuietly(excelOS);
 			File tempZipFile = new File(uploadpath + "/tempZip");
 			FileUtil.deleteContents(tempZipFile);
@@ -2186,7 +2185,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		int indexOfDescription = 1; // 参数名称的位置
 		for (int i = 0; i < fieldList.size(); i++) {
 			OnlCgformField onlCgformField = fieldList.get(i);
-			Map<String, Object> map = new HashMap<>();
 			String dbFieldName = onlCgformField.getDbFieldName();
 			if (!"deadline".equals(dbFieldName) && !"cert_category".equals(dbFieldName) && !"description".equals(dbFieldName)) {
 				dbFieldList.add(dbFieldName);
@@ -2216,7 +2214,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		} else {
 			sysDictItemList.forEach(sysDictItem -> {
 				dbFieldListCC.add(sysDictItem.getItemValue());
-				dbFieldNameListCC.add(sysDictItem.getItemText() + " 编号");
+				dbFieldNameListCC.add(sysDictItem.getItemText() + "编号");
 			});
 		}