diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index 45b18c3b..1bfd68a6 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -235,7 +235,7 @@ public class GenerateCode { //主键类型 String primary_key_type = jo.getStr("key_type"); //表名 - String table = jo.getStr("table"); + String tableName = jo.getStr("table"); //向 freemaker传递的数据结构体 Map dataModel = new HashMap<>(); @@ -257,7 +257,7 @@ public class GenerateCode { dataModel.put("parasWithoutPrimaryKeyAndDataType", parasWithoutPrimaryKeyAndDataType);//不包括数据类型的parasWithoutPrimaryKey dataModel.put("primary_key", primary_key);//主键名称 dataModel.put("primary_key_type", primary_key_type);//主键类型 - dataModel.put("table", table);//表名 + dataModel.put("tableName", tableName);//表名 System.out.println(dataModel); @@ -274,7 +274,7 @@ public class GenerateCode { // 加载模板 Template template = cfg.getTemplate("Controller.ftl"); // 渲染模板到文件 - Writer out = new FileWriter(codePath + "/" + table + "_Controller.txt", StandardCharsets.UTF_8); + Writer out = new FileWriter(codePath + "/" + tableName + "_Controller.txt", StandardCharsets.UTF_8); template.process(dataModel, out); out.close(); System.out.println("生成Controller层代码完成。"); @@ -283,7 +283,7 @@ public class GenerateCode { // 加载模板 template = cfg.getTemplate("Model.ftl"); // 渲染模板到文件 - out = new FileWriter(codePath + "/" + table + "_Model.txt", StandardCharsets.UTF_8); + out = new FileWriter(codePath + "/" + tableName + "_Model.txt", StandardCharsets.UTF_8); template.process(dataModel, out); out.close(); System.out.println("生成Model层代码完成。"); diff --git a/dsUtils/src/main/resources/Model.ftl b/dsUtils/src/main/resources/Model.ftl index 1cf657c4..5ae32a01 100644 --- a/dsUtils/src/main/resources/Model.ftl +++ b/dsUtils/src/main/resources/Model.ftl @@ -12,7 +12,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){ record.set("${entry.key}", ${entry.key}); - Db.save("${table}","${primary_key}",record); + Db.save("${tableName}","${primary_key}",record); } /** @@ -20,7 +20,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){ @para ${primary_key} 主键 */ public void del${beanName}ById(${primary_key_type} ${primary_key}){ - String sql="delete from ${table} where ${primary_key} =?"; + String sql="delete from ${tableName} where ${primary_key} =?"; Db.update(sql,${primary_key}); } @@ -31,7 +31,7 @@ public void del${beanName}ById(${primary_key_type} ${primary_key}){ */ public void update${beanName}ById(${primary_key_type} ${primary_key} ,${parasWithoutPrimaryKey}){ -String sql="update ${table} set <#list paraList as entry> +String sql="update ${tableName} set <#list paraList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> @@ -62,7 +62,7 @@ String sql="update ${table} set <#list paraList as entry> <#--sb.append("\n");--> <#--sb.append(" //单条查询" + comment + "\n");--> <#--sb.append(" public Record get" + ${beanNameWithoutT} + "ById(" + key_type + " " + key + "){\n");--> -<#--sb.append(" String sql=\"select * from " + table + " where " + key + "=?\";\n");--> +<#--sb.append(" String sql=\"select * from " + tableName + " where " + key + "=?\";\n");--> <#--sb.append(" return Db.findFirst(sql," + key + ");\n");--> <#--sb.append(" }\n");--> <#--sb.append("\n");--> @@ -71,7 +71,7 @@ String sql="update ${table} set <#list paraList as entry> <#--sb.append(" //分页查询" + comment + "\n");--> <#--sb.append(" public Page get" + ${beanNameWithoutT} + "List(int pageNum, int pageSize){\n");--> <#-- sb.append(" String sql1=\"select * \";\n");--> -<#-- sb.append(" String sql2=\" from " + table + " \";\n");--> +<#-- sb.append(" String sql2=\" from " + tableName + " \";\n");--> <#-- sb.append(" return Db.paginate(pageNum, pageSize, sql1,sql2);\n");--> <#-- sb.append(" }\n");--> <#-- sb.append("\n");--> diff --git a/dsUtils/target/classes/Model.ftl b/dsUtils/target/classes/Model.ftl index 1cf657c4..5ae32a01 100644 --- a/dsUtils/target/classes/Model.ftl +++ b/dsUtils/target/classes/Model.ftl @@ -12,7 +12,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){ record.set("${entry.key}", ${entry.key}); - Db.save("${table}","${primary_key}",record); + Db.save("${tableName}","${primary_key}",record); } /** @@ -20,7 +20,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){ @para ${primary_key} 主键 */ public void del${beanName}ById(${primary_key_type} ${primary_key}){ - String sql="delete from ${table} where ${primary_key} =?"; + String sql="delete from ${tableName} where ${primary_key} =?"; Db.update(sql,${primary_key}); } @@ -31,7 +31,7 @@ public void del${beanName}ById(${primary_key_type} ${primary_key}){ */ public void update${beanName}ById(${primary_key_type} ${primary_key} ,${parasWithoutPrimaryKey}){ -String sql="update ${table} set <#list paraList as entry> +String sql="update ${tableName} set <#list paraList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> @@ -62,7 +62,7 @@ String sql="update ${table} set <#list paraList as entry> <#--sb.append("\n");--> <#--sb.append(" //单条查询" + comment + "\n");--> <#--sb.append(" public Record get" + ${beanNameWithoutT} + "ById(" + key_type + " " + key + "){\n");--> -<#--sb.append(" String sql=\"select * from " + table + " where " + key + "=?\";\n");--> +<#--sb.append(" String sql=\"select * from " + tableName + " where " + key + "=?\";\n");--> <#--sb.append(" return Db.findFirst(sql," + key + ");\n");--> <#--sb.append(" }\n");--> <#--sb.append("\n");--> @@ -71,7 +71,7 @@ String sql="update ${table} set <#list paraList as entry> <#--sb.append(" //分页查询" + comment + "\n");--> <#--sb.append(" public Page get" + ${beanNameWithoutT} + "List(int pageNum, int pageSize){\n");--> <#-- sb.append(" String sql1=\"select * \";\n");--> -<#-- sb.append(" String sql2=\" from " + table + " \";\n");--> +<#-- sb.append(" String sql2=\" from " + tableName + " \";\n");--> <#-- sb.append(" return Db.paginate(pageNum, pageSize, sql1,sql2);\n");--> <#-- sb.append(" }\n");--> <#-- sb.append("\n");-->