From 19b2927073b5a2b14ca07939a6bfc0a0a34fe98c Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:38 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl b/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
index 0f0ee7f..4554ab8 100644
--- a/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
+++ b/febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl
@@ -1,16 +1,24 @@
package ${basePackage}.${entityPackage};
+import java.io.Serializable;
<#if hasDate = true>
- import java.util.Date;
+import java.util.Date;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
</#if>
<#if hasBigDecimal = true>
- import java.math.BigDecimal;
+import java.math.BigDecimal;
</#if>
import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
/**
*
@@ -24,46 +32,54 @@
*/
@Data
@TableName("${tableName}")
-public class ${className} {
+public class ${className} implements Serializable{
<#if columns??>
<#list columns as column>
- /**
- * ${column.remark}
- */
+ @FieldInfo(name = "${column.name}",type = "${column.type}",explain = "${column.remark}")
<#if column.isKey = true>
- @TableId(value = "${column.name}", type = IdType.AUTO)
+ @TableId(value = "${column.name}")
<#else>
@TableField("${column.name}")
</#if>
<#if (column.type = 'varchar' || column.type = 'text' || column.type = 'uniqueidentifier'
|| column.type = 'varchar2' || column.type = 'nvarchar' || column.type = 'VARCHAR2'
|| column.type = 'VARCHAR'|| column.type = 'CLOB' || column.type = 'char')>
- private String ${column.field?uncap_first};
+ private String ${column.field?uncap_first}="";
</#if>
- <#if column.type = 'timestamp' || column.type = 'date' || column.type = 'datetime'||column.type = 'TIMESTAMP' || column.type = 'DATE' || column.type = 'DATETIME'>
+ <#if column.type = 'timestamp' || column.type = 'datetime'||column.type = 'TIMESTAMP' || column.type = 'DATETIME'>
+ @JsonSerialize(using = DateTimeSerializer.class)
+ @JsonDeserialize(using = DateTimeDeserializer.class)
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date ${column.field?uncap_first};
</#if>
- <#if column.type = 'int' || column.type = 'smallint'|| column.type = 'bit'>
- private Integer ${column.field?uncap_first};
+ <#if column.type = 'date' ||column.type = 'DATE'>
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private Date ${column.field?uncap_first};
+
+ </#if>
+ <#if column.type = 'int' || column.type = 'smallint'|| column.type = 'bit'||column.type = 'tinyint'>
+ <#if column.name = 'version'>
+ @Version
+ </#if>
+ private Integer ${column.field?uncap_first}=0;
</#if>
<#if column.type = 'double'>
- private Double ${column.field?uncap_first};
+ private Double ${column.field?uncap_first}=0;
</#if>
<#if column.type = 'bigint'>
- private Long ${column.field?uncap_first};
-
- </#if>
- <#if column.type = 'tinyint'>
- private Byte ${column.field?uncap_first};
+ private Long ${column.field?uncap_first}=0L;
</#if>
<#if column.type = 'decimal' || column.type = 'numeric'>
- private BigDecimal ${column.field?uncap_first};
+ private BigDecimal ${column.field?uncap_first}=0;
+
</#if>
</#list>
</#if>
--
Gitblit v1.8.0