github/SpringBootCodeGenerator
1
0
Fork 0
mirror of https://github.com/moshowgame/SpringBootCodeGenerator.git synced 2026-03-22 07:28:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123 from Thixiaoxiao/dev_fix_mabitis

Browse Source 
修复部分模板参数不对应
This commit is contained in:
Moshow郑锴
2021-10-31 00:48:36 +08:00
committed by GitHub
parent adab6d7809 dac7d20eb8
commit aa38125294
4 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl
View File

@@ -19,13 +19,13 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao
@Override @Override
public int add(${classInfo.className} ${classInfo.className?uncap_first}) { public int add(${classInfo.className} ${classInfo.className?uncap_first}) {
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> )", 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> )",
<#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>); <#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>);
} }
@Override @Override
public int update(${classInfo.className} ${classInfo.className?uncap_first}) { public int update(${classInfo.className} ${classInfo.className?uncap_first}) {
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>" 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>"
+" 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>", +" 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>",
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
<#list classInfo.fieldList as fieldItem ><#if fieldItem_index gt 0 >${classInfo.className?uncap_first}.get${fieldItem.fieldName?cap_first}(),</#if></#list> <#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
@Override @Override
public int delete(int id) { public int delete(int id) {
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); 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);
} }
@Override @Override
public ${classInfo.className} findById(int id) { public ${classInfo.className} findById(int id) {
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)); 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));
if(list!=null && !list.isEmpty() ){ if(list!=null && !list.isEmpty() ){
return list.get(0); return list.get(0);
}else{ }else{
@@ -50,7 +50,7 @@ public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao
@Override @Override
public List<${classInfo.className}> findAllList(Map<String,Object> params) { public List<${classInfo.className}> findAllList(Map<String,Object> params) {
List<${classInfo.className}> list = jdbcTemplate.query("select * from ${classInfo.tableName}", new Object[]{}, new BeanPropertyRowMapper<${classInfo.className}>(${classInfo.className}.class)); List<${classInfo.className}> list = jdbcTemplate.query("select * from ${classInfo.originTableName}", new Object[]{}, new BeanPropertyRowMapper<${classInfo.className}>(${classInfo.className}.class));
if(list!=null && !list.isEmpty() ){ if(list!=null && !list.isEmpty() ){
return list; return list;
}else{ }else{

2
generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl
View File

@@ -21,7 +21,7 @@ import io.swagger.annotations.ApiModelProperty;</#if>
*/ */
@Entity @Entity
<#if isLombok?exists && isLombok==true>@Data</#if> <#if isLombok?exists && isLombok==true>@Data</#if>
<#if isComment?exists && isComment==true>@Table(name="${classInfo.tableName}")</#if><#if isSwagger?exists && isSwagger==true> <#if isComment?exists && isComment==true>@Table(name="${classInfo.originTableName}")</#if><#if isSwagger?exists && isSwagger==true>
@ApiModel("${classInfo.classComment}")</#if> @ApiModel("${classInfo.classComment}")</#if>
public class ${classInfo.className} implements Serializable { public class ${classInfo.className} implements Serializable {

4
generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
View File

@@ -38,7 +38,7 @@ public class ${classInfo.className}Controller {
* @date ${.now?string('yyyy/MM/dd')} * @date ${.now?string('yyyy/MM/dd')}
**/ **/
@RequestMapping("/delete") @RequestMapping("/delete")
public ReturnT<String> delete(int id){ public Object delete(int id){
return ${classInfo.className?uncap_first}Service.delete(id); return ${classInfo.className?uncap_first}Service.delete(id);
} }
@@ -48,7 +48,7 @@ public class ${classInfo.className}Controller {
* @date ${.now?string('yyyy/MM/dd')} * @date ${.now?string('yyyy/MM/dd')}
**/ **/
@RequestMapping("/update") @RequestMapping("/update")
public ReturnT<String> update(${classInfo.className} ${classInfo.className?uncap_first}){ public Object update(${classInfo.className} ${classInfo.className?uncap_first}){
return ${classInfo.className?uncap_first}Service.update(${classInfo.className?uncap_first}); return ${classInfo.className?uncap_first}Service.update(${classInfo.className?uncap_first});
} }

176
generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl
View File

@@ -1,89 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${packageName}.dao.${classInfo.className}Dao"> <mapper namespace="${packageName}.dao.${classInfo.className}Mapper">
<resultMap id="BaseResultMap" type="${packageName}.entity.${classInfo.className}Entity" > <resultMap id="BaseResultMap" type="${packageName}.entity.${classInfo.className}" >
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
<#list classInfo.fieldList as fieldItem > <#list classInfo.fieldList as fieldItem >
<result column="${fieldItem.columnName}" property="${fieldItem.fieldName}" /> <result column="${fieldItem.columnName}" property="${fieldItem.fieldName}" />
</#list> </#list>
</#if> </#if>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
<#list classInfo.fieldList as fieldItem > <#list classInfo.fieldList as fieldItem >
${fieldItem.columnName}<#if fieldItem_has_next>,</#if> ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
</#list> </#list>
</#if> </#if>
</sql> </sql>
<insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="${packageName}.entity.${classInfo.className}Entity"> <insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="${packageName}.entity.${classInfo.className}">
INSERT INTO ${classInfo.tableName} INSERT INTO ${classInfo.originTableName}
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
<#list classInfo.fieldList as fieldItem > <#list classInfo.fieldList as fieldItem >
<#if fieldItem.columnName != "id" > <#if fieldItem.columnName != "id" >
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}"> <if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
${fieldItem.columnName}<#if fieldItem_has_next>,</#if> ${fieldItem.columnName}<#if fieldItem_has_next>,</#if>
${r"</if>"} ${r"</if>"}
</#if> </#if>
</#list> </#list>
</#if> </#if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0>
<#list classInfo.fieldList as fieldItem > <#list classInfo.fieldList as fieldItem >
<#if fieldItem.columnName != "id" > <#if fieldItem.columnName != "id" >
<#--<#if fieldItem.columnName="addtime" || fieldItem.columnName="updatetime" > <#--<#if fieldItem.columnName="addtime" || fieldItem.columnName="updatetime" >
${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"} ${r"<if test ='null != "}${fieldItem.fieldName}${r"'>"}
NOW()<#if fieldItem_has_next>,</#if> NOW()<#if fieldItem_has_next>,</#if>
${r"</if>"} ${r"</if>"}
<#else>--> <#else>-->
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}"> <if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">
${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if> ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>
${r"</if>"} ${r"</if>"}
<#--</#if>--> <#--</#if>-->
</#if> </#if>
</#list> </#list>
</#if> </#if>
</trim> </trim>
</insert> </insert>
<delete id="delete" > <delete id="delete" >
DELETE FROM ${classInfo.tableName} DELETE FROM ${classInfo.originTableName}
WHERE id = ${r"#{id}"} WHERE id = ${r"#{id}"}
</delete> </delete>
<update id="update" parameterType="${packageName}.entity.${classInfo.className}Entity"> <update id="update" parameterType="${packageName}.entity.${classInfo.className}">
UPDATE ${classInfo.tableName} UPDATE ${classInfo.originTableName}
<set> <set>
<#list classInfo.fieldList as fieldItem > <#list classInfo.fieldList as fieldItem >
<#if fieldItem.columnName != "id" && fieldItem.columnName != "AddTime" && fieldItem.columnName != "UpdateTime" > <#if fieldItem.columnName != "id" && fieldItem.columnName != "AddTime" && fieldItem.columnName != "UpdateTime" >
<if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"} <if test="null != ${fieldItem.fieldName} and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,</#if>${r"</if>"}
</#if> </#if>
</#list> </#list>
</set> </set>
WHERE id = ${r"#{"}id${r"}"} WHERE id = ${r"#{"}id${r"}"}
</update> </update>
<select id="load" resultMap="BaseResultMap"> <select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" /> SELECT <include refid="Base_Column_List" />
FROM ${classInfo.tableName} FROM ${classInfo.originTableName}
WHERE id = ${r"#{id}"} WHERE id = ${r"#{id}"}
</select> </select>
<select id="pageList" resultMap="BaseResultMap"> <select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" /> SELECT <include refid="Base_Column_List" />
FROM ${classInfo.tableName} FROM ${classInfo.originTableName}
LIMIT ${r"#{offset}"}, ${r"#{pageSize}"} LIMIT ${r"#{offset}"}, ${r"#{pageSize}"}
</select> </select>
<select id="pageListCount" resultType="java.lang.Integer"> <select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1) SELECT count(1)
FROM ${classInfo.tableName} FROM ${classInfo.originTableName}
</select> </select>
</mapper> </mapper>