cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

代码生成更新

Browse Source
This commit is contained in:
LIONCITYS\lioncity
2020-11-12 21:25:23 +08:00
parent 346f725758
commit ab69152906
8 changed files with 26 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yshop-admin/src/main/resources/generator.properties
View File

@ -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

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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>

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

@ -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;

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

@ -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;

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

@ -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 类型