From d50c285e5f21eefc62b7848ea96d186e1e64475b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 28 一月 2021 13:51:05 +0800
Subject: [PATCH] feat(人力资源微服务,代码生成微服务): 修改代码模板,生成代码

---
 febs-server/febs-server-generator/src/main/resources/generator/templates/entity.ftl |   44 ++++++++++++++++++++++++++++++--------------
 1 files changed, 30 insertions(+), 14 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..cb97ea6 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,15 +32,13 @@
 */
 @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>
@@ -42,11 +48,24 @@
             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'>
+        <#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};
 
         </#if>
@@ -58,12 +77,9 @@
             private Long ${column.field?uncap_first};
 
         </#if>
-        <#if column.type = 'tinyint'>
-            private Byte ${column.field?uncap_first};
-
-        </#if>
         <#if column.type = 'decimal' || column.type = 'numeric'>
             private BigDecimal ${column.field?uncap_first};
+
         </#if>
     </#list>
 </#if>

--
Gitblit v1.8.0