Merge branch 'master' of github.com:liumapp/workable-converter

Author: liumapp

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.liumapp.workable.converter</groupId>
   <artifactId>workable-converter</artifactId>
-  <version>v1.2.0</version>
+  <version>v1.3.0</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -88,15 +88,13 @@
       <artifactId>pdfbox-tools</artifactId>
       <version>2.0.12</version>
     </dependency>
-
-    <!--itext require-->
     <dependency>
       <groupId>com.itextpdf</groupId>
       <artifactId>itext7-core</artifactId>
       <version>7.1.0</version>
       <type>pom</type>
     </dependency>
-
+    
     <!-- helper -->
     <dependency>
       <groupId>org.projectlombok</groupId>
@@ -280,5 +278,4 @@
     </repository>
   </distributionManagement>
 
-
 </project>

src/main/java/com/liumapp/workable/converter/config/PdfEditDTO.java

@@ -3,6 +3,9 @@
 import com.liumapp.workable.converter.enums.FontType;
 import lombok.Data;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Data
 public class PdfEditDTO {
 
@@ -14,12 +17,12 @@ public class PdfEditDTO {
     /**
      * 内容宽
      */
-    private Integer width;
+    private Float width;
 
     /**
      * 内容高
      */
-    private Integer heitht;
+    private Float heitht;
 
     /**
      * 占位符别名
@@ -47,8 +50,19 @@ public class PdfEditDTO {
     private String text;
 
     /**
-     * 字体类型（枚举）
+     * 字体类型（枚举） 默认宋体
      */
-    private FontType fontType;
+    private FontType fontType = FontType.SIMHEI;
+
+    private Integer fontTypeNum = 0;
+
 
+    public FontType getFontType() {
+        List<FontType> fontTypeList =
+                Arrays.asList(FontType.SIMSUN,FontType.SIMKAI, FontType.SIMHEI,FontType.SIMYOU,FontType.STKAITI);
+        if (this.fontTypeNum >= fontTypeList.size()) {
+            return fontTypeList.get(0);
+        }
+        return fontTypeList.get(this.fontTypeNum);
+    }
 }

src/main/java/com/liumapp/workable/converter/enums/FontType.java

@@ -8,14 +8,31 @@
 public enum FontType {
 
     /**
-     * 华文幼圆
+     * 宋体
      */
-    SIMYOU(1,"SIMYOU.TTF"),
+    SIMSUN(0,"SIMSUN.TTF"),
 
     /**
      * 楷体
      */
-    STKAITI(2,"STKAITI.TTF")
+    SIMKAI(1,"SIMKAI.TTF"),
+
+    /**
+     * 黑体
+     */
+    SIMHEI(2,"SIMHEI.TTF"),
+
+    /**
+     * 华文幼圆
+     */
+    SIMYOU(3,"SIMYOU.TTF"),
+
+    /**
+     * 华文楷体
+     */
+    STKAITI(4,"STKAITI.TTF"),
+
+
 
     ;
 

src/main/java/com/liumapp/workable/converter/strategies/TextConverter.java

@@ -40,7 +40,9 @@ protected boolean byFilePath(ConvertRequire require) throws ConvertFailedExcepti
             //font
             Rectangle rectangle;
             for (PdfEditDTO editDTO : require.getTextRequire().getPdfEditDTOList()) {
-                String ttfPath = this.getClass().getClassLoader().getResource("./font/"+editDTO.getFontType().getFont()).getPath();
+                ClassLoader classLoader = this.getClass().getClassLoader();
+                System.out.println(editDTO.getFontType().getType());
+                String ttfPath = classLoader.getResource("./font/"+editDTO.getFontType().getFont()).getPath();
                 PdfTextFormField pdfTextFormField;
                 // 读取ttf字体文件
                 FontProgram fontProgram = FontProgramFactory.createFont(ttfPath);