diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 28126e4..53ae131 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,12 +29,10 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ +# uploadPath: D:\casic\tmp\ # dir: D:\casic\tmp\ -# pdfXmlPath: D:\cz\203\计量\code\casic-metering-biz-xichang\casic-metering-api\src\main\resources\ uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ - pdfXmlPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/config/ meter: standardEquipment: #标准装置 remindDay: 30 #到期提醒，提前天数 diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 28126e4..53ae131 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,12 +29,10 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ +# uploadPath: D:\casic\tmp\ # dir: D:\casic\tmp\ -# pdfXmlPath: D:\cz\203\计量\code\casic-metering-biz-xichang\casic-metering-api\src\main\resources\ uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ - pdfXmlPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/config/ meter: standardEquipment: #标准装置 remindDay: 30 #到期提醒，提前天数 diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml deleted file mode 100644 index 2d50259..0000000 --- a/casic-metering-api/src/main/resources/license.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 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/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 28126e4..53ae131 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,12 +29,10 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ +# uploadPath: D:\casic\tmp\ # dir: D:\casic\tmp\ -# pdfXmlPath: D:\cz\203\计量\code\casic-metering-biz-xichang\casic-metering-api\src\main\resources\ uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ - pdfXmlPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/config/ meter: standardEquipment: #标准装置 remindDay: 30 #到期提醒，提前天数 diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml deleted file mode 100644 index 2d50259..0000000 --- a/casic-metering-api/src/main/resources/license.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 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/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 d25dd30..de4d511 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 @@ -164,8 +164,10 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) { //生成证书文件 - request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); - request.setCertificateWordFile(certificateFileUrl.get(0)); + if (CollectionUtils.isNotEmpty(certificateFileUrl)) { + request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); + request.setCertificateWordFile(certificateFileUrl.get(0)); + } //原始记录文件 request.setOriginalRecordFile(originalRecordFileUrl); //更新记录 @@ -322,7 +324,6 @@ customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "1", measureItemInfo.getItemCategoryName())); //与证书模板区分 map.put("id", snowflakeUtil.nextId()); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 return printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); } catch (Exception ex) { diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 28126e4..53ae131 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,12 +29,10 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ +# uploadPath: D:\casic\tmp\ # dir: D:\casic\tmp\ -# pdfXmlPath: D:\cz\203\计量\code\casic-metering-biz-xichang\casic-metering-api\src\main\resources\ uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ - pdfXmlPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/config/ meter: standardEquipment: #标准装置 remindDay: 30 #到期提醒，提前天数 diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml deleted file mode 100644 index 2d50259..0000000 --- a/casic-metering-api/src/main/resources/license.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 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/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 d25dd30..de4d511 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 @@ -164,8 +164,10 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) { //生成证书文件 - request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); - request.setCertificateWordFile(certificateFileUrl.get(0)); + if (CollectionUtils.isNotEmpty(certificateFileUrl)) { + request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); + request.setCertificateWordFile(certificateFileUrl.get(0)); + } //原始记录文件 request.setOriginalRecordFile(originalRecordFileUrl); //更新记录 @@ -322,7 +324,6 @@ customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "1", measureItemInfo.getItemCategoryName())); //与证书模板区分 map.put("id", snowflakeUtil.nextId()); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 return printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); } catch (Exception ex) { 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 index 9853f40..3d7c7a0 100644 --- 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 @@ -4,8 +4,6 @@ import com.aspose.words.Document; import com.aspose.words.License; import com.aspose.words.SaveFormat; -import com.casic.missiles.utils.SpringContextUtil; -import org.springframework.beans.factory.annotation.Autowired; import java.io.*; @@ -18,12 +16,25 @@ * @parampdfPath */ public static void doc2pdf(String wordPath, String pdfPath) { - PdfXmlConfig pdfXmlConfig = SpringContextUtil.getBean(PdfXmlConfig.class); - FileInputStream is = null; + // 凭证 + String licenseStr = + "\n" + + " \n" + + " \n" + + " Aspose.Total for Java\n" + + " Aspose.Words for Java\n" + + " \n" + + " Enterprise\n" + + " 20991231\n" + + " 20991231\n" + + " 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7\n" + + " \n" + + " sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=\n" + + ""; try { - is = new FileInputStream(pdfXmlConfig.getPdfXmlPath() + "license.xml"); + InputStream license = new ByteArrayInputStream(licenseStr.getBytes("UTF-8")); License aposeLic = new License(); - aposeLic.setLicense(is); + aposeLic.setLicense(license); long old = System.currentTimeMillis(); //新建一个pdf文档 File file = new File(pdfPath); diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 28126e4..53ae131 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,12 +29,10 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ +# uploadPath: D:\casic\tmp\ # dir: D:\casic\tmp\ -# pdfXmlPath: D:\cz\203\计量\code\casic-metering-biz-xichang\casic-metering-api\src\main\resources\ uploadPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ dir: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/temp/ - pdfXmlPath: /home/admin/app/wangpeng/metering-biz-xichang/casic-metering-api-2.0.0/config/ meter: standardEquipment: #标准装置 remindDay: 30 #到期提醒，提前天数 diff --git a/casic-metering-api/src/main/resources/license.xml b/casic-metering-api/src/main/resources/license.xml deleted file mode 100644 index 2d50259..0000000 --- a/casic-metering-api/src/main/resources/license.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 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/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 d25dd30..de4d511 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 @@ -164,8 +164,10 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) { //生成证书文件 - request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); - request.setCertificateWordFile(certificateFileUrl.get(0)); + if (CollectionUtils.isNotEmpty(certificateFileUrl)) { + request.setCertificateFile(certificateFileUrl.size() > 1 ? certificateFileUrl.get(1) : ""); + request.setCertificateWordFile(certificateFileUrl.get(0)); + } //原始记录文件 request.setOriginalRecordFile(originalRecordFileUrl); //更新记录 @@ -322,7 +324,6 @@ customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "1", measureItemInfo.getItemCategoryName())); //与证书模板区分 map.put("id", snowflakeUtil.nextId()); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 return printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); } catch (Exception ex) { 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 index 9853f40..3d7c7a0 100644 --- 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 @@ -4,8 +4,6 @@ import com.aspose.words.Document; import com.aspose.words.License; import com.aspose.words.SaveFormat; -import com.casic.missiles.utils.SpringContextUtil; -import org.springframework.beans.factory.annotation.Autowired; import java.io.*; @@ -18,12 +16,25 @@ * @parampdfPath */ public static void doc2pdf(String wordPath, String pdfPath) { - PdfXmlConfig pdfXmlConfig = SpringContextUtil.getBean(PdfXmlConfig.class); - FileInputStream is = null; + // 凭证 + String licenseStr = + "\n" + + " \n" + + " \n" + + " Aspose.Total for Java\n" + + " Aspose.Words for Java\n" + + " \n" + + " Enterprise\n" + + " 20991231\n" + + " 20991231\n" + + " 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7\n" + + " \n" + + " sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=\n" + + ""; try { - is = new FileInputStream(pdfXmlConfig.getPdfXmlPath() + "license.xml"); + InputStream license = new ByteArrayInputStream(licenseStr.getBytes("UTF-8")); License aposeLic = new License(); - aposeLic.setLicense(is); + aposeLic.setLicense(license); long old = System.currentTimeMillis(); //新建一个pdf文档 File file = new File(pdfPath); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/PdfXmlConfig.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/PdfXmlConfig.java deleted file mode 100644 index 764e87b..0000000 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/PdfXmlConfig.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.casic.missiles.service.listeners.util; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Component -@ConfigurationProperties(prefix = "casic") -@Data -public class PdfXmlConfig { - private String pdfXmlPath; -} \ No newline at end of file