From b6a1cee9c6fbfe0a1f8f7c410c637248e29239e5 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期五, 18 七月 2025 10:22:17 +0800
Subject: [PATCH] fix:修复docker不能正常清理的问题。设置60s超时时间
---
src/main/java/com/ots/common/utils/poi/WordUtil.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 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 47f50ec..44f60fa 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -12,6 +12,7 @@
import com.ots.project.exam.domain.TReportTemplate;
import com.ots.project.exam.dto.JAQTableStyle;
import com.ots.project.exam.dto.WordParam;
+import com.ots.project.tool.PdfDockerUtil;
import com.ots.project.tool.PdfUtil;
import com.ots.project.tool.ShellTool;
import com.ots.project.tool.exam.ExamUtil;
@@ -1236,7 +1237,7 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+ //鍒犻櫎鏂囦欢
deleteFileByStr(deleteFileStrList);
return AjaxResult.success(fileName + ".zip");
}
@@ -1261,6 +1262,7 @@
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.replace("\t","");
reportName = reportName.replaceAll(" ", "_");
//妯℃澘鏂囦欢闇�瑕佸姞閿�
@@ -1286,17 +1288,8 @@
}else if(ReportTypeEnum.LAQ.getCode().equals(reportType)){
// 鑾峰彇寮�濮嬫椂闂�
long startTime = System.currentTimeMillis();
-
-// if(textMap.containsKey("allList"))
-// {
-// PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
-// }
-// else
-// {
-//
-// }
-
- PdfUtil.dockerConvertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
+// PdfUtil.dockerConvertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
+ PdfDockerUtil.convertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
// 鑾峰彇缁撴潫鏃堕棿
long endTime = System.currentTimeMillis();
--
Gitblit v1.9.1