diff --git a/generator-web/src/main/resources/application-dev.yml b/generator-web/src/main/resources/application-dev.yml index 42869ce0..ef9b9de7 100644 --- a/generator-web/src/main/resources/application-dev.yml +++ b/generator-web/src/main/resources/application-dev.yml @@ -52,11 +52,11 @@ OEM: keywords: sql转实体类,sql转DAO,SQL转service,SQL转JPA实现,SQL转MYBATIS实现 title: JAVA代码生成平台 slogan: For reducing the repetitive CRUD work - description: SpringBootCodeGenerator(JAVA代码生成平台)，又名`大狼狗代码生成器`、`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。 - author: zhengkai.blog.csdn.net - packageName: com.software.system - copyright: powered by Moshow郑锴(大狼狗) - returnUtilSuccess: ReturnT.success - returnUtilFailure: ReturnT.error + description: SpringBootCodeGenerator(JAVA代码生成平台)，`SQL转JAVA`、`SQL转JPA`、`SQL转Mybatis`、`Mybatis在线生成器`、`SQL转Java JPA、MYBATIS实现类代码生成平台`。 + author: easyhome-姓名 + packageName: com.easyhome.xxx + copyright: easyhome + returnUtilSuccess: Response.buildSuccess + returnUtilFailure: Response.buildFailed outputStr: zhengkai.blog.csdn.net mode: local diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl index 52134edb..1904e8b9 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl @@ -16,7 +16,10 @@ import io.swagger.annotations.ApiModelProperty; * @author ${authorName} * @date ${.now?string('yyyy-MM-dd')} */ -<#if isLombok?exists && isLombok==true>@Data<#if isSwagger?exists && isSwagger==true> +<#if isLombok?exists && isLombok==true> + @Data + @NoArgsConstructor +<#if isSwagger?exists && isSwagger==true> @ApiModel("${classInfo.classComment}") public class ${classInfo.className} implements Serializable { diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl index e7dc9ef5..4726c388 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl @@ -19,41 +19,41 @@ public interface ${classInfo.className}Mapper { * @author ${authorName} * @date ${.now?string('yyyy/MM/dd')} **/ - int insert(${classInfo.className} ${classInfo.className?uncap_first}); + int insert(${classInfo.className}PO ${classInfo.className?uncap_first}); /** * 刪除 * @author ${authorName} * @date ${.now?string('yyyy/MM/dd')} **/ - int delete(int id); + int delete(Long id); /** * 更新 * @author ${authorName} * @date ${.now?string('yyyy/MM/dd')} **/ - int update(${classInfo.className} ${classInfo.className?uncap_first}); + int update(${classInfo.className}PO ${classInfo.className?uncap_first}); /** * 查询 根据主键 id 查询 * @author ${authorName} * @date ${.now?string('yyyy/MM/dd')} **/ - ${classInfo.className} load(int id); + ${classInfo.className}PO load(Long id); /** * 查询 分页查询 * @author ${authorName} * @date ${.now?string('yyyy/MM/dd')} **/ - List<${classInfo.className}> pageList(int offset,int pagesize); + List<${classInfo.className}PO> pageList(${classInfo.className}Req req); /** * 查询 分页查询 count * @author ${authorName} * @date ${.now?string('yyyy/MM/dd')} **/ - int pageListCount(int offset,int pagesize); + int pageListCount(${classInfo.className}Req req); } diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl index 3e94df70..f4f938ef 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl @@ -8,7 +8,11 @@ import java.util.List; * @author ${authorName} * @date ${.now?string('yyyy-MM-dd')} */ -public class ${classInfo.className} implements Serializable { +<#if isLombok?exists && isLombok==true> +@Data +@NoArgsConstructor + +public class ${classInfo.className}PO implements Serializable { private static final long serialVersionUID = 1L; @@ -22,19 +26,4 @@ public class ${classInfo.className} implements Serializable { -<#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> - public ${classInfo.className}() { - } - -<#list classInfo.fieldList as fieldItem> - public ${fieldItem.fieldClass} get${fieldItem.fieldName?cap_first}() { - return ${fieldItem.fieldName}; - } - - public void set${fieldItem.fieldName?cap_first}(${fieldItem.fieldClass} ${fieldItem.fieldName}) { - this.${fieldItem.fieldName} = ${fieldItem.fieldName}; - } - - - } diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl index d22cac04..1049d216 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis/mybatis.ftl @@ -3,10 +3,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#list classInfo.fieldList as fieldItem > - + @@ -14,20 +14,41 @@ <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#list classInfo.fieldList as fieldItem > - ${fieldItem.columnName}<#if fieldItem_has_next>, + ${fieldItem.columnName}<#if fieldItem_has_next>, - + + + <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> + <#list classInfo.fieldList as fieldItem > + ${fieldItem.columnName} AS "${fieldItem.fieldName}"<#if fieldItem_has_next>, + + + + + + + <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> + <#list classInfo.fieldList as fieldItem > + + AND + ${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"} + + + + + + INSERT INTO ${classInfo.originTableName} <#if classInfo.fieldList?exists && classInfo.fieldList?size gt 0> <#list classInfo.fieldList as fieldItem > <#if fieldItem.columnName != "id" > - and '' != ${fieldItem.fieldName}"> - ${fieldItem.columnName}<#if fieldItem_has_next>, - ${r""} + and '' != ${fieldItem.fieldName}"> + ${fieldItem.columnName}<#if fieldItem_has_next>, + ${r""} @@ -41,9 +62,9 @@ NOW()<#if fieldItem_has_next>, ${r""} <#else>--> - and '' != ${fieldItem.fieldName}"> - ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>, - ${r""} + and '' != ${fieldItem.fieldName}"> + ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>, + ${r""} <#----> @@ -56,12 +77,12 @@ WHERE id = ${r"#{id}"} - + UPDATE ${classInfo.originTableName} <#list classInfo.fieldList as fieldItem > <#if fieldItem.columnName != "id" && fieldItem.columnName != "AddTime" && fieldItem.columnName != "UpdateTime" > - and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,${r""} + and '' != ${fieldItem.fieldName}">${fieldItem.columnName} = ${r"#{"}${fieldItem.fieldName}${r"}"}<#if fieldItem_has_next>,${r""} @@ -78,12 +99,23 @@ \ No newline at end of file diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl index c31f30b0..92e66d7f 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl @@ -11,26 +11,26 @@ public interface ${classInfo.className}Service { /** * 新增 */ - public Object insert(${classInfo.className} ${classInfo.className?uncap_first}); + public int insert(${classInfo.className}PO ${classInfo.className?uncap_first}); /** * 删除 */ - public Object delete(int id); + public int delete(Long id); /** * 更新 */ - public Object update(${classInfo.className} ${classInfo.className?uncap_first}); + public int update(${classInfo.className}PO ${classInfo.className?uncap_first}); /** * 根据主键 id 查询 */ - public ${classInfo.className} load(int id); + public ${classInfo.className}PO load(Long id); /** * 分页查询 */ - public Map pageList(int offset, int pagesize); + public Page<${classInfo.className}PO> pageList(${classInfo.className}Req req); } diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl index 3a8345de..aff7d9d6 100644 --- a/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl +++ b/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl @@ -19,50 +19,45 @@ public class ${classInfo.className}ServiceImpl implements ${classInfo.className} @Override - public Object insert(${classInfo.className} ${classInfo.className?uncap_first}) { + public int insert(${classInfo.className}PO ${classInfo.className?uncap_first}) { // valid if (${classInfo.className?uncap_first} == null) { return ${returnUtilFailure}("必要参数缺失"); } - ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first}); - return ${returnUtilSuccess}(); + int ret = ${classInfo.className?uncap_first}Mapper.insert(${classInfo.className?uncap_first}); + return row; } @Override - public Object delete(int id) { + public int delete(Long id) { int ret = ${classInfo.className?uncap_first}Mapper.delete(id); - return ret>0?${returnUtilSuccess}():${returnUtilFailure}(); + return ret; } @Override - public Object update(${classInfo.className} ${classInfo.className?uncap_first}) { + public int update(${classInfo.className}PO ${classInfo.className?uncap_first}) { int ret = ${classInfo.className?uncap_first}Mapper.update(${classInfo.className?uncap_first}); - return ret>0?${returnUtilSuccess}():${returnUtilFailure}(); + return ret; } @Override - public ${classInfo.className} load(int id) { + public ${classInfo.className}PO load(Long id) { return ${classInfo.className?uncap_first}Mapper.load(id); } @Override - public Map pageList(int offset, int pagesize) { + public Page<${classInfo.className}PO> pageList(${classInfo.className}Req req) { - List<${classInfo.className}> pageList = ${classInfo.className?uncap_first}Mapper.pageList(offset, pagesize); - int totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(offset, pagesize); + List<${classInfo.className}PO> pageList = ${classInfo.className?uncap_first}Mapper.pageList(req); + int totalCount = ${classInfo.className?uncap_first}Mapper.pageListCount(req); - // result - Map result = new HashMap(); - result.put("pageList", pageList); - result.put("totalCount", totalCount); - - return result; + return new Page<${classInfo.className}PO>(Long.valueOf(totalCount), pageList); } }