Skip to content

Commit aa38125

Browse files
moshowgamemoshowgame
authored
Merge pull request #123 from Thixiaoxiao/dev_fix_mabitis
修复部分模板参数不对应
2 parents adab6d7 + dac7d20 commit aa38125

File tree

4 files changed

+96
-96
lines changed

4 files changed

+96
-96
lines changed

‎generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao
1919

2020
@Override
2121
public int add(${classInfo.className} ${classInfo.className?uncap_first}) {
22-
return jdbcTemplate.update("insert into ${classInfo.tableName} (<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list></#if> ) values (<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem >?<#if fieldItem_has_next>,</#if></#list></#if> )",
22+
return jdbcTemplate.update("insert into ${classInfo.originTableName} (<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list></#if> ) values (<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem >?<#if fieldItem_has_next>,</#if></#list></#if> )",
2323
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem >${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}()<#if fieldItem_has_next>,</#if></#list></#if>);
2424
}
2525

2626
@Override
2727
public int update(${classInfo.className} ${classInfo.className?uncap_first}) {
28-
return jdbcTemplate.update("UPDATE ${classInfo.tableName} SET <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem ><#if fieldItem_index gt 0 >${fieldItem.columnName}=?<#if fieldItem_has_next>,</#if></#if></#list></#if>"
28+
return jdbcTemplate.update("UPDATE ${classInfo.originTableName} SET <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem ><#if fieldItem_index gt 0 >${fieldItem.columnName}=?<#if fieldItem_has_next>,</#if></#if></#list></#if>"
2929
+" where <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem ><#if fieldItem_index = 0>${fieldItem.columnName}=?<#break ></#if></#list></#if>",
3030
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
3131
<#list classInfo.fieldList as fieldItem ><#if fieldItem_index gt 0 >${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}(),</#if></#list>
@@ -35,12 +35,12 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao
3535

3636
@Override
3737
public int delete(int id) {
38-
return jdbcTemplate.update("DELETE from ${classInfo.tableName} where <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem ><#if fieldItem_index = 0>${fieldItem.columnName}=?<#break ></#if></#list></#if>",id);
38+
return jdbcTemplate.update("DELETE from ${classInfo.originTableName} where <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem ><#if fieldItem_index = 0>${fieldItem.columnName}=?<#break ></#if></#list></#if>",id);
3939
}
4040

4141
@Override
4242
public ${classInfo.className} findById(int id) {
43-
List<${classInfo.className}> list = jdbcTemplate.query("select * from ${classInfo.tableName} where <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem ><#if fieldItem_index = 0>${fieldItem.columnName}=?<#break ></#if></#list></#if>", new Object[]{id}, new BeanPropertyRowMapper<${classInfo.className}>(${classInfo.className}.class));
43+
List<${classInfo.className}> list = jdbcTemplate.query("select * from ${classInfo.originTableName} where <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0><#list classInfo.fieldList as fieldItem ><#if fieldItem_index = 0>${fieldItem.columnName}=?<#break ></#if></#list></#if>", new Object[]{id}, new BeanPropertyRowMapper<${classInfo.className}>(${classInfo.className}.class));
4444
if(list!=null && !list.isEmpty() ){
4545
return list.get(0);
4646
}else{
@@ -50,7 +50,7 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao
5050

5151
@Override
5252
public List<${classInfo.className}> findAllList(Map<String,Object> params) {
53-
List<${classInfo.className}> list = jdbcTemplate.query("select * from ${classInfo.tableName}", new Object[]{}, new BeanPropertyRowMapper<${classInfo.className}>(${classInfo.className}.class));
53+
List<${classInfo.className}> list = jdbcTemplate.query("select * from ${classInfo.originTableName}", new Object[]{}, new BeanPropertyRowMapper<${classInfo.className}>(${classInfo.className}.class));
5454
if(list!=null && !list.isEmpty() ){
5555
return list;
5656
}else{

‎generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty;</#if>
2121
*/
2222
@Entity
2323
<#if isLombok?exists && isLombok==true>@Data</#if>
24-
<#if isComment?exists && isComment==true>@Table(name="${classInfo.tableName}")</#if><#if isSwagger?exists && isSwagger==true>
24+
<#if isComment?exists && isComment==true>@Table(name="${classInfo.originTableName}")</#if><#if isSwagger?exists && isSwagger==true>
2525
@ApiModel("${classInfo.classComment}")</#if>
2626
public class ${classInfo.className} implements Serializable {
2727

‎generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class ${classInfo.className}Controller {
3838
* @date ${.now?string('yyyy/MM/dd')}
3939
**/
4040
@RequestMapping("/delete")
41-
public ReturnT<String> delete(int id){
41+
public Object delete(int id){
4242
return ${classInfo.className?uncap_first}Service.delete(id);
4343
}
4444

@@ -48,7 +48,7 @@ public class ${classInfo.className}Controller {
4848
* @date ${.now?string('yyyy/MM/dd')}
4949
**/
5050
@RequestMapping("/update")
51-
public ReturnT<String> update(${classInfo.className} ${classInfo.className?uncap_first}){
51+
public Object update(${classInfo.className} ${classInfo.className?uncap_first}){
5252
return ${classInfo.className?uncap_first}Service.update(${classInfo.className?uncap_first});
5353
}
5454

‎generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl‎

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,89 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
3-
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
4-
<mapper namespace="${packageName}.dao.${classInfo.className}Dao">
5-
6-
<resultMap id="BaseResultMap" type="${packageName}.entity.${classInfo.className}Entity" >
7-
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
8-
<#list classInfo.fieldList as fieldItem >
9-
<result column="${fieldItem.columnName}" property="${fieldItem.fieldName}" />
10-
</#list>
11-
</#if>
12-
</resultMap>
13-
14-
<sql id="Base_Column_List">
15-
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
16-
<#list classInfo.fieldList as fieldItem >
17-
${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
18-
</#list>
19-
</#if>
20-
</sql>
21-
22-
<insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="${packageName}.entity.${classInfo.className}Entity">
23-
INSERT INTO ${classInfo.tableName}
24-
<trim prefix="(" suffix=")" suffixOverrides=",">
25-
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
26-
<#list classInfo.fieldList as fieldItem >
27-
<#if fieldItem.columnName != "id" >
28-
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
29-
${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
30-
${r"</if>"}
31-
</#if>
32-
</#list>
33-
</#if>
34-
</trim>
35-
<trim prefix="values (" suffix=")" suffixOverrides=",">
36-
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
37-
<#list classInfo.fieldList as fieldItem >
38-
<#if fieldItem.columnName != "id" >
39-
<#--<#if fieldItem.columnName="addtime" || fieldItem.columnName="updatetime" >
40-
${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}
41-
NOW()<#if fieldItem_has_next>,</#if>
42-
${r"</if>"}
43-
<#else>-->
44-
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
45-
${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>
46-
${r"</if>"}
47-
<#--</#if>-->
48-
</#if>
49-
</#list>
50-
</#if>
51-
</trim>
52-
</insert>
53-
54-
<delete id="delete" >
55-
DELETE FROM ${classInfo.tableName}
56-
WHERE id = ${r"#{id}"}
57-
</delete>
58-
59-
<update id="update" parameterType="${packageName}.entity.${classInfo.className}Entity">
60-
UPDATE ${classInfo.tableName}
61-
<set>
62-
<#list classInfo.fieldList as fieldItem >
63-
<#if fieldItem.columnName != "id" && fieldItem.columnName != "AddTime" && fieldItem.columnName != "UpdateTime" >
64-
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
65-
</#if>
66-
</#list>
67-
</set>
68-
WHERE id = ${r"#{"}id${r"}"}
69-
</update>
70-
71-
72-
<select id="load" resultMap="BaseResultMap">
73-
SELECT <include refid="Base_Column_List" />
74-
FROM ${classInfo.tableName}
75-
WHERE id = ${r"#{id}"}
76-
</select>
77-
78-
<select id="pageList" resultMap="BaseResultMap">
79-
SELECT <include refid="Base_Column_List" />
80-
FROM ${classInfo.tableName}
81-
LIMIT ${r"#{offset}"}, ${r"#{pageSize}"}
82-
</select>
83-
84-
<select id="pageListCount" resultType="java.lang.Integer">
85-
SELECT count(1)
86-
FROM ${classInfo.tableName}
87-
</select>
88-
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
3+
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
4+
<mapper namespace="${packageName}.dao.${classInfo.className}Mapper">
5+
6+
<resultMap id="BaseResultMap" type="${packageName}.entity.${classInfo.className}" >
7+
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
8+
<#list classInfo.fieldList as fieldItem >
9+
<result column="${fieldItem.columnName}" property="${fieldItem.fieldName}" />
10+
</#list>
11+
</#if>
12+
</resultMap>
13+
14+
<sql id="Base_Column_List">
15+
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
16+
<#list classInfo.fieldList as fieldItem >
17+
${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
18+
</#list>
19+
</#if>
20+
</sql>
21+
22+
<insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="${packageName}.entity.${classInfo.className}">
23+
INSERT INTO ${classInfo.originTableName}
24+
<trim prefix="(" suffix=")" suffixOverrides=",">
25+
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
26+
<#list classInfo.fieldList as fieldItem >
27+
<#if fieldItem.columnName != "id" >
28+
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
29+
${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
30+
${r"</if>"}
31+
</#if>
32+
</#list>
33+
</#if>
34+
</trim>
35+
<trim prefix="values (" suffix=")" suffixOverrides=",">
36+
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
37+
<#list classInfo.fieldList as fieldItem >
38+
<#if fieldItem.columnName != "id" >
39+
<#--<#if fieldItem.columnName="addtime" || fieldItem.columnName="updatetime" >
40+
${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}
41+
NOW()<#if fieldItem_has_next>,</#if>
42+
${r"</if>"}
43+
<#else>-->
44+
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
45+
${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>
46+
${r"</if>"}
47+
<#--</#if>-->
48+
</#if>
49+
</#list>
50+
</#if>
51+
</trim>
52+
</insert>
53+
54+
<delete id="delete" >
55+
DELETE FROM ${classInfo.originTableName}
56+
WHERE id = ${r"#{id}"}
57+
</delete>
58+
59+
<update id="update" parameterType="${packageName}.entity.${classInfo.className}">
60+
UPDATE ${classInfo.originTableName}
61+
<set>
62+
<#list classInfo.fieldList as fieldItem >
63+
<#if fieldItem.columnName != "id" && fieldItem.columnName != "AddTime" && fieldItem.columnName != "UpdateTime" >
64+
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
65+
</#if>
66+
</#list>
67+
</set>
68+
WHERE id = ${r"#{"}id${r"}"}
69+
</update>
70+
71+
72+
<select id="load" resultMap="BaseResultMap">
73+
SELECT <include refid="Base_Column_List" />
74+
FROM ${classInfo.originTableName}
75+
WHERE id = ${r"#{id}"}
76+
</select>
77+
78+
<select id="pageList" resultMap="BaseResultMap">
79+
SELECT <include refid="Base_Column_List" />
80+
FROM ${classInfo.originTableName}
81+
LIMIT ${r"#{offset}"}, ${r"#{pageSize}"}
82+
</select>
83+
84+
<select id="pageListCount" resultType="java.lang.Integer">
85+
SELECT count(1)
86+
FROM ${classInfo.originTableName}
87+
</select>
88+
8989
</mapper>

0 commit comments

Comments
 (0)