This commit is contained in:
zhuangqian 2016-11-04 16:01:03 +08:00
parent 2834bf3947
commit 4b822473bf

View File

@ -76,7 +76,7 @@ public class GenerateController extends CurdController<Generate> {
} }
@ResponseBody @ResponseBody
@RequestMapping("/sql/{slave}/{table}") @RequestMapping("/sql/{slave}/{table:.+}")
public String createBuiltInSqlSlave(@PathVariable String slave, @PathVariable String table) { public String createBuiltInSqlSlave(@PathVariable String slave, @PathVariable String table) {
try { try {
LogKit.println("\n\n-------------------------------- gen by beetlsql {} --------------------------------\n", DateKit.getTime()); LogKit.println("\n\n-------------------------------- gen by beetlsql {} --------------------------------\n", DateKit.getTime());
@ -164,32 +164,32 @@ public class GenerateController extends CurdController<Generate> {
String editTemplatePath = baseTemplatePath + "_view" + File.separator + "_edit.bld"; String editTemplatePath = baseTemplatePath + "_view" + File.separator + "_edit.bld";
String viewTemplatePath = baseTemplatePath + "_view" + File.separator + "_view.bld"; String viewTemplatePath = baseTemplatePath + "_view" + File.separator + "_view.bld";
Paras rd = Paras.create(); Paras ps = Paras.create();
rd.set("realPath", realPath); ps.set("realPath", realPath);
rd.set("packageName", packageName); ps.set("packageName", packageName);
rd.set("modelName", upperModelName); ps.set("modelName", upperModelName);
rd.set("lowerModelName", lowerModelName); ps.set("lowerModelName", lowerModelName);
rd.set("tableName", tableName); ps.set("tableName", tableName);
rd.set("pkName", pkName); ps.set("pkName", pkName);
//java //java
BeetlMaker.makeHtml(controllerTemplatePath, rd, controllerPath); BeetlMaker.makeHtml(controllerTemplatePath, ps, controllerPath);
BeetlMaker.makeHtml(modelTemplatePath, rd, modelPath); BeetlMaker.makeHtml(modelTemplatePath, ps, modelPath);
BeetlMaker.makeHtml(serviceTemplatePath, rd, servicePath); BeetlMaker.makeHtml(serviceTemplatePath, ps, servicePath);
BeetlMaker.makeHtml(serviceimplTemplatePath, rd, serviceimplPath); BeetlMaker.makeHtml(serviceimplTemplatePath, ps, serviceimplPath);
//resources //resources
BeetlMaker.makeHtml(sqlTemplatePath, rd, sqlPath); BeetlMaker.makeHtml(sqlTemplatePath, ps, sqlPath);
//webapp //webapp
final TableDesc tableDesc = Blade.dao().getMetaDataManager().getTable(tableName); final TableDesc tableDesc = Blade.dao().getMetaDataManager().getTable(tableName);
Set<String> cols = tableDesc.getIdNames(); Set<String> cols = tableDesc.getIdNames();
rd.set("cols", cols); ps.set("cols", cols);
BeetlMaker.makeHtml(indexTemplatePath, rd, indexPath); BeetlMaker.makeHtml(indexTemplatePath, ps, indexPath);
BeetlMaker.makeHtml(addTemplatePath, rd, addPath); BeetlMaker.makeHtml(addTemplatePath, ps, addPath);
BeetlMaker.makeHtml(editTemplatePath, rd, editPath); BeetlMaker.makeHtml(editTemplatePath, ps, editPath);
BeetlMaker.makeHtml(viewTemplatePath, rd, viewPath); BeetlMaker.makeHtml(viewTemplatePath, ps, viewPath);
} }