代码生成更新

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
+date=Date
-datetime=Timestamp
+datetime=Date
-timestamp=Timestamp
+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>
+<#if hasDateTime>
-import java.sql.Timestamp;
+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>
+<#if hasDateTime>
-import java.sql.Timestamp;
+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>
+<#if hasDateTime>
-import java.sql.Timestamp;
+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>
+<#if hasDateTime>
-import java.sql.Timestamp;
+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>
+<#if queryHasDateTime>
-import java.sql.Timestamp;
+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>
+<#if queryHasDateTime>
-import java.sql.Timestamp;
+import java.util.Date;
 </#if>
 <#if queryHasBigDecimal>
 import java.math.BigDecimal;

yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java

@@ -37,7 +37,7 @@ import java.util.Map;
 @SuppressWarnings("all")
 public class GenUtil {
 
-    private static final String TIMESTAMP = "Timestamp";
+    private static final String DATE = "Date";
 
     private static final String BIGDECIMAL = "BigDecimal";
 
@@ -213,11 +213,11 @@ public class GenUtil {
         // 保存小写开头的类名
         genMap.put("changeClassName", changeClassName);
         // 存在 Timestamp 字段
-        genMap.put("hasTimestamp",false);
+        genMap.put("hasDateTime",false);
         // 存在 Images 字段
         genMap.put("hasImages",false);
         // 查询类中存在 Timestamp 字段
-        genMap.put("queryHasTimestamp",false);
+        genMap.put("queryHasDateTime",false);
         // 存在 BigDecimal 字段
         genMap.put("hasBigDecimal",false);
         // 查询类中存在 BigDecimal 字段
@@ -266,8 +266,8 @@ public class GenUtil {
                 genMap.put("hasImages",true);
             }
             // 是否存在 Timestamp 类型的字段
-            if(TIMESTAMP.equals(colType)){
+            if(DATE.equals(colType)){
-                genMap.put("hasTimestamp",true);
+                genMap.put("hasDateTime",true);
             }
             // 是否存在 BigDecimal 类型的字段
             if(BIGDECIMAL.equals(colType)){
@@ -316,9 +316,9 @@ public class GenUtil {
                 listMap.put("queryType",column.getQueryType());
                 // 是否存在查询
                 genMap.put("hasQuery",true);
-                if(TIMESTAMP.equals(colType)){
+                if(DATE.equals(colType)){
                     // 查询中存储 Timestamp 类型
-                    genMap.put("queryHasTimestamp",true);
+                    genMap.put("queryHasDateTime",true);
                 }
                 if(BIGDECIMAL.equals(colType)){
                     // 查询中存储 BigDecimal 类型