| | |
|---|
| | | |
|---|
| | | //模板文件需要加锁 |
|---|
| | | out = getDownLoadFileOutputStream(reportName); |
|---|
| | | synchronized (fileName.intern()){ |
|---|
| | | //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、MAQTR采用新的doc转pdf |
|---|
| | | 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")); |
|---|
| | | |
|---|
| | | //新方法测试 |
|---|
| | | LibreOfficeUtil.convertOffice2PDFSyncIsSuccess(new File(EssConfig.getProfile() + "/" + reportName),new File(EssConfig.getProfile() + "/" + reportName.replace("docx","pdf"))); |
|---|
| | | //LibreOfficeUtil.convertOffice2PDFSyncIsSuccess(new File(EssConfig.getProfile() + "/" + reportName),new File(EssConfig.getProfile() + "/" + reportName.replace("docx","pdf"))); |
|---|
| | | } |
|---|
| | | zipFilePath = getPdfPath(reportName); |
|---|
| | | |
|---|
