From 1b95f852d2aed044cc28e72f23fecb4da1994e0c Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期二, 20 九月 2022 16:04:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/framework-v10-20220422' into framework-v11-20220919
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ots/common/utils/poi/WordUtil.java b/src/main/java/com/ots/common/utils/poi/WordUtil.java
index a31f833..95c4305 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -1167,21 +1167,24 @@
reportType = getTypeIfIsSAQ(tReportTemplate, reportType);
reportType = getPositionIfJAQ(textMap, reportType);
reportName = textMap.get("sendEmailFileName") + "_" + reportType + "_" + ReportTypeNameEnum.valueOf(tReportTemplate.getTemplateType()).getCode() + "_" + ReportTypeNameEnum.valueOf(tReportTemplate.getLangType()).getCode() + ".docx";
-
reportName = reportName.replaceAll(" ", "_");
- out = getDownLoadFileOutputStream(reportName);
- log.info("reportTemplate:" + fileName);
- //String templateType = tReportTemplate.getTemplateType();
- setChageWord(fileName, out, textMap, tReportTemplate.getReportType(),tReportTemplate.getDataPath(), autoTableMap);
- out.flush();
- changColorIfJAQ(textMap, out, reportName, tReportTemplate.getReportType());
+ //妯℃澘鏂囦欢闇�瑕佸姞閿�
+ out = getDownLoadFileOutputStream(reportName);
+ synchronized (fileName.intern()){
+ //String templateType = tReportTemplate.getTemplateType();
+ setChageWord(fileName, out, textMap, tReportTemplate.getReportType(),tReportTemplate.getDataPath(), autoTableMap);
+ out.flush();
+ changColorIfJAQ(textMap, out, reportName, tReportTemplate.getReportType());
+ }
+
//PAQ銆丮AQTR閲囩敤鏂扮殑doc杞琾df
if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)){
PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
}else{
- ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
-
+ //ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
+ ShellTool shellTool = ShellTool.builder();
+ shellTool.execNewLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/" + reportName.replace("docx","pdf"));
}
zipFilePath = getPdfPath(reportName);
--
Gitblit v1.9.1