From 9cff6e4892133cde61006861258ce13bba719807 Mon Sep 17 00:00:00 2001
From: wangbing <wangbingit@outlook.com>
Date: Mon, 6 May 2019 23:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dbtool/javafx/po/MySqlDBmapper.java       |  2 ++
 .../dbtool/javafx/po/OracleDBmapper.java      |  2 ++
 .../java/req/createRequestClass.ftl           | 20 +++++++++++++++++++
 .../java/req/updateRequestClass.ftl           |  3 ++-
 .../resources/templates/screen/demo.ftl       |  1 +
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java
index d384a7d1..ec219888 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java
@@ -63,6 +63,8 @@ public class MySqlDBmapper extends AbstractDBmapper {
 
         if (FieldType.Boolean.name().equals(type.name())) {
             sb.append("TINYINT(1)");
+        } else if (FieldType.Enum.name().equals(type.name())) {
+            sb.append("VARCHAR(50)");
         } else if (FieldType.Byte.name().equals(type.name())) {
             sb.append("TINYINT(3)");
         } else if (FieldType.Short.name().equals(type.name())) {
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java
index ef62e88b..ad738cc3 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java
@@ -14,6 +14,8 @@ public class OracleDBmapper extends AbstractDBmapper {
 
         if (FieldType.Boolean.name().equals(type.name())) {
             sb.append("CHAR(1)");
+        } else if (FieldType.Enum.name().equals(type.name())) {
+            sb.append("VARCHAR(50)");
         } else if (FieldType.Byte.name().equals(type.name())) {
             sb.append("NUMBER(3)");
         } else if (FieldType.Short.name().equals(type.name())) {
diff --git a/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl
index c4a77928..b8038248 100644
--- a/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl
+++ b/src/main/resources/modules/SpringBoot/java/req/createRequestClass.ftl
@@ -4,6 +4,11 @@ import ${basePackage}.frame.base.BaseRequest;
 <#if table.has('Date')>
 import java.util.Date;
 </#if>
+<#list table.fields as field>
+<#if field.fieldType.javaType() == "Enum">
+import ${basePackage}.${moduleName}.enums.${field.getCName()};
+</#if>
+</#list>
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotEmpty;
 import org.hibernate.validator.constraints.Length;
@@ -34,12 +39,26 @@ public class ${table.getCName()}CreateRequest extends BaseRequest {
     @NotNull(message = "${field.fieldComment?default("")}不能为NULL")
 </#if>
 </#if>
+<#if field.fieldType.javaType() == "Enum">
+    private ${field.getCName()} ${field.getFName()};
+<#else >
     private ${field.fieldType.javaType()} ${field.getFName()};
+</#if>
 
 </#if>
 </#list>
 <#list table.fields as field>
 <#if !field.isSystem>
+<#if field.fieldType.javaType() == "Enum">
+    public ${field.getCName()} ${field.getterName()}() {
+        return this.${field.getFName()};
+    }
+
+    public void ${field.setterName()}(${field.getCName()} ${field.getFName()}) {
+        this.${field.getFName()} = ${field.getFName()};
+    }
+
+<#else>
     public ${field.fieldType.javaType()} ${field.getterName()}() {
         return this.${field.getFName()};
     }
@@ -48,6 +67,7 @@ public class ${table.getCName()}CreateRequest extends BaseRequest {
         this.${field.getFName()} = ${field.getFName()};
     }
 
+</#if>
 </#if>
 </#list>
 }
diff --git a/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl
index 485de635..6097a671 100644
--- a/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl
+++ b/src/main/resources/modules/SpringBoot/java/req/updateRequestClass.ftl
@@ -49,7 +49,6 @@ public class  ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
 </#list>
 <#list table.fields as field>
 <#if !field.isSystem || field.fieldName == 'ID'>
-
 <#if field.fieldType.javaType() == "Enum">
     public ${field.getCName()} ${field.getterName()}() {
         return this.${field.getFName()};
@@ -58,6 +57,7 @@ public class  ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
     public void ${field.setterName()}(${field.getCName()} ${field.getFName()}) {
         this.${field.getFName()} = ${field.getFName()};
     }
+
 <#else>
     public ${field.fieldType.javaType()} ${field.getterName()}() {
         return this.${field.getFName()};
@@ -66,6 +66,7 @@ public class  ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
     public void ${field.setterName()}(${field.fieldType.javaType()} ${field.getFName()}) {
         this.${field.getFName()} = ${field.getFName()};
     }
+
 </#if>
 </#if>
 </#list>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/demo.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/demo.ftl
index 40d791be..ec9ad6ab 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/demo.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/demo.ftl
@@ -9,6 +9,7 @@
         el: "#app",
         data: {},
         methods: {},
+        filters: {},
         created: function () {
         },
         mounted: function () {