From 50caf7df970cfafc74f441ba37d70920894c91fc Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Wed, 10 Feb 2021 08:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=88=87=E6=8D=A2=E6=A8=A1=E6=9D=BF=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 6 ++++++ .../additional-spring-configuration-metadata.json | 14 ++++++++++++++ ruoyi-admin/src/main/resources/application-dev.yml | 6 +++++- .../src/main/resources/application-prod.yml | 7 ++++++- .../controller/FtPrepaymentDaoController.java | 10 ++++++++-- ruoyi-ui/src/views/fantang/prepayment/index.vue | 2 +- 6 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 172c58892..24e40a608 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -17,6 +17,12 @@ + + org.springframework.boot + spring-boot-configuration-processor + true + + io.springfox diff --git a/ruoyi-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ruoyi-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 000000000..0416b1b98 --- /dev/null +++ b/ruoyi-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,14 @@ +{ + "properties": [ + { + "name": "fantang.templatePath", + "type": "java.lang.String", + "description": "Description for spring.fantang.templatePath." + }, + { + "name": "fantang.fileWebUrl", + "type": "java.lang.String", + "description": "Description for spring.fantang.fileWebUrl." + } + ] +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 025238075..f3344c30c 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -76,4 +76,8 @@ spring: # 连接池的最大数据库连接数 max-active: 8 # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms \ No newline at end of file + max-wait: -1ms + +fantang: + templatePath: Z:\\程序开发\\项目测试\\三院饭堂\\饭堂收费票据模板.pdf + fileWebUrl: http://127.0.0.1:9001/dev-api/ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 3ecbe082a..29d800e0d 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -76,4 +76,9 @@ spring: # 连接池的最大数据库连接数 max-active: 8 # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms \ No newline at end of file + max-wait: -1ms + + # 饭堂配置参数 +fantang: + templatePath: /root/sanyuan/template/饭堂收费票据模板.pdf + fileWebUrl: http://8.135.81.183:8080/prod-api/ \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java index 976baaa00..62ce8c784 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java @@ -18,6 +18,7 @@ import com.ruoyi.system.fantang.service.IFtPrepaymentDaoService; import com.ruoyi.system.fantang.utils.PdfUtils; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -38,6 +39,11 @@ public class FtPrepaymentDaoController extends BaseController { private final IFtPrepaymentDaoService iFtPrepaymentDaoService; + @Value("${fantang.templatePath}") + private String templatePath; + + @Value("${fantang.fileWebUrl}") + private String fileWebUrl; @GetMapping("/getCountById/{patientId}") public AjaxResult getCountById(@PathVariable("patientId") Long patientId) { @@ -196,7 +202,7 @@ public class FtPrepaymentDaoController extends BaseController { // 模板路径 // String templatePath = "F:\\pdfTemplate\\饭堂票据模板2.pdf"; - String templatePath = "Z:\\程序开发\\项目测试\\三院饭堂\\饭堂收费票据模板.pdf"; +// String templatePath = "Z:\\程序开发\\项目测试\\三院饭堂\\饭堂收费票据模板.pdf"; // 生成的新文件路径 String outputPath = RuoYiConfig.getUploadPath() + "\\饭堂票据" + patientId + ".pdf"; @@ -206,7 +212,7 @@ public class FtPrepaymentDaoController extends BaseController { // 下载地址 String downloadPath = "profile/upload/饭堂票据" + patientId + ".pdf"; - return AjaxResult.success(downloadPath); + return AjaxResult.success(fileWebUrl + downloadPath); } } diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index 59ddaa558..b4178c7fa 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -283,7 +283,7 @@ export default { // 生成收据 pdf handleGenerateReceiptPdf(row) { generateReceiptPdf(row).then(response => { - window.open("http://192.168.3.93:9001/dev-api/" + response.msg) + window.open(response.msg) }) console.log(process.env); },