代码生成更新

yshop-admin/src/main/resources/generator.properties

@@ -1,4 +1,4 @@
-#数据库类型转Java类型
+#\u6570\u636E\u5E93\u7C7B\u578B\u8F6CJava\u7C7B\u578B
 tinyint=Integer
 smallint=Integer
 mediumint=Integer
@@ -22,6 +22,6 @@ text=String
 mediumtext=String
 longtext=String
 
-date=Timestamp
-datetime=Timestamp
-timestamp=Timestamp
+date=Date
+datetime=Date
+timestamp=Date

yshop-admin/src/main/resources/template/generator/admin/Dto.ftl

@@ -9,8 +9,8 @@
 package ${package}.service.dto;
 
 import lombok.Data;
-<#if hasTimestamp>
-import java.sql.Timestamp;
+<#if hasDateTime>
+import java.util.Date;
 </#if>
 <#if hasBigDecimal>
 import java.math.BigDecimal;

yshop-admin/src/main/resources/template/generator/admin/DtoP.ftl

@@ -9,8 +9,8 @@
 package ${package}.service.dto;
 
 import lombok.Data;
-<#if hasTimestamp>
-import java.sql.Timestamp;
+<#if hasDateTime>
+import java.util.Date;
 </#if>
 <#if hasBigDecimal>
 import java.math.BigDecimal;

yshop-admin/src/main/resources/template/generator/admin/Entity.ftl

@@ -20,8 +20,8 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import org.hibernate.annotations.*;
 </#if>
-<#if hasTimestamp>
-import java.sql.Timestamp;
+<#if hasDateTime>
+import java.util.Date;
 </#if>
 <#if hasBigDecimal>
 import java.math.BigDecimal;

yshop-admin/src/main/resources/template/generator/admin/EntityP.ftl

@@ -17,13 +17,13 @@ import javax.validation.constraints.*;
 </#if>
 <#if hasDateAnnotation>
 </#if>
-<#if hasTimestamp>
-import java.sql.Timestamp;
+<#if hasDateTime>
+import java.util.Date;
 </#if>
 <#if hasBigDecimal>
 import java.math.BigDecimal;
 </#if>
-import java.io.Serializable;
+import co.yixiang.domain.BaseDomain;
 
 /**
 * @author ${author}
@@ -31,10 +31,10 @@ import java.io.Serializable;
 */
 @Data
 @TableName("${tableName}")
-public class ${className} implements Serializable {
+public class ${className} extends BaseDomain {
 <#if columns??>
     <#list columns as column>
-
+    <#if column.changeColumnName != 'isDel' && column.changeColumnName != 'createTime' && column.changeColumnName != 'updateTime' >
     <#if column.remark != ''>
     /** ${column.remark} */
     </#if>
@@ -48,24 +48,6 @@ public class ${className} implements Serializable {
     @NotNull
         </#if>
     </#if>
-    <#if column.dateAnnotation??>
-    <#if column.dateAnnotation = 'CreationTimestamp'>
-    @CreationTimestamp
-    <#else>
-    @UpdateTimestamp
-    </#if>
-    </#if>
-    <#if column.changeColumnName = 'updateTime'|| column.changeColumnName = 'updateDate'>
-    @TableField(fill= FieldFill.INSERT_UPDATE)
-    </#if>
-    <#if column.changeColumnName = 'createTime' || column.changeColumnName = 'createDate'>
-    @TableField(fill= FieldFill.INSERT)
-    </#if>
-    <#if column.changeColumnName = 'delFlag'>
-    @TableLogic
-    @TableField(fill=FieldFill.INSERT_UPDATE)
-    private Boolean ${column.changeColumnName};
-    <#else>
     private ${column.columnType} ${column.changeColumnName};
     </#if>
 

yshop-admin/src/main/resources/template/generator/admin/QueryCriteria.ftl

@@ -9,8 +9,8 @@
 package ${package}.service.dto;
 
 import lombok.Data;
-<#if queryHasTimestamp>
-import java.sql.Timestamp;
+<#if queryHasDateTime>
+import java.util.Date;
 </#if>
 <#if queryHasBigDecimal>
 import java.math.BigDecimal;

yshop-admin/src/main/resources/template/generator/admin/QueryCriteriaP.ftl

@@ -9,8 +9,8 @@
 package ${package}.service.dto;
 
 import lombok.Data;
-<#if queryHasTimestamp>
-import java.sql.Timestamp;
+<#if queryHasDateTime>
+import java.util.Date;
 </#if>
 <#if queryHasBigDecimal>
 import java.math.BigDecimal;