修改: 优化控制器模板配置

src/main/java/space/caoshd/otone/builder/SourceBuilder.java

@@ -128,12 +128,14 @@ public class SourceBuilder {
         extra.put("resPackageName", CfgUtils.getResPackageName());
         extra.put("reqPackageName", CfgUtils.getReqPackageName());
         extra.put("queryPackageName", CfgUtils.getQueryPackageName());
-        extra.put("servicePackageName", CfgUtils.getServicePackageName());
+        extra.put("serviceIntfPackageName", CfgUtils.getServiceIntfPackageName());
+        extra.put("serviceImplPackageName", CfgUtils.getServiceImplPackageName());
         extra.put("controllerPackageName", CfgUtils.getControllerPackageName());
-        extra.put("serviceInterfacePackageName", CfgUtils.getServiceInterfacePackageName());
         extra.put("controllerNameSuffix", CfgUtils.getControllerNameSuffix());
-        extra.put("serviceNameSuffix", CfgUtils.getServiceNameSuffix());
-        extra.put("servieInterfaceNamePrefix", CfgUtils.getServiceInterfacePrefix());
+        extra.put("serviceIntfNamePrefix", CfgUtils.getServiceIntfNamePrefix());
+        extra.put("serviceIntfNameSuffix", CfgUtils.getServiceIntfNameSuffix());
+        extra.put("serviceImplNamePrefix", CfgUtils.getServiceImplNamePrefix());
+        extra.put("serviceImplNameSuffix", CfgUtils.getServiceImplNameSuffix());
         extra.put("mapperNameSuffix", CfgUtils.getMapperNameSuffix());
         extra.put("entityNameSuffix", CfgUtils.getEntityNameSuffix());
         extra.put("resNameSuffix", CfgUtils.getResNameSuffix());
@@ -181,17 +183,17 @@ public class SourceBuilder {
                 .build(),
             // SERVICE
             new InfoOutBuilder()
-                .setNamePrefix("")
-                .setNameSuffix(CfgUtils.getServiceNameSuffix())
+                .setNamePrefix(CfgUtils.getServiceImplNamePrefix())
+                .setNameSuffix(CfgUtils.getServiceImplNameSuffix())
                 .setTemplatePath(CfgUtils.getServiceTemplatePath())
-                .setPackagePath(CfgUtils.getServicePackagePath())
+                .setPackagePath(CfgUtils.getServiceImplPackagePath())
                 .build(),
             // SERVICE INTERFACE
             new InfoOutBuilder()
-                .setNamePrefix(CfgUtils.getServiceInterfacePrefix())
-                .setNameSuffix(CfgUtils.getServiceNameSuffix())
-                .setTemplatePath(CfgUtils.getServiceInterfaceTemplatePath())
-                .setPackagePath(CfgUtils.getServiceInterfacePackagePath())
+                .setNamePrefix(CfgUtils.getServiceIntfNamePrefix())
+                .setNameSuffix(CfgUtils.getServiceIntfNameSuffix())
+                .setTemplatePath(CfgUtils.getServiceIntfTemplatePath())
+                .setPackagePath(CfgUtils.getServiceIntfPackagePath())
                 .build(),
             // CONTROLLER
             new InfoOutBuilder()

src/main/java/space/caoshd/otone/helper/PropHelper.java

@@ -94,7 +94,9 @@ public class PropHelper {
         }
         List<String> result = new ArrayList<>();
         for (String value : values.split(",")) {
-            result.add(value.trim());
+            if (!value.trim().isEmpty()) {
+                result.add(value.trim());
+            }
         }
         return result;
     }

src/main/java/space/caoshd/otone/util/CfgUtils.java

@@ -27,8 +27,8 @@ public class CfgUtils {
     public static final String PACKAGE_NAME_BASE = "package.name.base";
     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_SERVICE_IMPL = "package.name.service.impl";
+    public static final String PACKAGE_NAME_SERVICE_INTF = "package.name.service.intf";
     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_REQ = "package.name.req";
@@ -44,13 +44,14 @@ public class CfgUtils {
     // JAVA 配置
     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_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 JAVA_NAME_PREFIX_SERVICE_INTF = "java.name.prefix.service.intf";
+    public static final String JAVA_NAME_SUFFIX_SERVICE_INTF = "java.name.suffix.service.intf";
+    public static final String JAVA_NAME_PREFIX_SERVICE_IMPL = "java.name.prefix.service.impl";
+    public static final String JAVA_NAME_SUFFIX_SERVICE_IMPL = "java.name.suffix.service.impl";
 
     // 模版路径配置
     public static final String TEMPLATE_PATH_ENTITY = "template.path.entity";
@@ -58,8 +59,8 @@ public class CfgUtils {
     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";
-    public static final String TEMPLATE_PATH_SERVICE_INTERFACE = "template.path.service.interface";
+    public static final String TEMPLATE_PATH_SERVICE_IMPL = "template.path.service.impl";
+    public static final String TEMPLATE_PATH_SERVICE_INTF = "template.path.service.intf";
     public static final String TEMPLATE_PATH_MAPPER = "template.path.mapper";
     public static final String TEMPLATE_PATH_MAPPER_XML = "template.path.mapper.xml";
 
@@ -71,8 +72,8 @@ public class CfgUtils {
     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_SERVICE_INTF = "service";
+    public static final String DEFAULT_PACKAGE_NAME_SERVICE_IMPL = "service.impl";
     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";
@@ -85,12 +86,14 @@ public class CfgUtils {
     // JAVA文件名后缀默认值配置
     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_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_JAVA_NAME_PREFIX_SERVICE_INTF = "I";
+    public static final String DEFAULT_JAVA_NAME_SUFFIX_SERVICE_INTF = "Service";
+    public static final String DEFAULT_JAVA_NAME_PREFIX_SERVICE_IMPL = "";
+    public static final String DEFAULT_JAVA_NAME_SUFFIX_SERVICE_IMPL = "Service";
 
     // 模板文件路径默认值配置
     public static final String DEFAULT_TEMPLATE_PATH_ENTITY = "template/entity.vm";
@@ -98,9 +101,8 @@ public class CfgUtils {
     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";
-    public static final String DEFAULT_TEMPLATE_PATH_SERVICE_INTERFACE =
-        "template/service" + ".interface.vm";
+    public static final String DEFAULT_TEMPLATE_PATH_SERVICE_IMPL = "template/service.impl.vm";
+    public static final String DEFAULT_TEMPLATE_PATH_SERVICE_INTF = "template/service.intf.vm";
     public static final String DEFAULT_TEMPLATE_PATH_MAPPER = "template/mapper.vm";
     public static final String DEFAULT_TEMPLATE_PATH_MAPPER_XML = "template/mapper.xml.vm";
     private static final PropHelper CONFIG = new PropHelper(PathConsts.CONFIG_PROPERTIES_PATH);
@@ -200,7 +202,8 @@ public class CfgUtils {
 
     public static String getControllerPackageName() {
         String moduleName = getServiceModuleName();
-        String packageName = CONFIG.getString(PACKAGE_NAME_CONTROLLER,
+        String packageName = CONFIG.getString(
+            PACKAGE_NAME_CONTROLLER,
             DEFAULT_PACKAGE_NAME_CONTROLLER
         );
         return getPackageName(moduleName, packageName);
@@ -214,7 +217,8 @@ public class CfgUtils {
 
     public static String getControllerFilePath(String className) {
         String controllerPackagePath = getControllerPackagePath();
-        String suffix = CONFIG.getString(JAVA_NAME_SUFFIX_CONTROLLER,
+        String suffix = CONFIG.getString(
+            JAVA_NAME_SUFFIX_CONTROLLER,
             DEFAULT_JAVA_NAME_SUFFIX_CONTROLLER
         );
         String filename = getJavaFilename(className, suffix);
@@ -306,66 +310,82 @@ public class CfgUtils {
         return CONFIG.getString(MODULE_NAME_SERVICE, DEFAULT_MODULE_NAME_SERVICE);
     }
 
-    public static String getServiceNameSuffix() {
-        return CONFIG.getString(JAVA_NAME_SUFFIX_SERVICE, DEFAULT_JAVA_NAME_SUFFIX_SERVICE);
+    public static String getServiceImplNameSuffix() {
+        return CONFIG.getString(JAVA_NAME_SUFFIX_SERVICE_IMPL, DEFAULT_JAVA_NAME_SUFFIX_SERVICE_IMPL);
+    }
+
+    public static String getServiceImplNamePrefix() {
+        return CONFIG.getString(JAVA_NAME_PREFIX_SERVICE_IMPL, DEFAULT_JAVA_NAME_PREFIX_SERVICE_IMPL);
     }
 
     public static String getServiceTemplatePath() {
-        return CONFIG.getString(TEMPLATE_PATH_SERVICE, DEFAULT_TEMPLATE_PATH_SERVICE);
+        return CONFIG.getString(TEMPLATE_PATH_SERVICE_IMPL, DEFAULT_TEMPLATE_PATH_SERVICE_IMPL);
     }
 
-    public static String getServicePackageName() {
+    public static String getServiceImplPackageName() {
         String moduleName = getServiceModuleName();
-        String packageName = CONFIG.getString(PACKAGE_NAME_SERVICE, DEFAULT_PACKAGE_NAME_SERVICE);
+        String packageName = CONFIG.getString(
+            PACKAGE_NAME_SERVICE_IMPL,
+            DEFAULT_PACKAGE_NAME_SERVICE_IMPL
+        );
         return getPackageName(moduleName, packageName);
     }
 
-    public static String getServicePackagePath() {
+    public static String getServiceImplPackagePath() {
         String moduleName = getServiceModuleName();
-        String packageName = getServicePackageName();
+        String packageName = getServiceImplPackageName();
         return getPackagePath(moduleName, packageName);
     }
 
-    public static String getServiceFilePath(String className) {
-        String servicePackagePath = getServicePackagePath();
-        String suffix = CONFIG.getString(JAVA_NAME_SUFFIX_SERVICE,
-            DEFAULT_JAVA_NAME_SUFFIX_SERVICE
+    public static String getServiceImplFilePath(String className) {
+        String servicePackagePath = getServiceImplPackagePath();
+        String suffix = CONFIG.getString(
+            JAVA_NAME_SUFFIX_SERVICE_IMPL,
+            DEFAULT_JAVA_NAME_SUFFIX_SERVICE_IMPL
         );
         String filename = getJavaFilename(className, suffix);
         return Paths.get(servicePackagePath, filename).toString();
     }
 
 
-    public static String getServiceInterfacePrefix() {
-        return CONFIG.getString(JAVA_NAME_PREFIX_SERVICE_INTERFACE,
-            DEFAULT_JAVA_NAME_PREFIX_SERVICE_INTERFACE
+    public static String getServiceIntfNamePrefix() {
+        return CONFIG.getString(
+            JAVA_NAME_PREFIX_SERVICE_INTF,
+            DEFAULT_JAVA_NAME_PREFIX_SERVICE_INTF
         );
     }
 
-    public static String getServiceInterfaceTemplatePath() {
-        return CONFIG.getString(TEMPLATE_PATH_SERVICE_INTERFACE,
-            DEFAULT_TEMPLATE_PATH_SERVICE_INTERFACE
+    public static String getServiceIntfNameSuffix() {
+        return CONFIG.getString(
+            JAVA_NAME_SUFFIX_SERVICE_INTF,
+            DEFAULT_JAVA_NAME_SUFFIX_SERVICE_INTF
         );
     }
 
-    public static String getServiceInterfacePackageName() {
+    public static String getServiceIntfTemplatePath() {
+        return CONFIG.getString(TEMPLATE_PATH_SERVICE_INTF, DEFAULT_TEMPLATE_PATH_SERVICE_INTF);
+    }
+
+    public static String getServiceIntfPackageName() {
         String moduleName = getServiceModuleName();
-        String packageName = CONFIG.getString(PACKAGE_NAME_SERVICE_INTERFACE,
-            DEFAULT_PACKAGE_NAME_SERVICE_INTERFACE
+        String packageName = CONFIG.getString(
+            PACKAGE_NAME_SERVICE_INTF,
+            DEFAULT_PACKAGE_NAME_SERVICE_INTF
         );
         return getPackageName(moduleName, packageName);
     }
 
-    public static String getServiceInterfacePackagePath() {
+    public static String getServiceIntfPackagePath() {
         String moduleName = getServiceModuleName();
-        String packageName = getServiceInterfacePackageName();
+        String packageName = getServiceIntfPackageName();
         return getPackagePath(moduleName, packageName);
     }
 
-    public static String getServiceInterfaceFilePath(String className) {
-        String servicePackagePath = getServicePackagePath();
-        String prefix = CONFIG.getString(JAVA_NAME_PREFIX_SERVICE_INTERFACE,
-            DEFAULT_JAVA_NAME_PREFIX_SERVICE_INTERFACE
+    public static String getServiceIntfFilePath(String className) {
+        String servicePackagePath = getServiceIntfPackagePath();
+        String prefix = CONFIG.getString(
+            JAVA_NAME_PREFIX_SERVICE_INTF,
+            DEFAULT_JAVA_NAME_PREFIX_SERVICE_INTF
         );
         String filename = getJavaFilename(className, "", prefix);
         return Paths.get(servicePackagePath, filename).toString();

src/test/resources/config/config.properties

@@ -1,41 +1,46 @@
 project.path.base=D:/workspace/otono-debug/
+package.name.base=space.caoshd.navigator
+database.name.schemas=otone
+database.name.tables=
+
 #project.path.java=src/main/java
 #project.path.resources=src/main/resources
-package.name.base=space.caoshd.navigator
 #package.name.entity=repository.entity
 #package.name.mapper=repository.mapper
-package.name.service=service.impl
-package.name.service.interface=service
+#package.name.service.impl=service.impl
+#package.name.service.intf=service
 #package.name.query=controller.query
-#package.name.form=controller.form
+#package.name.req=controller.req
 #package.name.res=controller.res
 #package.name.controller=controller
 #module.multiple=false
 #module.name.as_package_base=false
 #module.name.controller=controller
-#module.name.repository=data
-#module.name.service=cmpt
-#java.name.prefix.service=I
-#java.name.suffix.service=Service
+#module.name.repository=repository
+#module.name.service=service
+#java.name.prefix.service.intf=I
+#java.name.suffix.service.intf=Service
+#java.name.prefix.service.impl=
+#java.name.suffix.service.impl=ServiceImpl
 #java.name.suffix.controller=Controller
 #java.name.suffix.res=Res
-#java.name.suffix.form=Req
+#java.name.suffix.req=Req
 #java.name.suffix.query=Query
 #java.name.suffix.mapper=Mapper
 #java.name.suffix.entity=Entity
-#database.name.schemas=otone
-#database.name.tables=
-database.table.prefixes=t_,m_
-database.table.invalid_columns=delete_flag
-database.table.invalid_values=1
+#database.table.prefixes=t_,m_
+#database.table.invalid_columns=delete_flag
+#database.table.invalid_values=1
 #template.path.entity=template/entity.vm
 #template.path.res=template/res.vm
-#template.path.form=template/form.vm
+#template.path.req=template/req.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/entity.vm
+#template.path.service.impl=template/service.impl.vm
+#template.path.service.intf=template/service.intf.vm
 #template.path.mapper=template/mapper.vm
 #template.path.mapper.xml=template/mapper.xml.vm
-output.cover_if_exists=true
-output.mybatis.@mapper=true
+#output.cover_if_exists=true
+#output.mybatis.@mapper=true
+
+

src/test/resources/template/controller.vm

@@ -9,19 +9,23 @@
  * @version ${ext.version}#end
 #end
 #set(${ClassName}="${ext.ClassName}$!{ext.controllerNameSuffix}")
+#set(${EntityName}="${ext.ClassName}$!{ext.entityNameSuffix}")
 #set(${ReqName}="${ext.ClassName}$!{ext.reqNameSuffix}")
 #set(${ResName}="${ext.ClassName}$!{ext.resNameSuffix}")
-#set(${ServiceInterfaceName}="$!{ext.servieInterfaceNamePrefix}${ext.ClassName}$!{ext.serviceNameSuffix}")
-#set(${serviceName}="${ext.ClassName}$!{ext.serviceNameSuffix}")
+#set(${ServiceInterfaceName}="$!{ext.serviceIntfNamePrefix}${ext.ClassName}$!{ext.serviceIntfNameSuffix}")
+#set(${serviceName}="${ext.className}$!{ext.serviceIntfNameSuffix}")
 package ${ext.controllerPackageName};
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 import ${ext.reqPackageName}.${ReqName};
 import ${ext.resPackageName}.${ResName};
-import ${ext.serviceInterfacePackageName}.${ServiceInterfaceName};
+import ${ext.entityPackageName}.${EntityName};
+import ${ext.serviceIntfPackageName}.${ServiceInterfaceName};
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * $!{tbl.comment}控制器
@@ -36,83 +40,94 @@ public class ${ClassName} {
     /**
      * 新增/修改$!{tbl.comment}
      *
-     * @param bean 主键为空-新增实体、主键非空-更新条件
+     * @param req 主键为空-新增实体、主键非空-更新条件
      * @return 影响记录数
      */
-    Integer update(${ReqName} bean){
-        return null;
+    Integer updateInsert(${ReqName} req){
+        return ${serviceName}.updateInsert(req);
     }
 
     /**
      * 批量新增/修改$!{tbl.comment}
      *
-     * @param list 主键为空-新增实体、主键非空-更新条件
+     * @param reqs 主键为空-新增实体、主键非空-更新条件
      * @return 影响记录数
      */
-    Integer updateBatch(List<${ReqName}> list) {
-        return null;
+    Integer updateInsertBatch(List<${ReqName}> reqs) {
+        return ${serviceName}.updateInsertBatch(reqs);
     }
 
     /**
      * 物理删除$!{tbl.comment}
      *
-     * @param bean 删除条件
+     * @param req 删除条件
      * @return 影响记录数
      */
-    Integer delete(${ReqName} bean) {
-        return null;
+    Integer delete(${ReqName} req) {
+        return ${serviceName}.delete(req);
     }
 
 #if(${invalidColumnExists})
     /**
      * 逻辑删除$!{tbl.comment}
      *
-     * @param bean 删除条件
+     * @param req 删除条件
      * @return 影响记录数
      */
-    Integer invalid(${ReqName} bean) {
-        return null;
+    Integer invalid(${ReqName} req) {
+        return ${serviceName}.invalid(req);
     }
 
 #end
     /**
      * 查询单个$!{tbl.comment} 当结果存在多个时 随便拿一个
      *
-     * @param bean 查询条件
+     * @param req 查询条件
      * @return 单个
      */
-    ${ResName} anyOne(${ReqName} bean) {
-        return null;
+    ${ResName} anyOne(${ReqName} req) {
+        ${EntityName} entity = ${serviceName}.anyOne(req);
+        ${ResName} res = new ${ResName}();
+        BeanUtils.copyProperties(entity, res);
+        return res;
     }
 
     /**
      * 查询单个$!{tbl.comment} 明确知道结果必存在一个
      *
-     * @param bean 查询条件
+     * @param req 查询条件
      * @return 单个
      */
-    ${ResName} onlyOne(${ReqName} bean) {
-        return null;
+    ${ResName} onlyOne(${ReqName} req) {
+        ${EntityName} entity = ${serviceName}.onlyOne(req);
+        ${ResName} res = new ${ResName}();
+        BeanUtils.copyProperties(entity, res);
+        return res;
     }
 
     /**
      * 查询多个$!{tbl.comment}
      *
-     * @param bean 查询条件
+     * @param req 查询条件
      * @return 列表
      */
-    List<${ResName}> list(${ReqName} bean) {
-        return null;
+    List<${ResName}> list(${ReqName} req) {
+        List<${EntityName} > entities = ${serviceName}.list(req);
+        return entities.stream().map(entity -> {
+            ${ResName} res = new ${ResName}();
+            BeanUtils.copyProperties(entity, res);
+            return res;
+        }).collect(Collectors.toList());
     }
 
     /**
      * 统计符合条件的$!{tbl.comment}实体个数
      *
-     * @param bean 查询条件
+     * @param req 查询条件
      * @return 统计结果
      */
-    Long count(${ReqName} bean) {
-        return null;
+    Long count(${ReqName} req) {
+        return ${serviceName}.count(req);
     }
 
 #foreach($indexColumns in ${tbl.indexes})
@@ -120,6 +135,8 @@ public class ${ClassName} {
 #set(${methodName}="$methodNameWithSuffix.substring(0, $methodNameWithSuffix.length() - 3)")
 #set(${paramNamesWithSuffix}="#foreach($indexColumn in ${indexColumns})${indexColumn.javaType} ${indexColumn.fieldName}, #end")
 #set(${paramNames}="$paramNamesWithSuffix.substring(0, $paramNamesWithSuffix.length() - 2)")
+#set(${paramValuesWithSuffix}="#foreach($indexColumn in ${indexColumns})${indexColumn.fieldName}, #end")
+#set(${paramValues}="$paramValuesWithSuffix.substring(0, $paramValuesWithSuffix.length() - 2)")
 #set(${paramComments}="#foreach($indexColumn in ${indexColumns})
 
      * @param ${indexColumn.fieldName} ${indexColumn.comment}#end")
@@ -128,8 +145,11 @@ public class ${ClassName} {
      * ${paramComments}
      * @return 单个$!{tbl.comment}
      */
-    ${ResName} $methodName(${paramNames}){
-        return null;
+    ${ResName} ${methodName}(${paramNames}) {
+        ${EntityName} entity = ${serviceName}.${methodName}(${paramValues});
+        ${ResName} res = new ${ResName}();
+        BeanUtils.copyProperties(entity, res);
+        return res;
     }
 
 #end
@@ -138,6 +158,8 @@ public class ${ClassName} {
 #set(${methodName}="$methodNameWithSuffix.substring(0, $methodNameWithSuffix.length() - 3)")
 #set(${paramNamesWithSuffix}="#foreach($indexColumn in ${indexColumns})${indexColumn.javaType} ${indexColumn.fieldName}, #end")
 #set(${paramNames}="$paramNamesWithSuffix.substring(0, $paramNamesWithSuffix.length() - 2)")
+#set(${paramValuesWithSuffix}="#foreach($indexColumn in ${indexColumns})${indexColumn.fieldName}, #end")
+#set(${paramValues}="$paramValuesWithSuffix.substring(0, $paramValuesWithSuffix.length() - 2)")
 #set(${paramComments}="#foreach($indexColumn in ${indexColumns})
 
      * @param ${indexColumn.fieldName} ${indexColumn.comment}#end")
@@ -147,7 +169,7 @@ public class ${ClassName} {
      * @return 影响记录数
      */
     Integer $methodName(${paramNames}) {
-        return null;
+        return ${serviceName}.${methodName}(${paramValues});
     }
 
 #end
@@ -157,6 +179,8 @@ public class ${ClassName} {
 #set(${methodName}="$methodNameWithSuffix.substring(0, $methodNameWithSuffix.length() - 3)")
 #set(${paramNamesWithSuffix}="#foreach($indexColumn in ${indexColumns})@Param(""${indexColumn.fieldName}"") ${indexColumn.javaType} ${indexColumn.fieldName}, #end")
 #set(${paramNames}="$paramNamesWithSuffix.substring(0, $paramNamesWithSuffix.length() - 2)")
+#set(${paramValuesWithSuffix}="#foreach($indexColumn in ${indexColumns})${indexColumn.fieldName}, #end")
+#set(${paramValues}="$paramValuesWithSuffix.substring(0, $paramValuesWithSuffix.length() - 2)")
 #set(${paramComments}="#foreach($indexColumn in ${indexColumns})
 
      * @param ${indexColumn.fieldName} ${indexColumn.comment}#end")
@@ -166,7 +190,7 @@ public class ${ClassName} {
      * @return 影响记录数
      */
     Integer $methodName(${paramNames}){
-        return null;
+        return ${serviceName}.${methodName}(${paramValues});
     }
 
 #end

src/test/resources/template/service.impl.vm

@@ -8,14 +8,14 @@
 
  * @version ${ext.version}#end
 #end
-#set(${ClassName}="${ext.ClassName}$!{ext.serviceNameSuffix}")
-#set(${InterfaceName}="$!{ext.servieInterfaceNamePrefix}${ext.ClassName}$!{ext.serviceNameSuffix}")
+#set(${ClassName}="${ext.ClassName}$!{ext.serviceImplNameSuffix}")
+#set(${InterfaceName}="$!{ext.serviceIntfNamePrefix}${ext.ClassName}$!{ext.serviceIntfNameSuffix}")
 #set(${QueryName}="${ext.ClassName}$!{ext.queryNameSuffix}")
 #set(${ReqName}="${ext.ClassName}$!{ext.reqNameSuffix}")
 #set(${EntityName}="${ext.ClassName}$!{ext.entityNameSuffix}")
 #set(${MapperName}="${ext.ClassName}$!{ext.mapperNameSuffix}")
 #set(${mapperName}="${ext.className}$!{ext.mapperNameSuffix}")
-package ${ext.servicePackageName};
+package ${ext.serviceImplPackageName};
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +24,7 @@ import ${ext.reqPackageName}.${ReqName};
 import ${ext.entityPackageName}.${EntityName};
 import ${ext.mapperPackageName}.${MapperName};
 import ${ext.queryPackageName}.${QueryName};
-import ${ext.serviceInterfacePackageName}.$!{ext.servieInterfaceNamePrefix}${ext.ClassName}$!{ext.serviceNameSuffix};
+import ${ext.serviceIntfPackageName}.$!{ext.serviceIntfNamePrefix}${ext.ClassName}$!{ext.serviceIntfNameSuffix};
 
 import java.util.List;
 import java.util.stream.Collectors;

src/test/resources/template/service.intf.vm

@@ -8,11 +8,11 @@
 
  * @version ${ext.version}#end
 #end
-#set($InterfaceName="$!{ext.servieInterfaceNamePrefix}${ext.ClassName}$!{ext.serviceNameSuffix}")
+#set($InterfaceName="$!{ext.serviceIntfNamePrefix}${ext.ClassName}$!{ext.serviceIntfNameSuffix}")
 #set(${ReqName}="${ext.ClassName}$!{ext.ReqNameSuffix}")
 #set(${ReqName}="${ext.ClassName}$!{ext.reqNameSuffix}")
 #set(${EntityName}="${ext.ClassName}$!{ext.entityNameSuffix}")
-package ${ext.serviceInterfacePackageName};
+package ${ext.serviceIntfPackageName};
 
 import ${ext.reqPackageName}.${ReqName};
 import ${ext.entityPackageName}.${EntityName};
@@ -27,68 +27,68 @@ public interface $InterfaceName {
     /**
      * 新增/修改$!{tbl.comment}
      *
-     * @param query 主键为空-新增实体、主键非空-更新条件
+     * @param req 主键为空-新增实体、主键非空-更新条件
      * @return 影响记录数
      */
-    Integer updateInsert(${ReqName} query);
+    Integer updateInsert(${ReqName} req);
 
     /**
      * 批量新增/修改$!{tbl.comment}
      *
-     * @param queries 主键为空-新增实体、主键非空-更新条件
+     * @param reqs 主键为空-新增实体、主键非空-更新条件
      * @return 影响记录数
      */
-    Integer updateInsertBatch(List<${ReqName}> queries);
+    Integer updateInsertBatch(List<${ReqName}> reqs);
 
     /**
      * 物理删除$!{tbl.comment}
      *
-     * @param query 删除条件
+     * @param req 删除条件
      * @return 影响记录数
      */
-    Integer delete(${ReqName} query);
+    Integer delete(${ReqName} req);
 
 #if(${invalidColumnExists})
     /**
      * 逻辑删除$!{tbl.comment}
      *
-     * @param query 删除条件
+     * @param req 删除条件
      * @return 影响记录数
      */
-    Integer invalid(${ReqName} query);
+    Integer invalid(${ReqName} req);
 
 #end
     /**
      * 查询单个$!{tbl.comment} 当结果存在多个时 随便拿一个
      *
-     * @param query 查询条件
+     * @param req 查询条件
      * @return 单个
      */
-    ${EntityName} anyOne(${ReqName} query);
+    ${EntityName} anyOne(${ReqName} req);
 
     /**
      * 查询单个$!{tbl.comment} 明确知道结果必存在一个
      *
-     * @param query 查询条件
+     * @param req 查询条件
      * @return 单个
      */
-    ${EntityName} onlyOne(${ReqName} query);
+    ${EntityName} onlyOne(${ReqName} req);
 
     /**
      * 查询多个$!{tbl.comment}
      *
-     * @param query 查询条件
+     * @param req 查询条件
      * @return 列表
      */
-    List<${EntityName}> list(${ReqName} query);
+    List<${EntityName}> list(${ReqName} req);
 
     /**
      * 统计符合条件的$!{tbl.comment}实体个数
      *
-     * @param query 查询条件
+     * @param req 查询条件
      * @return 统计结果
      */
-    Long count(${ReqName} query);
+    Long count(${ReqName} req);
 
 #foreach($indexColumns in ${tbl.indexes})
 #set(${methodNameWithSuffix}="oneBy#foreach($indexColumn in ${indexColumns})${indexColumn.fieldNameCap}And#end")