代码生成器模板默认去掉manager层

src/main/java/net/chenlin/dp/modules/sys/generator/GenConstant.java

@@ -9,8 +9,6 @@ public class GenConstant {
     public static final String JAVA_ENTITY = "Entity.java.btl";
     public static final String JAVA_MAPPER = "Mapper.java.btl";
     public static final String XML_MAPPER = "Mapper.xml.btl";
-    public static final String JAVA_MANAGER = "Manager.java.btl";
-    public static final String JAVA_MANAGER_IMPL = "ManagerImpl.java.btl";
     public static final String JAVA_SERVICE = "Service.java.btl";
     public static final String JAVA_SERVICE_IMPL = "ServiceImpl.java.btl";
     public static final String JAVA_CONTROLLER = "Controller.java.btl";

src/main/java/net/chenlin/dp/modules/sys/generator/GenUtils.java

@@ -28,8 +28,6 @@ public class GenUtils {
 		templates.add("template/Entity.java.btl");
 		templates.add("template/Mapper.java.btl");
 		templates.add("template/Mapper.xml.btl");
-		templates.add("template/Manager.java.btl");
-		templates.add("template/ManagerImpl.java.btl");
 		templates.add("template/Service.java.btl");
 		templates.add("template/ServiceImpl.java.btl");
 		templates.add("template/Controller.java.btl");
@@ -172,14 +170,6 @@ public class GenUtils {
 			return packagePath + className + "Mapper.xml";
 		}
 
-		if (template.contains(GenConstant.JAVA_MANAGER)) {
-			return packagePath + className + "Manager.java";
-		}
-
-		if (template.contains(GenConstant.JAVA_MANAGER_IMPL)) {
-			return packagePath + className + "ManagerImpl.java";
-		}
-
 		if (template.contains(GenConstant.JAVA_SERVICE)) {
 			return packagePath + className + "Service.java";
 		}
@@ -245,14 +235,6 @@ public class GenUtils {
 			return packagePath + "dao" + File.separator + className + "Mapper.xml";
 		}
 
-		if (template.contains(GenConstant.JAVA_MANAGER)) {
-			return packagePath + "manager" + File.separator + className + "Manager.java";
-		}
-
-		if (template.contains(GenConstant.JAVA_MANAGER_IMPL)) {
-			return packagePath + "manager" + File.separator + "impl" + File.separator + className + "ManagerImpl.java";
-		}
-
 		if (template.contains(GenConstant.JAVA_SERVICE)) {
 			return packagePath + "service" + File.separator + className + "Service.java";
 		}

src/main/java/net/chenlin/dp/modules/sys/generator/JdbcGenUtils.java

@@ -145,14 +145,6 @@ public class JdbcGenUtils {
             return packagePath + "mapper/" + className + "Mapper.xml";
         }
 
-        if (template.contains(GenConstant.JAVA_MANAGER)) {
-            return packagePath + "manager/" + className + "Manager.java";
-        }
-
-        if (template.contains(GenConstant.JAVA_MANAGER_IMPL)) {
-            return packagePath + "manager/impl/" + className + "ManagerImpl.java";
-        }
-
         if (template.contains(GenConstant.JAVA_SERVICE)) {
             return packagePath + "service/" + className + "Service.java";
         }

src/main/resources/template/ServiceImpl.java.btl

@@ -10,7 +10,7 @@ import net.chenlin.dp.common.entity.Query;
 import net.chenlin.dp.common.entity.R;
 import net.chenlin.dp.common.utils.CommonUtils;
 import ${package}.modules.${module}.entity.${className}Entity;
-import ${package}.modules.${module}.manager.${className}Manager;
+import ${package}.modules.${module}.dao.${className}Mapper;
 import ${package}.modules.${module}.service.${className}Service;
 
 /**
@@ -21,7 +21,7 @@ import ${package}.modules.${module}.service.${className}Service;
 public class ${className}ServiceImpl implements ${className}Service {
 
 	@Autowired
-	private ${className}Manager ${objName}Manager;
+    private ${className}Mapper ${objName}Mapper;
 
     /**
      * 分页查询
@@ -32,7 +32,7 @@ public class ${className}ServiceImpl implements ${className}Service {
 	public Page<${className}Entity> list${className}(Map<String, Object> params) {
 		Query query = new Query(params);
 		Page<${className}Entity> page = new Page<>(query);
-		${objName}Manager.list${className}(page, query);
+		${objName}Mapper.listForPage(page, query);
 		return page;
 	}
 
@@ -43,7 +43,7 @@ public class ${className}ServiceImpl implements ${className}Service {
      */
 	@Override
 	public R save${className}(${className}Entity ${objName}) {
-		int count = ${objName}Manager.save${className}(${objName});
+		int count = ${objName}Mapper.save(${objName});
 		return CommonUtils.msg(count);
 	}
 
@@ -54,7 +54,7 @@ public class ${className}ServiceImpl implements ${className}Service {
      */
 	@Override
 	public R get${className}ById(Long id) {
-		${className}Entity ${objName} = ${objName}Manager.get${className}ById(id);
+		${className}Entity ${objName} = ${objName}Mapper.getObjectById(id);
 		return CommonUtils.msg(${objName});
 	}
 
@@ -65,7 +65,7 @@ public class ${className}ServiceImpl implements ${className}Service {
      */
 	@Override
 	public R update${className}(${className}Entity ${objName}) {
-		int count = ${objName}Manager.update${className}(${objName});
+		int count = ${objName}Mapper.update(${objName});
 		return CommonUtils.msg(count);
 	}
 
@@ -76,7 +76,7 @@ public class ${className}ServiceImpl implements ${className}Service {
      */
 	@Override
 	public R batchRemove(Long[] id) {
-		int count = ${objName}Manager.batchRemove(id);
+		int count = ${objName}Mapper.batchRemove(id);
 		return CommonUtils.msg(id, count);
 	}