Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/test/java/CodeGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ public static void genService(String tableName, String modelName) {
data.put("modelNameUpperCamel", modelNameUpperCamel);
data.put("modelNameLowerCamel", tableNameConvertLowerCamel(tableName));
data.put("basePackage", BASE_PACKAGE);
data.put("modelPackage", MODEL_PACKAGE);
data.put("mapperPackage", MAPPER_PACKAGE);

File file = new File(PROJECT_PATH + JAVA_PATH + PACKAGE_PATH_SERVICE + modelNameUpperCamel + "Service.java");
if (!file.getParentFile().exists()) {
Expand Down Expand Up @@ -175,6 +177,7 @@ public static void genController(String tableName, String modelName) {
data.put("modelNameUpperCamel", modelNameUpperCamel);
data.put("modelNameLowerCamel", CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, modelNameUpperCamel));
data.put("basePackage", BASE_PACKAGE);
data.put("modelPackage", MODEL_PACKAGE);

File file = new File(PROJECT_PATH + JAVA_PATH + PACKAGE_PATH_CONTROLLER + modelNameUpperCamel + "Controller.java");
if (!file.getParentFile().exists()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ${basePackage}.web;

import ${basePackage}.core.Result;
import ${basePackage}.core.ResultGenerator;
import ${basePackage}.model.${modelNameUpperCamel};
import ${modelPackage}.${modelNameUpperCamel};
import ${basePackage}.service.${modelNameUpperCamel}Service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/generator/template/controller.ftl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ${basePackage}.web;
import ${basePackage}.core.Result;
import ${basePackage}.core.ResultGenerator;
import ${basePackage}.model.${modelNameUpperCamel};
import ${modelPackage}.${modelNameUpperCamel};
import ${basePackage}.service.${modelNameUpperCamel}Service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/generator/template/service-impl.ftl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ${basePackage}.service.impl;

import ${basePackage}.dao.${modelNameUpperCamel}Mapper;
import ${basePackage}.model.${modelNameUpperCamel};
import ${mapperPackage}.${modelNameUpperCamel}Mapper;
import ${modelPackage}.${modelNameUpperCamel};
import ${basePackage}.service.${modelNameUpperCamel}Service;
import ${basePackage}.core.AbstractService;
import org.springframework.stereotype.Service;
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/generator/template/service.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package ${basePackage}.service;
import ${basePackage}.model.${modelNameUpperCamel};
import ${modelPackage}.${modelNameUpperCamel};
import ${basePackage}.core.Service;


Expand Down