diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index 48315dd8..9a9a8137 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -232,31 +232,32 @@ public class GenerateCode { String comment = jo.getStr("comment"); //主键 String key = jo.getStr("key"); + //主键类型 String key_type = jo.getStr("key_type"); //表名 String table = jo.getStr("table"); + //向 freemaker传递的数据结构体 Map dataModel = new HashMap<>(); - dataModel.put("comment", comment); - List params = new ArrayList<>(); + dataModel.put("comment", comment);//表描述 + List params = new ArrayList<>();//用于注释,显示@para 参数名 参数含义 //迭代 for (Map.Entry entry : fields.entrySet()) { if (!entry.getKey().equals("create_time")) { Record record = new Record(); - record.set("key", entry.getKey()); - record.set("comment", fieldsComment.get(entry.getKey())); + record.set("key", entry.getKey());//字段 + record.set("comment", fieldsComment.get(entry.getKey()));//描述 params.add(record); } } - dataModel.put("params", params); - dataModel.put("daoName", PropKit.get("daoName")); - dataModel.put("beanNameWithoutT", beanNameWithoutT); - dataModel.put("fullParameters", fullParameters); - dataModel.put("parameters", parameters); - dataModel.put("key", key); - dataModel.put("key_type", key_type); - dataModel.put("table", table); - dataModel.put("fields", fields.entrySet()); + dataModel.put("params", params);//用于注释,显示@para 参数名 参数含义 + dataModel.put("daoName", PropKit.get("daoName"));//显示dao的名称,比如ym + dataModel.put("beanNameWithoutT", beanNameWithoutT);//实体Bean的名称,用于构建方法名 + dataModel.put("fullParameters", fullParameters);//包括主键的参数列表,用于构建方法的参数 + dataModel.put("parameters", parameters);//不包括主键的参数列表,用于构建方法的参数 + dataModel.put("key", key);//主键名称 + dataModel.put("key_type", key_type);//主键类型 + dataModel.put("table", table);//表名 //调用FreeMarker模板引擎 Configuration cfg = new Configuration(new Version(2, 3, 33));// 创建一个 Configuration 实例 @@ -271,7 +272,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 + "/" + table + "_Controller.txt", StandardCharsets.UTF_8); template.process(dataModel, out); out.close(); System.out.println("生成Controller层代码完成。"); @@ -280,7 +281,7 @@ public class GenerateCode { // 加载模板 template = cfg.getTemplate("Model.ftl"); // 渲染模板到文件 - out = new FileWriter(codePath +"/"+ table + "_Model.txt", StandardCharsets.UTF_8); + out = new FileWriter(codePath + "/" + table + "_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 10d17c91..945202d9 100644 --- a/dsUtils/src/main/resources/Model.ftl +++ b/dsUtils/src/main/resources/Model.ftl @@ -5,7 +5,7 @@ */ public void add${beanNameWithoutT}(${fullParameters}){ Record record = new Record(); -<#list fields as entry> +<#list params as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> @@ -31,7 +31,7 @@ public void del${beanNameWithoutT}ById(${key_type} ${key}){ */ public void update${beanNameWithoutT}ById(${key_type} ${key} ,${fullParameters}){ -String sql="update ${table} set <#list fields as entry> +String sql="update ${table} set <#list params as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> diff --git a/dsUtils/target/classes/Model.ftl b/dsUtils/target/classes/Model.ftl index 10d17c91..945202d9 100644 --- a/dsUtils/target/classes/Model.ftl +++ b/dsUtils/target/classes/Model.ftl @@ -5,7 +5,7 @@ */ public void add${beanNameWithoutT}(${fullParameters}){ Record record = new Record(); -<#list fields as entry> +<#list params as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> @@ -31,7 +31,7 @@ public void del${beanNameWithoutT}ById(${key_type} ${key}){ */ public void update${beanNameWithoutT}ById(${key_type} ${key} ,${fullParameters}){ -String sql="update ${table} set <#list fields as entry> +String sql="update ${table} set <#list params as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else>