diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml new file mode 100644 index 0000000..2d50259 --- /dev/null +++ b/casic-metering-api/src/main/resources/license.xml @@ -0,0 +1,14 @@ + + + + Aspose.Total for Java + Aspose.Words for Java + + Enterprise + 20991231 + 20991231 + 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 + + sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= + + \ No newline at end of file diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml new file mode 100644 index 0000000..2d50259 --- /dev/null +++ b/casic-metering-api/src/main/resources/license.xml @@ -0,0 +1,14 @@ + + + + Aspose.Total for Java + Aspose.Words for Java + + Enterprise + 20991231 + 20991231 + 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 + + sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= + + \ No newline at end of file diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c7b27f0..c7ad452 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -73,6 +73,12 @@ 5.0.6 + + com.aspose + aspose-words + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml new file mode 100644 index 0000000..2d50259 --- /dev/null +++ b/casic-metering-api/src/main/resources/license.xml @@ -0,0 +1,14 @@ + + + + Aspose.Total for Java + Aspose.Words for Java + + Enterprise + 20991231 + 20991231 + 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 + + sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= + + \ No newline at end of file diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c7b27f0..c7ad452 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -73,6 +73,12 @@ 5.0.6 + + com.aspose + aspose-words + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index aece41f..1bb9a56 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -202,12 +202,16 @@ List pointList = Arrays.asList(pointStr); for (int i = 0; i < pointList.size(); i++) { //最佳点重复性 - List rep = request.getCheckDataCalibratorList() + List repList = request.getCheckDataCalibratorList() .stream().filter(e -> BEST_POINT.equals(e.getTestType()) && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(rep)) { - Map repMap = BeanUtil.beanToMap(rep); - map.put(REPEAT_PREFIX + (i + 1), repMap); + if (CollectionUtils.isNotEmpty(repList)) { + List repMapList=new ArrayList<>(); + for(BizEquipmentStandardCheckDataCalibrator rep:repList){ + Map repMap = BeanUtil.beanToMap(rep); + repMapList.add(repMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); } //最佳点稳定性 List sta = request.getCheckDataCalibratorList() diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml new file mode 100644 index 0000000..2d50259 --- /dev/null +++ b/casic-metering-api/src/main/resources/license.xml @@ -0,0 +1,14 @@ + + + + Aspose.Total for Java + Aspose.Words for Java + + Enterprise + 20991231 + 20991231 + 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 + + sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= + + \ No newline at end of file diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c7b27f0..c7ad452 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -73,6 +73,12 @@ 5.0.6 + + com.aspose + aspose-words + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index aece41f..1bb9a56 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -202,12 +202,16 @@ List pointList = Arrays.asList(pointStr); for (int i = 0; i < pointList.size(); i++) { //最佳点重复性 - List rep = request.getCheckDataCalibratorList() + List repList = request.getCheckDataCalibratorList() .stream().filter(e -> BEST_POINT.equals(e.getTestType()) && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(rep)) { - Map repMap = BeanUtil.beanToMap(rep); - map.put(REPEAT_PREFIX + (i + 1), repMap); + if (CollectionUtils.isNotEmpty(repList)) { + List repMapList=new ArrayList<>(); + for(BizEquipmentStandardCheckDataCalibrator rep:repList){ + Map repMap = BeanUtil.beanToMap(rep); + repMapList.add(repMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); } //最佳点稳定性 List sta = request.getCheckDataCalibratorList() diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index 306d7e1..3dddd81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -11,10 +11,7 @@ import com.spire.doc.fields.TextRange; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,7 +37,7 @@ // //保存合并后的文档 // doc1.saveToFile(word1Url, FileFormat.Docx_2010); DocPictureProvider.headerFooter(doc1); - doc1.saveToFile(localPathUrl+"add.docx", FileFormat.Docx); + doc1.saveToFile(localPathUrl + "add.docx", FileFormat.Docx); } /** @@ -124,7 +121,7 @@ Map map = new HashMap<>(); // map.put("box", "一直大胖娇"); ConfigureBuilder builder = Configure.builder(); - XWPFTemplate compile = XWPFTemplate.compile("D:\\casic\\cut\\204.docx",builder.build()); + XWPFTemplate compile = XWPFTemplate.compile("D:\\casic\\cut\\204.docx", builder.build()); compile.render(map); compile.writeToFile("D:\\casic\\cut\\out_test3.docx"); } @@ -132,7 +129,8 @@ public static void main(String[] args) throws Exception { //内嵌表信息 // Example.populateTableNest(); - mergeDoc(); +// mergeDoc(); +// pdfUtils.wordToPdf(); } /** diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml new file mode 100644 index 0000000..2d50259 --- /dev/null +++ b/casic-metering-api/src/main/resources/license.xml @@ -0,0 +1,14 @@ + + + + Aspose.Total for Java + Aspose.Words for Java + + Enterprise + 20991231 + 20991231 + 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 + + sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= + + \ No newline at end of file diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c7b27f0..c7ad452 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -73,6 +73,12 @@ 5.0.6 + + com.aspose + aspose-words + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index aece41f..1bb9a56 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -202,12 +202,16 @@ List pointList = Arrays.asList(pointStr); for (int i = 0; i < pointList.size(); i++) { //最佳点重复性 - List rep = request.getCheckDataCalibratorList() + List repList = request.getCheckDataCalibratorList() .stream().filter(e -> BEST_POINT.equals(e.getTestType()) && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(rep)) { - Map repMap = BeanUtil.beanToMap(rep); - map.put(REPEAT_PREFIX + (i + 1), repMap); + if (CollectionUtils.isNotEmpty(repList)) { + List repMapList=new ArrayList<>(); + for(BizEquipmentStandardCheckDataCalibrator rep:repList){ + Map repMap = BeanUtil.beanToMap(rep); + repMapList.add(repMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); } //最佳点稳定性 List sta = request.getCheckDataCalibratorList() diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index 306d7e1..3dddd81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -11,10 +11,7 @@ import com.spire.doc.fields.TextRange; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,7 +37,7 @@ // //保存合并后的文档 // doc1.saveToFile(word1Url, FileFormat.Docx_2010); DocPictureProvider.headerFooter(doc1); - doc1.saveToFile(localPathUrl+"add.docx", FileFormat.Docx); + doc1.saveToFile(localPathUrl + "add.docx", FileFormat.Docx); } /** @@ -124,7 +121,7 @@ Map map = new HashMap<>(); // map.put("box", "一直大胖娇"); ConfigureBuilder builder = Configure.builder(); - XWPFTemplate compile = XWPFTemplate.compile("D:\\casic\\cut\\204.docx",builder.build()); + XWPFTemplate compile = XWPFTemplate.compile("D:\\casic\\cut\\204.docx", builder.build()); compile.render(map); compile.writeToFile("D:\\casic\\cut\\out_test3.docx"); } @@ -132,7 +129,8 @@ public static void main(String[] args) throws Exception { //内嵌表信息 // Example.populateTableNest(); - mergeDoc(); +// mergeDoc(); +// pdfUtils.wordToPdf(); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index 4d38bd4..0f52ff0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.certificate.FilePrintRegister; import com.casic.missiles.model.file.ImageConfig; import com.casic.missiles.service.listeners.util.ParseWord07; +import com.casic.missiles.service.listeners.util.PdfUtils; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.config.ConfigureBuilder; @@ -196,6 +197,7 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { +// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 Document document = new Document(); document.loadFromFile(wordNewUrl); diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml new file mode 100644 index 0000000..2d50259 --- /dev/null +++ b/casic-metering-api/src/main/resources/license.xml @@ -0,0 +1,14 @@ + + + + Aspose.Total for Java + Aspose.Words for Java + + Enterprise + 20991231 + 20991231 + 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 + + sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= + + \ No newline at end of file diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c7b27f0..c7ad452 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -73,6 +73,12 @@ 5.0.6 + + com.aspose + aspose-words + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index aece41f..1bb9a56 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -202,12 +202,16 @@ List pointList = Arrays.asList(pointStr); for (int i = 0; i < pointList.size(); i++) { //最佳点重复性 - List rep = request.getCheckDataCalibratorList() + List repList = request.getCheckDataCalibratorList() .stream().filter(e -> BEST_POINT.equals(e.getTestType()) && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(rep)) { - Map repMap = BeanUtil.beanToMap(rep); - map.put(REPEAT_PREFIX + (i + 1), repMap); + if (CollectionUtils.isNotEmpty(repList)) { + List repMapList=new ArrayList<>(); + for(BizEquipmentStandardCheckDataCalibrator rep:repList){ + Map repMap = BeanUtil.beanToMap(rep); + repMapList.add(repMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); } //最佳点稳定性 List sta = request.getCheckDataCalibratorList() diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index 306d7e1..3dddd81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -11,10 +11,7 @@ import com.spire.doc.fields.TextRange; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,7 +37,7 @@ // //保存合并后的文档 // doc1.saveToFile(word1Url, FileFormat.Docx_2010); DocPictureProvider.headerFooter(doc1); - doc1.saveToFile(localPathUrl+"add.docx", FileFormat.Docx); + doc1.saveToFile(localPathUrl + "add.docx", FileFormat.Docx); } /** @@ -124,7 +121,7 @@ Map map = new HashMap<>(); // map.put("box", "一直大胖娇"); ConfigureBuilder builder = Configure.builder(); - XWPFTemplate compile = XWPFTemplate.compile("D:\\casic\\cut\\204.docx",builder.build()); + XWPFTemplate compile = XWPFTemplate.compile("D:\\casic\\cut\\204.docx", builder.build()); compile.render(map); compile.writeToFile("D:\\casic\\cut\\out_test3.docx"); } @@ -132,7 +129,8 @@ public static void main(String[] args) throws Exception { //内嵌表信息 // Example.populateTableNest(); - mergeDoc(); +// mergeDoc(); +// pdfUtils.wordToPdf(); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index 4d38bd4..0f52ff0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.certificate.FilePrintRegister; import com.casic.missiles.model.file.ImageConfig; import com.casic.missiles.service.listeners.util.ParseWord07; +import com.casic.missiles.service.listeners.util.PdfUtils; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.config.ConfigureBuilder; @@ -196,6 +197,7 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { +// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 Document document = new Document(); document.loadFromFile(wordNewUrl); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java index 656fa51..fc2c9df 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java @@ -527,8 +527,14 @@ List> resultMap = (List>) result; List resultList = resultMap.stream().map(m -> m.get(paramKeys[paramKeys.length - 1])).collect(Collectors.toList()); return maxExpansionLength > resultList.size() ? maxExpansionLength : cellIndex + 1 + resultList.size(); + } else if (result instanceof String) { + if (StringUtils.isEmpty((String) result)) { + clearParagraphText((cells.get(cellIndex)).getParagraphs()); + } } } return maxExpansionLength; } + + } diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml new file mode 100644 index 0000000..2d50259 --- /dev/null +++ b/casic-metering-api/src/main/resources/license.xml @@ -0,0 +1,14 @@ + + + + Aspose.Total for Java + Aspose.Words for Java + + Enterprise + 20991231 + 20991231 + 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7 + + sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU= + + \ No newline at end of file diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c7b27f0..c7ad452 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -73,6 +73,12 @@ 5.0.6 + + com.aspose + aspose-words + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index aece41f..1bb9a56 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -202,12 +202,16 @@ List pointList = Arrays.asList(pointStr); for (int i = 0; i < pointList.size(); i++) { //最佳点重复性 - List rep = request.getCheckDataCalibratorList() + List repList = request.getCheckDataCalibratorList() .stream().filter(e -> BEST_POINT.equals(e.getTestType()) && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(rep)) { - Map repMap = BeanUtil.beanToMap(rep); - map.put(REPEAT_PREFIX + (i + 1), repMap); + if (CollectionUtils.isNotEmpty(repList)) { + List repMapList=new ArrayList<>(); + for(BizEquipmentStandardCheckDataCalibrator rep:repList){ + Map repMap = BeanUtil.beanToMap(rep); + repMapList.add(repMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); } //最佳点稳定性 List sta = request.getCheckDataCalibratorList() diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java index 306d7e1..3dddd81 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/Example.java @@ -11,10 +11,7 @@ import com.spire.doc.fields.TextRange; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,7 +37,7 @@ // //保存合并后的文档 // doc1.saveToFile(word1Url, FileFormat.Docx_2010); DocPictureProvider.headerFooter(doc1); - doc1.saveToFile(localPathUrl+"add.docx", FileFormat.Docx); + doc1.saveToFile(localPathUrl + "add.docx", FileFormat.Docx); } /** @@ -124,7 +121,7 @@ Map map = new HashMap<>(); // map.put("box", "一直大胖娇"); ConfigureBuilder builder = Configure.builder(); - XWPFTemplate compile = XWPFTemplate.compile("D:\\casic\\cut\\204.docx",builder.build()); + XWPFTemplate compile = XWPFTemplate.compile("D:\\casic\\cut\\204.docx", builder.build()); compile.render(map); compile.writeToFile("D:\\casic\\cut\\out_test3.docx"); } @@ -132,7 +129,8 @@ public static void main(String[] args) throws Exception { //内嵌表信息 // Example.populateTableNest(); - mergeDoc(); +// mergeDoc(); +// pdfUtils.wordToPdf(); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index 4d38bd4..0f52ff0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.certificate.FilePrintRegister; import com.casic.missiles.model.file.ImageConfig; import com.casic.missiles.service.listeners.util.ParseWord07; +import com.casic.missiles.service.listeners.util.PdfUtils; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.config.ConfigureBuilder; @@ -196,6 +197,7 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { +// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 Document document = new Document(); document.loadFromFile(wordNewUrl); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java index 656fa51..fc2c9df 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ParseWord07.java @@ -527,8 +527,14 @@ List> resultMap = (List>) result; List resultList = resultMap.stream().map(m -> m.get(paramKeys[paramKeys.length - 1])).collect(Collectors.toList()); return maxExpansionLength > resultList.size() ? maxExpansionLength : cellIndex + 1 + resultList.size(); + } else if (result instanceof String) { + if (StringUtils.isEmpty((String) result)) { + clearParagraphText((cells.get(cellIndex)).getParagraphs()); + } } } return maxExpansionLength; } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/pdfUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/pdfUtils.java new file mode 100644 index 0000000..0a92a71 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/pdfUtils.java @@ -0,0 +1,50 @@ +package com.casic.missiles.service.listeners.util; + + +import com.aspose.words.Document; +import com.aspose.words.License; +import com.aspose.words.SaveFormat; + +import java.io.*; + +public class PdfUtils { + + private static String localPathUrl = "D:\\casic\\cut\\"; + + private static boolean license = false; + + public static void main(String[] args) throws Exception { + doc2pdf(localPathUrl + "200.docx", localPathUrl + "200.pdf"); + } + + /*** doc转pdf + * + * @paramwordPath + * @parampdfPath + */ + public static void doc2pdf(String wordPath, String pdfPath) { + String filePath = System.getProperty("user.dir") + File.separator + "casic-metering-api" + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator; + FileInputStream is = null; + try { + is = new FileInputStream(filePath + "license.xml"); + License aposeLic = new License(); + aposeLic.setLicense(is); + long old = System.currentTimeMillis(); + //新建一个pdf文档 + File file = new File(pdfPath); + FileOutputStream os = new FileOutputStream(file); + //Address是将要被转化的word文档 + Document doc = new Document(wordPath); + //全面支持DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 相互转换 + doc.save(os, SaveFormat.PDF); + long now = System.currentTimeMillis(); + os.close(); + //转化用时 + System.out.println("Word 转 Pdf 共耗时：" + ((now - old) / 1000.0) + "秒"); + } catch (Exception e) { + System.out.println("Word 转 Pdf 失败..."); + e.printStackTrace(); + } + } +} +