Skip to content

Y
yd-backend
Commit 5aba94c7 by yao.xiao
Options

Merge remote-tracking branch 'origin' into dev_20210308_sharing

parents ffbb263d 579e2031
Showing with 201 additions and 42 deletions
yd-api/pom.xml
...@@ -22,13 +22,18 @@ ...@@ -22,13 +22,18 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<!-- 编译时的编码 --> <!-- 编译时的编码 -->
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.20</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
...@@ -69,43 +74,44 @@ ...@@ -69,43 +74,44 @@
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.7</version> <version>3.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt</artifactId>
<version>0.6.0</version> <version>0.6.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId> <artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId> <artifactId>tomcat-embed-jasper</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<optional>true</optional> <version>1.18.12</version>
</dependency>
<dependency> </dependency>
<groupId>com.github.pagehelper</groupId> <dependency>
<artifactId>pagehelper-spring-boot-starter</artifactId> <groupId>com.github.pagehelper</groupId>
<version>1.2.5</version> <artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency> <version>1.2.5</version>
<!-- </dependency>
<dependency> <!--
<groupId>io.springfox</groupId> <dependency>
<artifactId>springfox-swagger2</artifactId> <groupId>io.springfox</groupId>
<version>2.8.0</version> <artifactId>springfox-swagger2</artifactId>
</dependency> <version>2.8.0</version>
<dependency> </dependency>
<groupId>io.springfox</groupId> <dependency>
<artifactId>springfox-swagger-ui</artifactId> <groupId>io.springfox</groupId>
<version>2.8.0</version> <artifactId>springfox-swagger-ui</artifactId>
</dependency> <version>2.8.0</version>
--> </dependency>
-->
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
...@@ -221,10 +227,11 @@ ...@@ -221,10 +227,11 @@
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/lib/com-libs-pdf-0.0.1.jar</systemPath> <systemPath>${basedir}/lib/com-libs-pdf-0.0.1.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>ydapi</finalName> <finalName>ydapi</finalName>
<resources> <resources>
<resource> <resource>
<!--<targetPath>/WEB-INF/classes</targetPath>--> <!--<targetPath>/WEB-INF/classes</targetPath>-->
......
yd-api/src/main/java/com/yd/api/practitioner/PractitionerPDFTest.java
...@@ -164,7 +164,8 @@ public class PractitionerPDFTest { ...@@ -164,7 +164,8 @@ public class PractitionerPDFTest {
String templatePDF = "D:\\pcs12\\templatePractitionerContract.pdf"; String templatePDF = "D:\\pcs12\\templatePractitionerContract.pdf";
templatePDF = PDFConfiguration.getProperty("pdf.template"); templatePDF = PDFConfiguration.getProperty("pdf.template");
//模板文件生成零时文件 //模板文件生成零时文件
String tmpPathPDF = PDFConfiguration.getProperty("pdf.temp.path"); String tmpPathPDF = "D:\\pcs12";
tmpPathPDF = PDFConfiguration.getProperty("pdf.temp.path");
String practitionerNO = "SH000012"; String practitionerNO = "SH000012";
//PDF模板输出结果文件 //PDF模板输出结果文件
...@@ -186,7 +187,7 @@ public class PractitionerPDFTest { ...@@ -186,7 +187,7 @@ public class PractitionerPDFTest {
signResultPDF = tmpPathPDF + practitionerNO + "-signedYD.pdf"; signResultPDF = tmpPathPDF + practitionerNO + "-signedYD.pdf";
String password="UC645YlB"; String password="UC645YlB";
password = readFileTxt(PDFConfiguration.getProperty("pdf.keyPasswordFile")); //password = readFileTxt(PDFConfiguration.getProperty("pdf.keyPasswordFile"));
String keyStorePath="D:\\pcs12\\4929078_m.zuihuibi.cn.pfx"; String keyStorePath="D:\\pcs12\\4929078_m.zuihuibi.cn.pfx";
keyStorePath = PDFConfiguration.getProperty("pdf.keyStorePath");; keyStorePath = PDFConfiguration.getProperty("pdf.keyStorePath");;
......
yd-api/src/main/java/com/yd/api/practitioner/vo/Commission.java 0 → 100644
package com.yd.api.practitioner.vo;
public class Commission {
public String getInsurer() {
return insurer;
}
public void setInsurer(String insurer) {
this.insurer = insurer;
}
private String insurer;
public String getPolicyNo() {
return policyNo;
}
public void setPolicyNo(String policyNo) {
this.policyNo = policyNo;
}
private String policyNo;
public String getEffectiveDate() {
return effectiveDate;
}
public void setEffectiveDate(String effectiveDate) {
this.effectiveDate = effectiveDate;
}
private String effectiveDate;
public String getProductCode() {
return productCode;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
private String productCode;
public String getSubSystem() {
return subSystem;
}
public void setSubSystem(String subSystem) {
this.subSystem = subSystem;
}
private String subSystem;
public String getInsured() {
return insured;
}
public void setInsured(String insured) {
this.insured = insured;
}
private String insured;
public String getYearMonth() {
return yearMonth;
}
public void setYearMonth(String yearMonth) {
this.yearMonth = yearMonth;
}
private String yearMonth;
public String getPremium() {
return premium;
}
public void setPremium(String premium) {
this.premium = premium;
}
private String premium;
public String getFyc() {
return fyc;
}
public void setFyc(String fyc) {
this.fyc = fyc;
}
private String fyc;
public String getGradeRate() {
return gradeRate;
}
public void setGradeRate(String gradeRate) {
this.gradeRate = gradeRate;
}
private String gradeRate;
public String getCommission() {
return commission;
}
public void setCommission(String commission) {
this.commission = commission;
}
private String commission;
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
private String note;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/CommissionItems.java 0 → 100644
package com.yd.api.practitioner.vo;
import java.util.List;
public class CommissionItems {
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
private String name;
public List<Commission> getItems() {
return items;
}
public void setItems(List<Commission> items) {
this.items = items;
}
private List<Commission> items;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment