From ab691529065415a123155aabb632b06e782fccce Mon Sep 17 00:00:00 2001 From: "LIONCITYS\\lioncity" <18026623439@163.com> Date: Thu, 12 Nov 2020 21:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/generator.properties | 8 +++--- .../template/generator/admin/Dto.ftl | 4 +-- .../template/generator/admin/DtoP.ftl | 4 +-- .../template/generator/admin/Entity.ftl | 4 +-- .../template/generator/admin/EntityP.ftl | 28 ++++--------------- .../generator/admin/QueryCriteria.ftl | 4 +-- .../generator/admin/QueryCriteriaP.ftl | 4 +-- .../java/co/yixiang/gen/utils/GenUtil.java | 14 +++++----- 8 files changed, 26 insertions(+), 44 deletions(-) diff --git a/yshop-admin/src/main/resources/generator.properties b/yshop-admin/src/main/resources/generator.properties index 2ed93706..16ee01de 100644 --- a/yshop-admin/src/main/resources/generator.properties +++ b/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 \ No newline at end of file +date=Date +datetime=Date +timestamp=Date \ No newline at end of file diff --git a/yshop-admin/src/main/resources/template/generator/admin/Dto.ftl b/yshop-admin/src/main/resources/template/generator/admin/Dto.ftl index de74ea19..7a76a42a 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/Dto.ftl +++ b/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 hasBigDecimal> import java.math.BigDecimal; diff --git a/yshop-admin/src/main/resources/template/generator/admin/DtoP.ftl b/yshop-admin/src/main/resources/template/generator/admin/DtoP.ftl index 0473058e..2507dd89 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/DtoP.ftl +++ b/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 hasBigDecimal> import java.math.BigDecimal; diff --git a/yshop-admin/src/main/resources/template/generator/admin/Entity.ftl b/yshop-admin/src/main/resources/template/generator/admin/Entity.ftl index 0bc0b96f..351dc6f0 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/Entity.ftl +++ b/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 hasTimestamp> -import java.sql.Timestamp; +<#if hasDateTime> +import java.util.Date; <#if hasBigDecimal> import java.math.BigDecimal; diff --git a/yshop-admin/src/main/resources/template/generator/admin/EntityP.ftl b/yshop-admin/src/main/resources/template/generator/admin/EntityP.ftl index 41d7ddd1..fb163f8a 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/EntityP.ftl +++ b/yshop-admin/src/main/resources/template/generator/admin/EntityP.ftl @@ -17,13 +17,13 @@ import javax.validation.constraints.*; <#if hasDateAnnotation> -<#if hasTimestamp> -import java.sql.Timestamp; +<#if hasDateTime> +import java.util.Date; <#if hasBigDecimal> import java.math.BigDecimal; -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} */ @@ -48,24 +48,6 @@ public class ${className} implements Serializable { @NotNull - <#if column.dateAnnotation??> - <#if column.dateAnnotation = 'CreationTimestamp'> - @CreationTimestamp - <#else> - @UpdateTimestamp - - - <#if column.changeColumnName = 'updateTime'|| column.changeColumnName = 'updateDate'> - @TableField(fill= FieldFill.INSERT_UPDATE) - - <#if column.changeColumnName = 'createTime' || column.changeColumnName = 'createDate'> - @TableField(fill= FieldFill.INSERT) - - <#if column.changeColumnName = 'delFlag'> - @TableLogic - @TableField(fill=FieldFill.INSERT_UPDATE) - private Boolean ${column.changeColumnName}; - <#else> private ${column.columnType} ${column.changeColumnName}; diff --git a/yshop-admin/src/main/resources/template/generator/admin/QueryCriteria.ftl b/yshop-admin/src/main/resources/template/generator/admin/QueryCriteria.ftl index 1206846e..26c422c6 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/QueryCriteria.ftl +++ b/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 queryHasBigDecimal> import java.math.BigDecimal; diff --git a/yshop-admin/src/main/resources/template/generator/admin/QueryCriteriaP.ftl b/yshop-admin/src/main/resources/template/generator/admin/QueryCriteriaP.ftl index 1206846e..26c422c6 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/QueryCriteriaP.ftl +++ b/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 queryHasBigDecimal> import java.math.BigDecimal; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java b/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java index 50e42af7..706b90a0 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java +++ b/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)){ - genMap.put("hasTimestamp",true); + if(DATE.equals(colType)){ + 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 类型