diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index 6517a319..e41e40b1 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -240,17 +240,17 @@ public class GenerateCode { //向 freemaker传递的数据结构体 Map dataModel = new HashMap<>(); dataModel.put("comment", comment);//表描述 - List paramsList = new ArrayList<>();//用于注释,显示@para 参数名 参数含义 + List paraList = 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()));//描述 - paramsList.add(record); + paraList.add(record); } } - dataModel.put("paramsList", paramsList);//用于注释,显示@para 参数名 参数含义 + dataModel.put("paraList", paraList);//用于注释,显示@para 参数名 参数含义 dataModel.put("daoName", PropKit.get("daoName"));//显示dao的名称,比如ym dataModel.put("beanName", beanName);//实体Bean的名称,用于构建方法名 dataModel.put("fullParameters", fullParameters);//包括主键的参数列表,用于构建方法的参数 diff --git a/dsUtils/src/main/resources/Controller.ftl b/dsUtils/src/main/resources/Controller.ftl index ef4c6dc4..4cd07c06 100644 --- a/dsUtils/src/main/resources/Controller.ftl +++ b/dsUtils/src/main/resources/Controller.ftl @@ -1,6 +1,6 @@ /** * 增加${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ @@ -13,7 +13,7 @@ public void add${beanName}(${fullParameters}){ /** * 删除${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ @@ -26,7 +26,7 @@ public void del${beanName}ById(${key_type} ${key}){ } /**按ID修改${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ diff --git a/dsUtils/src/main/resources/Model.ftl b/dsUtils/src/main/resources/Model.ftl index 9e52f4e9..c2d54422 100644 --- a/dsUtils/src/main/resources/Model.ftl +++ b/dsUtils/src/main/resources/Model.ftl @@ -1,11 +1,11 @@ /**增加${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ public void add${beanName}(${fullParameters}){ Record record = new Record(); -<#list paramsList as entry> +<#list paraList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> @@ -26,12 +26,12 @@ public void del${beanName}ById(${key_type} ${key}){ /**修改${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ public void update${beanName}ById(${key_type} ${key} ,${fullParameters}){ -String sql="update ${table} set <#list paramsList as entry> +String sql="update ${table} set <#list paraList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> diff --git a/dsUtils/target/classes/Controller.ftl b/dsUtils/target/classes/Controller.ftl index ef4c6dc4..4cd07c06 100644 --- a/dsUtils/target/classes/Controller.ftl +++ b/dsUtils/target/classes/Controller.ftl @@ -1,6 +1,6 @@ /** * 增加${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ @@ -13,7 +13,7 @@ public void add${beanName}(${fullParameters}){ /** * 删除${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ @@ -26,7 +26,7 @@ public void del${beanName}ById(${key_type} ${key}){ } /**按ID修改${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ diff --git a/dsUtils/target/classes/Model.ftl b/dsUtils/target/classes/Model.ftl index 9e52f4e9..c2d54422 100644 --- a/dsUtils/target/classes/Model.ftl +++ b/dsUtils/target/classes/Model.ftl @@ -1,11 +1,11 @@ /**增加${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ public void add${beanName}(${fullParameters}){ Record record = new Record(); -<#list paramsList as entry> +<#list paraList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> @@ -26,12 +26,12 @@ public void del${beanName}ById(${key_type} ${key}){ /**修改${comment} -<#list paramsList as param> +<#list paraList as param> * @param ${param.key} ${param.comment} */ public void update${beanName}ById(${key_type} ${key} ,${fullParameters}){ -String sql="update ${table} set <#list paramsList as entry> +String sql="update ${table} set <#list paraList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else>