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 7e515d8..28126e4 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,10 +29,12 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ -# dir: 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 7e515d8..28126e4 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,10 +29,12 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ -# dir: 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-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 9ab6ad3..42ddef7 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 @@ -197,12 +197,12 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { -// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); + PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 - Document document = new Document(); - document.loadFromFile(wordNewUrl); - document.saveToFile(pdfNewUrl, FileFormat.PDF); - document.dispose(); +// Document document = new Document(); +// document.loadFromFile(wordNewUrl); +// document.saveToFile(pdfNewUrl, FileFormat.PDF); +// document.dispose(); } /** 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 7e515d8..28126e4 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,10 +29,12 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ -# dir: 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-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 9ab6ad3..42ddef7 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 @@ -197,12 +197,12 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { -// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); + PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 - Document document = new Document(); - document.loadFromFile(wordNewUrl); - document.saveToFile(pdfNewUrl, FileFormat.PDF); - document.dispose(); +// Document document = new Document(); +// document.loadFromFile(wordNewUrl); +// document.saveToFile(pdfNewUrl, FileFormat.PDF); +// document.dispose(); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 068608c..96af8ce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -112,7 +112,7 @@ //删除无效的文件 File invalidFile = new File(tempLocalFileDir); //删除运行空间下的文件 - deleteFile(invalidFile); +// deleteFile(invalidFile); } return miniName; } 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 7e515d8..28126e4 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,10 +29,12 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ -# dir: 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-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 9ab6ad3..42ddef7 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 @@ -197,12 +197,12 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { -// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); + PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 - Document document = new Document(); - document.loadFromFile(wordNewUrl); - document.saveToFile(pdfNewUrl, FileFormat.PDF); - document.dispose(); +// Document document = new Document(); +// document.loadFromFile(wordNewUrl); +// document.saveToFile(pdfNewUrl, FileFormat.PDF); +// document.dispose(); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 068608c..96af8ce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -112,7 +112,7 @@ //删除无效的文件 File invalidFile = new File(tempLocalFileDir); //删除运行空间下的文件 - deleteFile(invalidFile); +// deleteFile(invalidFile); } return miniName; } 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 e647021..9853f40 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,21 +4,24 @@ 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.*; public class PdfUtils { + /*** 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; + PdfXmlConfig pdfXmlConfig = SpringContextUtil.getBean(PdfXmlConfig.class); FileInputStream is = null; try { - is = new FileInputStream(filePath + "license.xml"); + is = new FileInputStream(pdfXmlConfig.getPdfXmlPath() + "license.xml"); License aposeLic = new License(); aposeLic.setLicense(is); long old = System.currentTimeMillis(); 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 7e515d8..28126e4 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -29,10 +29,12 @@ enable: false #图片下载本地地址 file: -# uploadPath: D:\casic\tmp\ -# dir: 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-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 9ab6ad3..42ddef7 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 @@ -197,12 +197,12 @@ * @param pdfNewUrl 存储新PDF文件路径 */ public static void wordToPdf(String wordNewUrl, String pdfNewUrl) { -// PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); + PdfUtils.doc2pdf(wordNewUrl,pdfNewUrl); // 将新Word文档转换为PDF文件 - Document document = new Document(); - document.loadFromFile(wordNewUrl); - document.saveToFile(pdfNewUrl, FileFormat.PDF); - document.dispose(); +// Document document = new Document(); +// document.loadFromFile(wordNewUrl); +// document.saveToFile(pdfNewUrl, FileFormat.PDF); +// document.dispose(); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 068608c..96af8ce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -112,7 +112,7 @@ //删除无效的文件 File invalidFile = new File(tempLocalFileDir); //删除运行空间下的文件 - deleteFile(invalidFile); +// deleteFile(invalidFile); } return miniName; } 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 e647021..9853f40 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,21 +4,24 @@ 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.*; public class PdfUtils { + /*** 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; + PdfXmlConfig pdfXmlConfig = SpringContextUtil.getBean(PdfXmlConfig.class); FileInputStream is = null; try { - is = new FileInputStream(filePath + "license.xml"); + is = new FileInputStream(pdfXmlConfig.getPdfXmlPath() + "license.xml"); License aposeLic = new License(); aposeLic.setLicense(is); long old = System.currentTimeMillis(); 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 new file mode 100644 index 0000000..764e87b --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/PdfXmlConfig.java @@ -0,0 +1,12 @@ +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