Skip to content

Commit 351fb98

Browse files
qmdxqmdx
committed
fixed github issues/936
1 parent e73b673 commit 351fb98

File tree

7 files changed

+155
-139
lines changed

7 files changed

+155
-139
lines changed

‎mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/handlers/MetaObjectHandler.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public interface MetaObjectHandler {
3737

3838
/**
3939
* 乐观锁常量
40+
*
4041
* @deprecated 3.1.1 {@link Constants#MP_OPTLOCK_ET_ORIGINAL}
4142
*/
4243
String MP_OPTLOCK_ET_ORIGINAL = "MP_OPTLOCK_ET_ORIGINAL";
@@ -169,7 +170,8 @@ default boolean isFill(String fieldName, Object fieldVal, MetaObject metaObject,
169170
: TableInfoHelper.getTableInfo(metaObject.getOriginalObject().getClass());
170171
if (Objects.nonNull(tableInfo)) {
171172
Optional<TableFieldInfo> first = tableInfo.getFieldList().stream()
172-
.filter(e -> e.getProperty().equals(fieldName) && e.getPropertyType().isAssignableFrom(fieldVal.getClass()))//v_3.1.1+ 设置子类的值也可以通过
173+
//v_3.1.1+ 设置子类的值也可以通过
174+
.filter(e -> e.getProperty().equals(fieldName) && e.getPropertyType().isAssignableFrom(fieldVal.getClass()))
173175
.findFirst();
174176
if (first.isPresent()) {
175177
FieldFill fill = first.get().getFieldFill();

‎mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/Constants.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ public interface Constants extends StringPool {
100100
*/
101101
String WHERE = "WHERE";
102102

103-
//乐观锁字段
103+
/**
104+
* 乐观锁字段
105+
*/
104106
String MP_OPTLOCK_VERSION_ORIGINAL = "MP_OPTLOCK_VERSION_ORIGINAL";
105107
String MP_OPTLOCK_VERSION_COLUMN = "MP_OPTLOCK_VERSION_COLUMN";
106108
String MP_OPTLOCK_ET_ORIGINAL = "MP_OPTLOCK_ET_ORIGINAL";

‎mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java

+4
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ public class StrategyConfig {
104104
*/
105105
@Setter(AccessLevel.NONE)
106106
private String[] exclude = null;
107+
/**
108+
* 实体是否生成 serialVersionUID
109+
*/
110+
private boolean entitySerialVersionUID = true;
107111
/**
108112
* 【实体】是否生成字段常量（默认 false）<br>
109113
* -----------------------------------<br>

‎mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/AbstractTemplateEngine.java

+1
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ public Map<String, Object> getObjectMap(TableInfo tableInfo) {
220220
objectMap.put("baseResultMap", globalConfig.isBaseResultMap());
221221
objectMap.put("baseColumnList", globalConfig.isBaseColumnList());
222222
objectMap.put("entity", tableInfo.getEntityName());
223+
objectMap.put("entitySerialVersionUID", config.getStrategyConfig().isEntitySerialVersionUID());
223224
objectMap.put("entityColumnConstant", config.getStrategyConfig().isEntityColumnConstant());
224225
objectMap.put("entityBuilderModel", config.getStrategyConfig().isEntityBuilderModel());
225226
objectMap.put("entityLombokModel", config.getStrategyConfig().isEntityLombokModel());

‎mybatis-plus-generator/src/main/resources/templates/entity.java.btl

+2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ public class ${entity} extends Model<${entity}> {
4242
public class ${entity} implements Serializable {
4343
<% } %>
4444

45+
<% if(entitySerialVersionUID){ %>
4546
private static final long serialVersionUID = 1L;
47+
<% } %>
4648
<% /** -----------BEGIN 字段循环遍历----------- **/ %>
4749
<% for(field in table.fields){ %>
4850
<%

‎mybatis-plus-generator/src/main/resources/templates/entity.java.ftl

+50-48
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,94 @@
11
package ${package.Entity};
22

33
<#list table.importPackages as pkg>
4-
import ${pkg};
4+
import ${pkg};
55
</#list>
66
<#if swagger2>
7-
import io.swagger.annotations.ApiModel;
8-
import io.swagger.annotations.ApiModelProperty;
7+
import io.swagger.annotations.ApiModel;
8+
import io.swagger.annotations.ApiModelProperty;
99
</#if>
1010
<#if entityLombokModel>
11-
import lombok.Data;
12-
import lombok.EqualsAndHashCode;
13-
import lombok.experimental.Accessors;
11+
import lombok.Data;
12+
import lombok.EqualsAndHashCode;
13+
import lombok.experimental.Accessors;
1414
</#if>
1515

1616
/**
17-
* <p>
18-
* ${table.comment!}
19-
* </p>
20-
*
21-
* @author ${author}
22-
* @since ${date}
23-
*/
17+
* <p>
18+
* ${table.comment!}
19+
* </p>
20+
*
21+
* @author ${author}
22+
* @since ${date}
23+
*/
2424
<#if entityLombokModel>
25-
@Data
25+
@Data
2626
<#if superEntityClass??>
27-
@EqualsAndHashCode(callSuper = true)
27+
@EqualsAndHashCode(callSuper = true)
2828
<#else>
29-
@EqualsAndHashCode(callSuper = false)
29+
@EqualsAndHashCode(callSuper = false)
3030
</#if>
31-
@Accessors(chain = true)
31+
@Accessors(chain = true)
3232
</#if>
3333
<#if table.convert>
34-
@TableName("${table.name}")
34+
@TableName("${table.name}")
3535
</#if>
3636
<#if swagger2>
37-
@ApiModel(value="${entity}对象", description="${table.comment!}")
37+
@ApiModel(value="${entity}对象", description="${table.comment!}")
3838
</#if>
3939
<#if superEntityClass??>
40-
public class ${entity} extends ${superEntityClass}<#if activeRecord><${entity}></#if> {
40+
public class ${entity} extends ${superEntityClass}<#if activeRecord><${entity}></#if> {
4141
<#elseif activeRecord>
42-
public class ${entity} extends Model<${entity}> {
42+
public class ${entity} extends Model<${entity}> {
4343
<#else>
44-
public class ${entity} implements Serializable {
44+
public class ${entity} implements Serializable {
4545
</#if>
4646

47+
<#if entitySerialVersionUID>
4748
private static final long serialVersionUID = 1L;
49+
</#if>
4850
<#-- ---------- BEGIN 字段循环遍历 ---------->
4951
<#list table.fields as field>
5052
<#if field.keyFlag>
5153
<#assign keyPropertyName="${field.propertyName}"/>
5254
</#if>
5355

5456
<#if field.comment!?length gt 0>
55-
<#if swagger2>
56-
@ApiModelProperty(value = "${field.comment}")
57-
<#else>
58-
/**
59-
* ${field.comment}
60-
*/
61-
</#if>
57+
<#if swagger2>
58+
@ApiModelProperty(value = "${field.comment}")
59+
<#else>
60+
/**
61+
* ${field.comment}
62+
*/
63+
</#if>
6264
</#if>
6365
<#if field.keyFlag>
6466
<#-- 主键 -->
6567
<#if field.keyIdentityFlag>
66-
@TableId(value = "${field.name}", type = IdType.AUTO)
68+
@TableId(value = "${field.name}", type = IdType.AUTO)
6769
<#elseif idType??>
68-
@TableId(value = "${field.name}", type = IdType.${idType})
70+
@TableId(value = "${field.name}", type = IdType.${idType})
6971
<#elseif field.convert>
70-
@TableId("${field.name}")
72+
@TableId("${field.name}")
7173
</#if>
7274
<#-- 普通字段 -->
7375
<#elseif field.fill??>
7476
<#-- ----- 存在字段填充设置 ----->
7577
<#if field.convert>
76-
@TableField(value = "${field.name}", fill = FieldFill.${field.fill})
78+
@TableField(value = "${field.name}", fill = FieldFill.${field.fill})
7779
<#else>
78-
@TableField(fill = FieldFill.${field.fill})
80+
@TableField(fill = FieldFill.${field.fill})
7981
</#if>
8082
<#elseif field.convert>
81-
@TableField("${field.name}")
83+
@TableField("${field.name}")
8284
</#if>
8385
<#-- 乐观锁注解 -->
8486
<#if (versionFieldName!"") == field.name>
85-
@Version
87+
@Version
8688
</#if>
8789
<#-- 逻辑删除注解 -->
8890
<#if (logicDeleteFieldName!"") == field.name>
89-
@TableLogic
91+
@TableLogic
9092
</#if>
9193
private ${field.propertyType} ${field.propertyName};
9294
</#list>
@@ -99,26 +101,26 @@ public class ${entity} implements Serializable {
99101
<#else>
100102
<#assign getprefix="get"/>
101103
</#if>
102-
public ${field.propertyType} ${getprefix}${field.capitalName}() {
104+
public ${field.propertyType} ${getprefix}${field.capitalName}() {
103105
return ${field.propertyName};
104-
}
106+
}
105107

106108
<#if entityBuilderModel>
107-
public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
109+
public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
108110
<#else>
109-
public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
111+
public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
110112
</#if>
111113
this.${field.propertyName} = ${field.propertyName};
112114
<#if entityBuilderModel>
113-
return this;
115+
return this;
114116
</#if>
115-
}
117+
}
116118
</#list>
117119
</#if>
118120

119121
<#if entityColumnConstant>
120122
<#list table.fields as field>
121-
public static final String ${field.name?upper_case} = "${field.name}";
123+
public static final String ${field.name?upper_case} = "${field.name}";
122124

123125
</#list>
124126
</#if>
@@ -136,15 +138,15 @@ public class ${entity} implements Serializable {
136138
<#if !entityLombokModel>
137139
@Override
138140
public String toString() {
139-
return "${entity}{" +
141+
return "${entity}{" +
140142
<#list table.fields as field>
141143
<#if field_index==0>
142-
"${field.propertyName}=" + ${field.propertyName} +
144+
"${field.propertyName}=" + ${field.propertyName} +
143145
<#else>
144-
", ${field.propertyName}=" + ${field.propertyName} +
146+
", ${field.propertyName}=" + ${field.propertyName} +
145147
</#if>
146148
</#list>
147-
"}";
149+
"}";
148150
}
149151
</#if>
150152
}

0 commit comments

Comments
 (0)