diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java index ad0f2bf..52e64aa 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java @@ -164,4 +164,30 @@ } } + + + @ApiOperation("test") + @PostMapping(value = "/testPrint") + @ResponseBody + public void testPrint() throws Exception { + FilePrintRegisterUtils.docToDocx("C:\\upload\\word\\test-report.doc","C:\\upload\\word\\test-report.docx"); + + File tf = new File("C:\\upload\\word\\test-report.docx"); + Calendar now = Calendar.getInstance(); + Map params = new HashMap<>(); + params.put("customerName","张三"); + params.put("customerAddress","北京"); + params.put("sampleNo","10001000"); + params.put("sampleName","样品001"); + params.put("manufacturingNo","样品001"); + params.put("y", now.get(Calendar.YEAR)); + params.put("m", (now.get(Calendar.MONTH) + 1)); + params.put("d", now.get(Calendar.DAY_OF_MONTH)); + + String fileName = "testParams.docx"; + String word = FilePrintRegisterUtils.exportWord(tf.getPath(), "C:\\upload\\word\\", fileName, params); + System.out.println("****新模板"+word); + + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java index ad0f2bf..52e64aa 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/PoiController.java @@ -164,4 +164,30 @@ } } + + + @ApiOperation("test") + @PostMapping(value = "/testPrint") + @ResponseBody + public void testPrint() throws Exception { + FilePrintRegisterUtils.docToDocx("C:\\upload\\word\\test-report.doc","C:\\upload\\word\\test-report.docx"); + + File tf = new File("C:\\upload\\word\\test-report.docx"); + Calendar now = Calendar.getInstance(); + Map params = new HashMap<>(); + params.put("customerName","张三"); + params.put("customerAddress","北京"); + params.put("sampleNo","10001000"); + params.put("sampleName","样品001"); + params.put("manufacturingNo","样品001"); + params.put("y", now.get(Calendar.YEAR)); + params.put("m", (now.get(Calendar.MONTH) + 1)); + params.put("d", now.get(Calendar.DAY_OF_MONTH)); + + String fileName = "testParams.docx"; + String word = FilePrintRegisterUtils.exportWord(tf.getPath(), "C:\\upload\\word\\", fileName, params); + System.out.println("****新模板"+word); + + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java index f867bf1..7e30713 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/register/FilePrintRegisterUtils.java @@ -90,9 +90,9 @@ Assert.notNull(templatePath, "模板路径不能为空"); Assert.notNull(temDir, "临时文件路径不能为空"); Assert.notNull(fileName, "导出文件名不能为空"); -// if (fileName.endsWith(".doc")) { + if (fileName.endsWith(".doc")) { // HWPFDocument doc = WordExportUtil.exportWord07(templatePath, params); -// } + } // Assert.isTrue(fileName.endsWith(".docx"), "word导出请使用docx格式"); if (!temDir.endsWith("/")) { temDir = temDir; @@ -381,6 +381,18 @@ return null; } + + /** + * doc 转 docx + * @param sourceFilePath 源文件路径 + * @param destFilePath 转换成docx文件路径 + */ + public static void docToDocx(String sourceFilePath,String destFilePath){ + Document document = new Document(); + document.loadFromFile(sourceFilePath); + document.saveToFile(destFilePath); + } + /** * 流转文件 *