From ae670d2ea3bd59a590e71d4fc660bfad8b785647 Mon Sep 17 00:00:00 2001 From: caoshd Date: Sun, 31 Mar 2024 19:11:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../caoshd/otone/builder/InfoOutBuilder.java | 4 +- .../caoshd/otone/builder/SourceBuilder.java | 34 +++--- .../space/caoshd/otone/entity/OutputInfo.java | 10 +- .../space/caoshd/otone/util/CfgUtils.java | 108 +++++++++--------- .../space/caoshd/otone/util/CfgUtilsTest.java | 12 +- src/test/resources/config/config.properties | 16 +-- .../resources/template/{po.vm => entity.vm} | 2 +- src/test/resources/template/mapper.vm | 35 +++++- .../resources/template/{form.vm => req.vm} | 0 .../resources/template/{view.vm => res.vm} | 2 +- 10 files changed, 123 insertions(+), 100 deletions(-) rename src/test/resources/template/{po.vm => entity.vm} (94%) rename src/test/resources/template/{form.vm => req.vm} (100%) rename src/test/resources/template/{view.vm => res.vm} (84%) diff --git a/src/main/java/space/caoshd/otone/builder/InfoOutBuilder.java b/src/main/java/space/caoshd/otone/builder/InfoOutBuilder.java index a9df169..04f06f7 100644 --- a/src/main/java/space/caoshd/otone/builder/InfoOutBuilder.java +++ b/src/main/java/space/caoshd/otone/builder/InfoOutBuilder.java @@ -46,8 +46,8 @@ public class InfoOutBuilder { return this; } - public InfoOutBuilder setPoPackageName(String poPackageName) { - this.outputInfo.setPoPackageName(poPackageName); + public InfoOutBuilder setEntityPackageName(String entityPackageName) { + this.outputInfo.setEntityPackageName(entityPackageName); return this; } diff --git a/src/main/java/space/caoshd/otone/builder/SourceBuilder.java b/src/main/java/space/caoshd/otone/builder/SourceBuilder.java index 09cebcc..db29c7a 100644 --- a/src/main/java/space/caoshd/otone/builder/SourceBuilder.java +++ b/src/main/java/space/caoshd/otone/builder/SourceBuilder.java @@ -130,15 +130,15 @@ public class SourceBuilder { } private Map loadExtra() { - extra.put("poPackageName", CfgUtils.getPoPackageName()); + extra.put("entityPackageName", CfgUtils.getEntityPackageName()); extra.put("queryPackageName", CfgUtils.getQueryPackageName()); extra.put("controllerNameSuffix", CfgUtils.getControllerNameSuffix()); extra.put("serviceNameSuffix", CfgUtils.getServiceNameSuffix()); extra.put("servieInterfaceNamePrefix", CfgUtils.getServiceInterfacePrefix()); extra.put("mapperNameSuffix", CfgUtils.getMapperNameSuffix()); - extra.put("poNameSuffix", CfgUtils.getPoNameSuffix()); - extra.put("viewNameSuffix", CfgUtils.getViewNameSuffix()); - extra.put("formNameSuffix", CfgUtils.getFormNameSuffix()); + extra.put("entityNameSuffix", CfgUtils.getEntityNameSuffix()); + extra.put("resNameSuffix", CfgUtils.getResNameSuffix()); + extra.put("formNameSuffix", CfgUtils.getReqNameSuffix()); extra.put("queryNameSuffix", CfgUtils.getQueryNameSuffix()); extra.put("mybatisMapperEnable", CfgUtils.mybatisMapperEnable()); return extra; @@ -155,17 +155,17 @@ public class SourceBuilder { private List defaultOutputInfoList() { return Arrays.asList( // PO - new InfoOutBuilder().setNameSuffix(CfgUtils.getPoNameSuffix()) - .setTemplatePath(CfgUtils.getPoTemplatePath()) - .setPackagePath(CfgUtils.getPoPackagePath()) - .setPackageName(CfgUtils.getPoPackageName()) + new InfoOutBuilder().setNameSuffix(CfgUtils.getEntityNameSuffix()) + .setTemplatePath(CfgUtils.getEntityTemplatePath()) + .setPackagePath(CfgUtils.getEntityPackagePath()) + .setPackageName(CfgUtils.getEntityPackageName()) .build(), // MAPPER new InfoOutBuilder().setNameSuffix(CfgUtils.getMapperNameSuffix()) .setTemplatePath(CfgUtils.getMapperTemplatePath()) .setPackagePath(CfgUtils.getMapperPackagePath()) .setPackageName(CfgUtils.getMapperPackageName()) - .setPoPackageName(CfgUtils.getPoPackageName()) + .setEntityPackageName(CfgUtils.getEntityPackageName()) .setQueryPackageName(CfgUtils.getQueryPackageName()) .build(), // SERVICE @@ -189,16 +189,16 @@ public class SourceBuilder { .setPackageName(CfgUtils.getControllerPackageName()) .build(), // VIEW - new InfoOutBuilder().setNameSuffix(CfgUtils.getViewNameSuffix()) - .setTemplatePath(CfgUtils.getViewTemplatePath()) - .setPackagePath(CfgUtils.getViewPackagePath()) - .setPackageName(CfgUtils.getViewPackageName()) + new InfoOutBuilder().setNameSuffix(CfgUtils.getResNameSuffix()) + .setTemplatePath(CfgUtils.getResTemplatePath()) + .setPackagePath(CfgUtils.getResPackagePath()) + .setPackageName(CfgUtils.getResPackageName()) .build(), // FORM - new InfoOutBuilder().setNameSuffix(CfgUtils.getFormNameSuffix()) - .setTemplatePath(CfgUtils.getFormTemplatePath()) - .setPackagePath(CfgUtils.getFormPackagePath()) - .setPackageName(CfgUtils.getFormPackageName()) + new InfoOutBuilder().setNameSuffix(CfgUtils.getReqNameSuffix()) + .setTemplatePath(CfgUtils.getReqTemplatePath()) + .setPackagePath(CfgUtils.getReqPackagePath()) + .setPackageName(CfgUtils.getReqPackageName()) .build(), // QUERY new InfoOutBuilder().setNameSuffix(CfgUtils.getQueryNameSuffix()) diff --git a/src/main/java/space/caoshd/otone/entity/OutputInfo.java b/src/main/java/space/caoshd/otone/entity/OutputInfo.java index c62d97f..1ca7d60 100644 --- a/src/main/java/space/caoshd/otone/entity/OutputInfo.java +++ b/src/main/java/space/caoshd/otone/entity/OutputInfo.java @@ -13,7 +13,7 @@ public class OutputInfo { private String interfacePackageName; - private String poPackageName; + private String entityPackageName; private String queryPackageName; @@ -59,12 +59,12 @@ public class OutputInfo { this.interfacePackageName = interfacePackageName; } - public String getPoPackageName() { - return poPackageName; + public String getEntityPackageName() { + return entityPackageName; } - public void setPoPackageName(String poPackageName) { - this.poPackageName = poPackageName; + public void setEntityPackageName(String entityPackageName) { + this.entityPackageName = entityPackageName; } public String getQueryPackageName() { diff --git a/src/main/java/space/caoshd/otone/util/CfgUtils.java b/src/main/java/space/caoshd/otone/util/CfgUtils.java index 7212fb2..ce2e518 100644 --- a/src/main/java/space/caoshd/otone/util/CfgUtils.java +++ b/src/main/java/space/caoshd/otone/util/CfgUtils.java @@ -25,14 +25,14 @@ public class CfgUtils { // 包配置 public static final String PACKAGE_NAME_BASE = "package.name.base"; - public static final String PACKAGE_NAME_PO = "package.name.po"; + public static final String PACKAGE_NAME_ENTITY = "package.name.entity"; public static final String PACKAGE_NAME_MAPPER = "package.name.mapper"; public static final String PACKAGE_NAME_SERVICE = "package.name.service"; public static final String PACKAGE_NAME_SERVICE_INTERFACE = "package.name.service.interface"; public static final String PACKAGE_NAME_CONTROLLER = "package.name.controller"; public static final String PACKAGE_NAME_QUERY = "package.name.query"; - public static final String PACKAGE_NAME_FORM = "package.name.form"; - public static final String PACKAGE_NAME_VIEW = "package.name.view"; + public static final String PACKAGE_NAME_REQ = "package.name.req"; + public static final String PACKAGE_NAME_RES = "package.name.res"; // 模块配置 public static final String MODULE_MULTIPLE = "module.multiple"; @@ -42,20 +42,20 @@ public class CfgUtils { public static final String MODULE_NAME_REPOSITORY = "module.name.repository"; // JAVA 配置 - public static final String JAVA_NAME_SUFFIX_PO = "java.name.suffix.po"; + public static final String JAVA_NAME_SUFFIX_ENTITY = "java.name.suffix.entity"; public static final String JAVA_NAME_SUFFIX_MAPPER = "java.name.suffix.mapper"; public static final String JAVA_NAME_SUFFIX_SERVICE = "java.name.suffix.service"; public static final String JAVA_NAME_SUFFIX_QUERY = "java.name.suffix.query"; - public static final String JAVA_NAME_SUFFIX_FORM = "java.name.suffix.form"; - public static final String JAVA_NAME_SUFFIX_VIEW = "java.name.suffix.view"; + public static final String JAVA_NAME_SUFFIX_REQ = "java.name.suffix.req"; + public static final String JAVA_NAME_SUFFIX_RES = "java.name.suffix.res"; public static final String JAVA_NAME_SUFFIX_CONTROLLER = "java.name.suffix.controller"; public static final String JAVA_NAME_PREFIX_SERVICE_INTERFACE = "java.name.prefix.service" + ".interface"; // 模版路径配置 - public static final String TEMPLATE_PATH_PO = "template.path.po"; - public static final String TEMPLATE_PATH_VIEW = "template.path.view"; - public static final String TEMPLATE_PATH_FORM = "template.path.form"; + public static final String TEMPLATE_PATH_ENTITY = "template.path.entity"; + public static final String TEMPLATE_PATH_RES = "template.path.res"; + public static final String TEMPLATE_PATH_REQ = "template.path.req"; public static final String TEMPLATE_PATH_QUERY = "template.path.query"; public static final String TEMPLATE_PATH_CONTROLLER = "template.path.controller"; public static final String TEMPLATE_PATH_SERVICE = "template.path.service"; @@ -68,13 +68,13 @@ public class CfgUtils { public static final String DEFAULT_PROJECT_PATH_RESOURCES = "src/main/resources"; // 包名默认值配置 - public static final String DEFAULT_PACKAGE_NAME_PO = "repository.po"; + public static final String DEFAULT_PACKAGE_NAME_ENTITY = "repository.entity"; public static final String DEFAULT_PACKAGE_NAME_MAPPER = "repository.mapper"; + public static final String DEFAULT_PACKAGE_NAME_QUERY = "repository.query"; public static final String DEFAULT_PACKAGE_NAME_SERVICE_INTERFACE = "service"; public static final String DEFAULT_PACKAGE_NAME_SERVICE = "service.impl"; - public static final String DEFAULT_PACKAGE_NAME_QUERY = "controller.query"; - public static final String DEFAULT_PACKAGE_NAME_FORM = "controller.form"; - public static final String DEFAULT_PACKAGE_NAME_VIEW = "controller.view"; + public static final String DEFAULT_PACKAGE_NAME_REQ = "controller.req"; + public static final String DEFAULT_PACKAGE_NAME_RES = "controller.res"; public static final String DEFAULT_PACKAGE_NAME_CONTROLLER = "controller"; // 模块名默认值配置 @@ -83,19 +83,19 @@ public class CfgUtils { public static final String DEFAULT_MODULE_NAME_REPOSITORY = "repository"; // JAVA文件名后缀默认值配置 - public static final String DEFAULT_JAVA_NAME_SUFFIX_PO = ""; + public static final String DEFAULT_JAVA_NAME_SUFFIX_ENTITY = "Entity"; public static final String DEFAULT_JAVA_NAME_SUFFIX_MAPPER = "Mapper"; public static final String DEFAULT_JAVA_NAME_SUFFIX_SERVICE = "Service"; public static final String DEFAULT_JAVA_NAME_SUFFIX_QUERY = "Query"; - public static final String DEFAULT_JAVA_NAME_SUFFIX_FORM = "Form"; - public static final String DEFAULT_JAVA_NAME_SUFFIX_VIEW = "View"; + public static final String DEFAULT_JAVA_NAME_SUFFIX_REQ = "Req"; + public static final String DEFAULT_JAVA_NAME_SUFFIX_RES = "Res"; public static final String DEFAULT_JAVA_NAME_SUFFIX_CONTROLLER = "Controller"; public static final String DEFAULT_JAVA_NAME_PREFIX_SERVICE_INTERFACE = "I"; // 模板文件路径默认值配置 - public static final String DEFAULT_TEMPLATE_PATH_PO = "template/po.vm"; - public static final String DEFAULT_TEMPLATE_PATH_VIEW = "template/view.vm"; - public static final String DEFAULT_TEMPLATE_PATH_FORM = "template/form.vm"; + public static final String DEFAULT_TEMPLATE_PATH_ENTITY = "template/entity.vm"; + public static final String DEFAULT_TEMPLATE_PATH_RES = "template/res.vm"; + public static final String DEFAULT_TEMPLATE_PATH_REQ = "template/req.vm"; public static final String DEFAULT_TEMPLATE_PATH_QUERY = "template/query.vm"; public static final String DEFAULT_TEMPLATE_PATH_CONTROLLER = "template/controller.vm"; public static final String DEFAULT_TEMPLATE_PATH_SERVICE = "template/service.vm"; @@ -221,58 +221,58 @@ public class CfgUtils { return Paths.get(controllerPackagePath, filename).toString(); } - public static String getViewNameSuffix() { - return CONFIG.getString(JAVA_NAME_SUFFIX_VIEW, DEFAULT_JAVA_NAME_SUFFIX_VIEW); + public static String getResNameSuffix() { + return CONFIG.getString(JAVA_NAME_SUFFIX_RES, DEFAULT_JAVA_NAME_SUFFIX_RES); } - public static String getViewTemplatePath() { - return CONFIG.getString(TEMPLATE_PATH_VIEW, DEFAULT_TEMPLATE_PATH_VIEW); + public static String getResTemplatePath() { + return CONFIG.getString(TEMPLATE_PATH_RES, DEFAULT_TEMPLATE_PATH_RES); } - public static String getViewPackageName() { + public static String getResPackageName() { String moduleName = getControllerModuleName(); - String packageName = CONFIG.getString(PACKAGE_NAME_VIEW, DEFAULT_PACKAGE_NAME_VIEW); + String packageName = CONFIG.getString(PACKAGE_NAME_RES, DEFAULT_PACKAGE_NAME_RES); return getPackageName(moduleName, packageName); } - public static String getViewPackagePath() { + public static String getResPackagePath() { String moduleName = getControllerModuleName(); - String packageName = getViewPackageName(); + String packageName = getResPackageName(); return getPackagePath(moduleName, packageName); } - public static String getViewFilePath(String className) { - String viewPackagePath = getViewPackagePath(); - String suffix = CONFIG.getString(JAVA_NAME_SUFFIX_VIEW, DEFAULT_JAVA_NAME_SUFFIX_VIEW); + public static String getResFilePath(String className) { + String resPackagePath = getResPackagePath(); + String suffix = CONFIG.getString(JAVA_NAME_SUFFIX_RES, DEFAULT_JAVA_NAME_SUFFIX_RES); String filename = getJavaFilename(className, suffix); - return Paths.get(viewPackagePath, filename).toString(); + return Paths.get(resPackagePath, filename).toString(); } - public static String getFormNameSuffix() { - return CONFIG.getString(JAVA_NAME_SUFFIX_FORM, DEFAULT_JAVA_NAME_SUFFIX_FORM); + public static String getReqNameSuffix() { + return CONFIG.getString(JAVA_NAME_SUFFIX_REQ, DEFAULT_JAVA_NAME_SUFFIX_REQ); } - public static String getFormTemplatePath() { - return CONFIG.getString(TEMPLATE_PATH_FORM, DEFAULT_TEMPLATE_PATH_FORM); + public static String getReqTemplatePath() { + return CONFIG.getString(TEMPLATE_PATH_REQ, DEFAULT_TEMPLATE_PATH_REQ); } - public static String getFormPackageName() { + public static String getReqPackageName() { String moduleName = getControllerModuleName(); - String packageName = CONFIG.getString(PACKAGE_NAME_FORM, DEFAULT_PACKAGE_NAME_FORM); + String packageName = CONFIG.getString(PACKAGE_NAME_REQ, DEFAULT_PACKAGE_NAME_REQ); return getPackageName(moduleName, packageName); } - public static String getFormPackagePath() { + public static String getReqPackagePath() { String moduleName = getControllerModuleName(); - String packageName = getFormPackageName(); + String packageName = getReqPackageName(); return getPackagePath(moduleName, packageName); } - public static String getFormFilePath(String className) { - String formPackagePath = getFormPackagePath(); - String suffix = CONFIG.getString(JAVA_NAME_SUFFIX_FORM, DEFAULT_JAVA_NAME_SUFFIX_FORM); + public static String getReqFilePath(String className) { + String reqPackagePath = getReqPackagePath(); + String suffix = CONFIG.getString(JAVA_NAME_SUFFIX_REQ, DEFAULT_JAVA_NAME_SUFFIX_REQ); String filename = getJavaFilename(className, suffix); - return Paths.get(formPackagePath, filename).toString(); + return Paths.get(reqPackagePath, filename).toString(); } public static String getQueryNameSuffix() { @@ -375,29 +375,29 @@ public class CfgUtils { return CONFIG.getString(MODULE_NAME_REPOSITORY, DEFAULT_MODULE_NAME_REPOSITORY); } - public static String getPoNameSuffix() { - return CONFIG.getString(JAVA_NAME_SUFFIX_PO, DEFAULT_JAVA_NAME_SUFFIX_PO); + public static String getEntityNameSuffix() { + return CONFIG.getString(JAVA_NAME_SUFFIX_ENTITY, DEFAULT_JAVA_NAME_SUFFIX_ENTITY); } - public static String getPoTemplatePath() { - return CONFIG.getString(TEMPLATE_PATH_PO, DEFAULT_TEMPLATE_PATH_PO); + public static String getEntityTemplatePath() { + return CONFIG.getString(TEMPLATE_PATH_ENTITY, DEFAULT_TEMPLATE_PATH_ENTITY); } - public static String getPoPackageName() { + public static String getEntityPackageName() { String moduleName = getRepositoryModuleName(); - String packageName = CONFIG.getString(PACKAGE_NAME_PO, DEFAULT_PACKAGE_NAME_PO); + String packageName = CONFIG.getString(PACKAGE_NAME_ENTITY, DEFAULT_PACKAGE_NAME_ENTITY); return getPackageName(moduleName, packageName); } - public static String getPoPackagePath() { + public static String getEntityPackagePath() { String moduleName = getRepositoryModuleName(); - String packageName = getPoPackageName(); + String packageName = getEntityPackageName(); return getPackagePath(moduleName, packageName); } - public static String getPoJavaPath(String className) { - String poPackagePath = getPoPackagePath(); - String suffix = CONFIG.getString(JAVA_NAME_SUFFIX_PO, DEFAULT_JAVA_NAME_SUFFIX_PO); + public static String getEntityjavaPath(String className) { + String poPackagePath = getEntityPackagePath(); + String suffix = CONFIG.getString(JAVA_NAME_SUFFIX_ENTITY, DEFAULT_JAVA_NAME_SUFFIX_ENTITY); String filename = getJavaFilename(className, suffix); return Paths.get(poPackagePath, filename).toString(); } diff --git a/src/test/java/space/caoshd/otone/util/CfgUtilsTest.java b/src/test/java/space/caoshd/otone/util/CfgUtilsTest.java index c6258da..58db75e 100644 --- a/src/test/java/space/caoshd/otone/util/CfgUtilsTest.java +++ b/src/test/java/space/caoshd/otone/util/CfgUtilsTest.java @@ -37,17 +37,17 @@ public class CfgUtilsTest { @Test public void getRepositoryPackageName() { - String poPackagePath = CfgUtils.getPoPackagePath(); + String poPackagePath = CfgUtils.getEntityPackagePath(); System.out.println(poPackagePath); - String viewPackagePath = CfgUtils.getViewPackagePath(); - System.out.println(viewPackagePath); + String resPackagePath = CfgUtils.getResPackagePath(); + System.out.println(resPackagePath); } @Test - public void getViewNameSuffix() { - String viewNameSuffix = CfgUtils.getViewNameSuffix(); - System.out.println(viewNameSuffix); + public void getResNameSuffix() { + String resNameSuffix = CfgUtils.getResNameSuffix(); + System.out.println(resNameSuffix); } diff --git a/src/test/resources/config/config.properties b/src/test/resources/config/config.properties index f1b4a6b..692b56f 100644 --- a/src/test/resources/config/config.properties +++ b/src/test/resources/config/config.properties @@ -2,13 +2,13 @@ project.path.base=D:/workspace/otono-debug/ #project.path.java=src/main/java #project.path.resources=src/main/resources package.name.base=space.caoshd.navigator -#package.name.po=repository.po +#package.name.entity=repository.entity #package.name.mapper=repository.mapper package.name.service=service.impl package.name.service.interface=service #package.name.query=controller.query #package.name.form=controller.form -#package.name.view=controller.view +#package.name.res=controller.res #package.name.controller=controller #module.multiple=false #module.name.as_package_base=false @@ -18,23 +18,23 @@ package.name.service.interface=service #java.name.prefix.service=I #java.name.suffix.service=Service #java.name.suffix.controller=Controller -#java.name.suffix.view=View -#java.name.suffix.form=Form +#java.name.suffix.res=Res +#java.name.suffix.form=Req #java.name.suffix.query=Query #java.name.suffix.mapper=Mapper -#java.name.suffix.po= +#java.name.suffix.entity= #database.name.schemas=otone #database.name.tables= database.table.prefixes=t_,m_ database.table.invalid_columns=delete_flag database.table.invalid_values=1 -#template.path.po=template/po.vm -#template.path.view=template/view.vm +#template.path.entity=template/entity.vm +#template.path.res=template/res.vm #template.path.form=template/form.vm #template.path.query=template/query.vm #template.path.controller=template/controller.vm #template.path.service=template/service.vm -#template.path.service.interface=template/service.interface/po.vm +#template.path.service.interface=template/service.interface/entity.vm #template.path.mapper=template/mapper.vm #template.path.mapper.xml=template/mapper.xml.vm output.cover_if_exists=true diff --git a/src/test/resources/template/po.vm b/src/test/resources/template/entity.vm similarity index 94% rename from src/test/resources/template/po.vm rename to src/test/resources/template/entity.vm index 510d6a2..73772e6 100644 --- a/src/test/resources/template/po.vm +++ b/src/test/resources/template/entity.vm @@ -8,7 +8,7 @@ * @version ${ext.version}#end #end -#set(${ClassName}="${cls.className}$!{ext.poNameSuffix}") +#set(${ClassName}="${cls.className}$!{ext.entityNameSuffix}") package ${cls.packageName}; import java.io.Serializable; diff --git a/src/test/resources/template/mapper.vm b/src/test/resources/template/mapper.vm index 3de3082..7bd0b6d 100644 --- a/src/test/resources/template/mapper.vm +++ b/src/test/resources/template/mapper.vm @@ -8,9 +8,11 @@ * @version ${ext.version}#end #end +#set(${invalidColumnExists}=${tbl.invalidColumn} && ${tbl.invalidColumn} != "") +#set(${pkColumn}=${tbl.indexes["PRIMARY"][0]}) #set(${ClassName}="${cls.className}$!{ext.mapperNameSuffix}") #set(${QueryName}="${cls.className}$!{ext.queryNameSuffix}") -#set(${PoName}="${cls.className}$!{ext.poNameSuffix}") +#set(${EntityName}="${cls.className}$!{ext.entityNameSuffix}") package ${cls.packageName}; #if(${ext.mybatisMapperEnable}) @@ -18,7 +20,7 @@ import org.apache.ibatis.annotations.Mapper; #end import org.apache.ibatis.annotations.Param; import ${ext.queryPackageName}.${QueryName}; -import ${ext.poPackageName}.${PoName}; +import ${ext.entityPackageName}.${EntityName}; import java.util.List; @@ -30,7 +32,6 @@ import java.util.List; @Mapper #end public interface ${ClassName} { - /** * 新增/修改$!{tbl.comment} * @@ -47,6 +48,16 @@ public interface ${ClassName} { */ Integer updateBatch(@Param("list") List<${QueryName}> list); +#if(${pkColumn}) + /** + * 通过主键物理删除$!{tbl.comment} + * + * @param ${pkColumn.fieldName} 主键 + * @return 影响记录数 + */ + Integer deleteByPK(@Param("pk") ${pkColumn.javaType} ${pkColumn.fieldName}); + +#end /** * 物理删除$!{tbl.comment} * @@ -55,6 +66,7 @@ public interface ${ClassName} { */ Integer delete(@Param("bean") ${QueryName} bean); +#if(${invalidColumnExists}) /** * 逻辑删除$!{tbl.comment} * @@ -63,13 +75,14 @@ public interface ${ClassName} { */ Integer invalid(@Param("bean") ${QueryName} bean); +#end /** * 查询单个$!{tbl.comment} 当结果存在多个时 随便拿一个 * * @param bean 查询条件 * @return 单个 */ - ${PoName} anyOne(@Param("bean") ${QueryName} bean); + ${EntityName} anyOne(@Param("bean") ${QueryName} bean); /** * 查询单个$!{tbl.comment} 明确知道结果必存在一个 @@ -77,15 +90,25 @@ public interface ${ClassName} { * @param bean 查询条件 * @return 单个 */ - ${PoName} onlyOne(@Param("bean") ${QueryName} bean); + ${EntityName} onlyOne(@Param("bean") ${QueryName} bean); +#if(${pkColumn}) + /** + * 通过主键物理查询单个$!{tbl.comment} + * + * @param ${pkColumn.fieldName} 主键 + * @return 单个 + */ + ${EntityName} oneByPK(@Param("pk") ${pkColumn.javaType} ${pkColumn.fieldName}); + +#end /** * 查询多个$!{tbl.comment} * * @param bean 查询条件 * @return 列表 */ - List<${PoName}> list(@Param("bean") ${QueryName} bean); + List<${EntityName}> list(@Param("bean") ${QueryName} bean); /** * 统计符合条件的$!{tbl.comment}实体个数 diff --git a/src/test/resources/template/form.vm b/src/test/resources/template/req.vm similarity index 100% rename from src/test/resources/template/form.vm rename to src/test/resources/template/req.vm diff --git a/src/test/resources/template/view.vm b/src/test/resources/template/res.vm similarity index 84% rename from src/test/resources/template/view.vm rename to src/test/resources/template/res.vm index 1f8e850..de03e66 100644 --- a/src/test/resources/template/view.vm +++ b/src/test/resources/template/res.vm @@ -8,7 +8,7 @@ * @version ${ext.version}#end #end -#set(${ClassName}="${cls.className}$!{ext.viewNameSuffix}") +#set(${ClassName}="${cls.className}$!{ext.resNameSuffix}") package ${cls.packageName}; /**