diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java index f86aef3..c4d54ce 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/signature/service/impl/ExpertSignatureServiceImpl.java @@ -12,7 +12,6 @@ import com.chinaunicom.mall.ebtp.extend.signature.entity.ExpertSignature; import com.chinaunicom.mall.ebtp.extend.signature.service.ExpertSignatureService; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.data.PictureRenderData; -import com.deepoove.poi.util.PoitlIOUtils; import com.spire.doc.Document; import com.spire.doc.DocumentObject; import com.spire.doc.FileFormat; @@ -107,7 +106,7 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { } //保存合并后的文档 - d1.saveToFile(path + "/merged.docx", FileFormat.Docx_2010); + d1.saveToFile(mkdir(path + "/merged.docx"), FileFormat.Docx_2010); //转为pdf long l = System.currentTimeMillis(); @@ -166,10 +165,7 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { } private FileInputStream getExpertSign(ExpertSignature signature, final String path) { - String imgPath = path + "/imgs/"; - if (!FileUtil.exist(imgPath)) { - FileUtil.mkdir(imgPath); - } + String imgPath = mkdir(path + "/imgs/"); List pics = new ArrayList<>(); signature.getExperts().forEach(l -> { if (l.getExpertSign().contains("data:image/png;base64,")) { @@ -191,13 +187,9 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { XWPFTemplate template = XWPFTemplate.compile(file).render(all); FileInputStream fis = null; try { - String docPath = path + "/expertSignature.docx"; - - OutputStream out = new FileOutputStream(docPath); - template.write(out); - out.flush(); - PoitlIOUtils.closeQuietlyMulti(template, out); + String docPath = mkdir(path + "/expertSignature.docx"); + template.writeToFile(docPath); fis = new FileInputStream(new File(docPath)); } catch (IOException e) { e.printStackTrace(); @@ -235,4 +227,11 @@ public class ExpertSignatureServiceImpl implements ExpertSignatureService { } } + + private String mkdir(String path) { + if (!FileUtil.exist(path)) { + FileUtil.mkdir(path); + } + return path; + } }