From f65fdcaabf8d624ec8cd3d3a8867ba41ac3a53fe Mon Sep 17 00:00:00 2001 From: h2so Date: Mon, 21 Jan 2019 21:47:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BA=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/xxl-code-generator/beetlentity.ftl | 2 ++ .../src/main/resources/templates/xxl-code-generator/entity.ftl | 2 ++ .../src/main/resources/templates/xxl-code-generator/model.ftl | 3 +++ 3 files changed, 7 insertions(+) diff --git a/generator-web/src/main/resources/templates/xxl-code-generator/beetlentity.ftl b/generator-web/src/main/resources/templates/xxl-code-generator/beetlentity.ftl index 9a272ee..39e0e22 100644 --- a/generator-web/src/main/resources/templates/xxl-code-generator/beetlentity.ftl +++ b/generator-web/src/main/resources/templates/xxl-code-generator/beetlentity.ftl @@ -19,6 +19,8 @@ public class ${classInfo.className} implements Serializable { private ${fieldItem.fieldClass} ${fieldItem.fieldName}; + public ${classInfo.className}() { + } } \ No newline at end of file diff --git a/generator-web/src/main/resources/templates/xxl-code-generator/entity.ftl b/generator-web/src/main/resources/templates/xxl-code-generator/entity.ftl index d0c8e1b..bee2566 100644 --- a/generator-web/src/main/resources/templates/xxl-code-generator/entity.ftl +++ b/generator-web/src/main/resources/templates/xxl-code-generator/entity.ftl @@ -23,6 +23,8 @@ public class ${classInfo.className} implements Serializable { private ${fieldItem.fieldClass} ${fieldItem.fieldName}; + public ${classInfo.className}() { + } } \ No newline at end of file diff --git a/generator-web/src/main/resources/templates/xxl-code-generator/model.ftl b/generator-web/src/main/resources/templates/xxl-code-generator/model.ftl index 79b2503..a290b8e 100644 --- a/generator-web/src/main/resources/templates/xxl-code-generator/model.ftl +++ b/generator-web/src/main/resources/templates/xxl-code-generator/model.ftl @@ -20,6 +20,9 @@ public class ${classInfo.className} implements Serializable { <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> + public ${classInfo.className}() { + } + <#list classInfo.fieldList as fieldItem> public ${fieldItem.fieldClass} get${fieldItem.fieldName?cap_first}() { return ${fieldItem.fieldName}; From 31933614d60f37d4bf2494cfc7c2be596fd3e675 Mon Sep 17 00:00:00 2001 From: h2so Date: Sat, 2 Feb 2019 13:09:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=87=E6=8D=A2=E4=B8=BA=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B,=E4=B8=8D=E5=86=8D=E9=87=87=E7=94=A8?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/softdev/system/generator/util/TableParseUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java index 4eba246..50f253c 100644 --- a/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java +++ b/generator-web/src/main/java/com/softdev/system/generator/util/TableParseUtil.java @@ -165,13 +165,13 @@ public class TableParseUtil { //2018-9-16 zhengk 补充char/clob/blob/json等类型，如果类型未知，默认为String //2018-11-22 lshz0088 处理字段类型的时候，不严谨columnLine.contains(" int") 类似这种的，可在前后适当加一些空格之类的加以区分，否则当我的字段包含这些字符的时候，产生类型判断问题。 if (columnLine.contains(" int") || columnLine.contains("tinyint") || columnLine.contains("smallint")) { - fieldClass = Integer.TYPE.getSimpleName(); + fieldClass = Integer.class.getSimpleName(); } else if (columnLine.contains("bigint")) { - fieldClass = Long.TYPE.getSimpleName(); + fieldClass = Long.class.getSimpleName(); } else if (columnLine.contains("float")) { - fieldClass = Float.TYPE.getSimpleName(); + fieldClass = Float.class.getSimpleName(); } else if (columnLine.contains("double")) { - fieldClass = Double.TYPE.getSimpleName(); + fieldClass = Double.class.getSimpleName(); } else if (columnLine.contains("datetime") || columnLine.contains("timestamp")) { fieldClass = Date.class.getSimpleName(); } else if (columnLine.contains("varchar") || columnLine.contains(" text")|| columnLine.contains("char")