From 2bc974a87318ab28a4cb3eea0f880b505a67e236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 15 Oct 2024 08:30:43 +0800 Subject: [PATCH] 'commit' --- .../dsideal/Code/t_wx_fault_type_Model.txt | 44 ++++++++++--------- .../java/com/dsideal/Tools/GenerateCode.java | 28 ++++++------ dsUtils/src/main/resources/Controller.ftl | 26 +++++------ dsUtils/src/main/resources/Model.ftl | 12 ++--- dsUtils/target/classes/Controller.ftl | 26 +++++------ dsUtils/target/classes/Model.ftl | 12 ++--- 6 files changed, 77 insertions(+), 71 deletions(-) diff --git a/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt b/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt index edb47de0..00393d70 100644 --- a/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt +++ b/dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt @@ -3,25 +3,29 @@ */ public void addWxFaultType(String type_name ){ Record record = new Record(); - record.set("type_name", type_name); - Db.save("t_wx_fault_type","type_id",record); -} +FreeMarker template error (DEBUG mode; use RETHROW in production!): +The following has evaluated to null or missing: +==> params [in template "Model.ftl" at line 8, column 8] + +---- +Tip: If the failing expression is known to legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)?? +---- -/** -删除维修故障类型字典 -@para type_id 主键 -*/ -public void delWxFaultTypeById(int type_id){ - String sql="delete from t_wx_fault_type where type_id =?"; - Db.update(sql,type_id); -} - - -/**修改维修故障类型字典 - * @param type_name 类型名称 -*/ -public void updateWxFaultTypeById(int type_id ,String type_name ){ -String sql="update t_wx_fault_type set - record.set("type_name", type_name); - where type_id =?"; +---- +FTL stack trace ("~" means nesting-related): + - Failed at: #list params as entry [in template "Model.ftl" at line 8, column 1] +---- +Java stack trace (for programmers): +---- +freemarker.core.InvalidReferenceException: [... Exception message was already printed; see it above ...] + at freemarker.core.InvalidReferenceException.getInstance(InvalidReferenceException.java:134) + at freemarker.core.Expression.assertNonNull(Expression.java:249) + at freemarker.core.IteratorBlock.acceptWithResult(IteratorBlock.java:104) + at freemarker.core.IteratorBlock.accept(IteratorBlock.java:94) + at freemarker.core.Environment.visit(Environment.java:344) + at freemarker.core.Environment.visit(Environment.java:350) + at freemarker.core.Environment.process(Environment.java:323) + at freemarker.template.Template.process(Template.java:383) + at com.dsideal.Tools.GenerateCode.autoCodeFreeMaker(GenerateCode.java:287) + at com.dsideal.Tools.GenerateCode.main(GenerateCode.java:186) diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index 9a9a8137..6517a319 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -207,11 +207,11 @@ public class GenerateCode { Map fieldsComment = (Map) jo.get("fieldsComment"); String fullParameters = "";//带数据类型+字段名称 - String parameters = "";//不带数据类型，只有字段名称 + String daoFillParameters = "";//不带数据类型，只有字段名称 for (Map.Entry entry : fields.entrySet()) { if (!entry.getKey().equals("create_time") && !entry.getKey().equals("b_use")) { fullParameters += entry.getValue() + " " + entry.getKey() + " , ";//这里必须是反着来的，否则数据类型会重复 - parameters += entry.getKey() + " , "; + daoFillParameters += entry.getKey() + " , "; } } //移除最后一个逗号 @@ -219,14 +219,14 @@ public class GenerateCode { if (fullParameters.endsWith(",")) {//去掉最后的逗号 fullParameters = fullParameters.substring(0, fullParameters.length() - 1); } - parameters = parameters.substring(0, parameters.length() - 1); - if (parameters.endsWith(",")) { - parameters = parameters.substring(0, parameters.length() - 1); + daoFillParameters = daoFillParameters.substring(0, daoFillParameters.length() - 1); + if (daoFillParameters.endsWith(",")) { + daoFillParameters = daoFillParameters.substring(0, daoFillParameters.length() - 1); } //后缀名称 - String beanNameWithoutT = jo.getStr("beanNameWithoutT"); - if (beanNameWithoutT.startsWith("T")) { - beanNameWithoutT = beanNameWithoutT.substring(1); + String beanName = jo.getStr("beanNameWithoutT"); + if (beanName.startsWith("T")) { + beanName = beanName.substring(1); } //表的描述 String comment = jo.getStr("comment"); @@ -240,25 +240,27 @@ public class GenerateCode { //向 freemaker传递的数据结构体 Map dataModel = new HashMap<>(); dataModel.put("comment", comment);//表描述 - List params = new ArrayList<>();//用于注释，显示@para 参数名 参数含义 + List paramsList = 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()));//描述 - params.add(record); + paramsList.add(record); } } - dataModel.put("params", params);//用于注释，显示@para 参数名 参数含义 + dataModel.put("paramsList", paramsList);//用于注释，显示@para 参数名 参数含义 dataModel.put("daoName", PropKit.get("daoName"));//显示dao的名称，比如ym - dataModel.put("beanNameWithoutT", beanNameWithoutT);//实体Bean的名称，用于构建方法名 + dataModel.put("beanName", beanName);//实体Bean的名称，用于构建方法名 dataModel.put("fullParameters", fullParameters);//包括主键的参数列表，用于构建方法的参数 - dataModel.put("parameters", parameters);//不包括主键的参数列表，用于构建方法的参数 + dataModel.put("daoFillParameters", daoFillParameters);//不包括主键的参数列表，用于构建方法的参数 dataModel.put("key", key);//主键名称 dataModel.put("key_type", key_type);//主键类型 dataModel.put("table", table);//表名 + System.out.println(dataModel); + //调用FreeMarker模板引擎 Configuration cfg = new Configuration(new Version(2, 3, 33));// 创建一个 Configuration 实例 // 设置模板目录 diff --git a/dsUtils/src/main/resources/Controller.ftl b/dsUtils/src/main/resources/Controller.ftl index 7727884c..ef4c6dc4 100644 --- a/dsUtils/src/main/resources/Controller.ftl +++ b/dsUtils/src/main/resources/Controller.ftl @@ -1,40 +1,40 @@ /** * 增加${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ @Before({POST.class}) @JwtCheckInterface({}) -public void add${beanNameWithoutT}(${fullParameters}){ - ${daoName}.add${beanNameWithoutT}(${parameters}); +public void add${beanName}(${fullParameters}){ + ${daoName}.add${beanName}(${daoFillParameters}); renderJson(RetKit.renderSuccess()); } /** * 删除${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ @Before({POST.class}) @JwtCheckInterface({}) @IsNumericInterface({"${key}"}) -public void del${beanNameWithoutT}ById(${key_type} ${key}){ - ${daoName}.del${beanNameWithoutT}ById(${key}); +public void del${beanName}ById(${key_type} ${key}){ + ${daoName}.del${beanName}ById(${key}); renderJson(RetKit.renderSuccess()); } /**按ID修改${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ @Before({POST.class}) @JwtCheckInterface({}) @IsNumericInterface({${key}) -public void update${beanNameWithoutT}ById(${key_type} ${key} , ${fullParameters}){ - ${daoName}.update${beanNameWithoutT}ById(${key} , ${parameters}); +public void update${beanName}ById(${key_type} ${key} , ${fullParameters}){ + ${daoName}.update${beanName}ById(${key} , ${daoFillParameters}); renderJson(RetKit.renderSuccess()); } @@ -44,15 +44,15 @@ public void update${beanNameWithoutT}ById(${key_type} ${key} , ${fullParameters} @Before({GET.class}) @JwtCheckInterface({}) @IsNumericInterface("{${key}}") -public void get${beanNameWithoutT}ById(${key_type} ${key}){ - renderJson(RetKit.renderSuccess(${daoName}.get${beanNameWithoutT}ById(${key}))); +public void get${beanName}ById(${key_type} ${key}){ + renderJson(RetKit.renderSuccess(${daoName}.get${beanName}ById(${key}))); } /** 分页查询${comment} */ @Before({GET.class}) @JwtCheckInterface({}) -public void get${beanNameWithoutT}List(int pageNum, int pageSize){ - Page listPage = ${daoName}.get${beanNameWithoutT}List(pageNum, pageSize); +public void get${beanName}List(int pageNum, int pageSize){ + Page listPage = ${daoName}.get${beanName}List(pageNum, pageSize); renderJson(RetKit.renderSuccess(listPage)); } \ No newline at end of file diff --git a/dsUtils/src/main/resources/Model.ftl b/dsUtils/src/main/resources/Model.ftl index 945202d9..7ee36cd6 100644 --- a/dsUtils/src/main/resources/Model.ftl +++ b/dsUtils/src/main/resources/Model.ftl @@ -1,11 +1,11 @@ /**增加${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ -public void add${beanNameWithoutT}(${fullParameters}){ +public void add${beanName}(${fullParameters}){ Record record = new Record(); -<#list params as entry> +<#list paramsList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> @@ -19,18 +19,18 @@ public void add${beanNameWithoutT}(${fullParameters}){ 删除${comment} @para ${key} 主键 */ -public void del${beanNameWithoutT}ById(${key_type} ${key}){ +public void del${beanName}ById(${key_type} ${key}){ String sql="delete from ${table} where ${key} =?"; Db.update(sql,${key}); } /**修改${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ -public void update${beanNameWithoutT}ById(${key_type} ${key} ,${fullParameters}){ +public void update${beanName}ById(${key_type} ${key} ,${fullParameters}){ String sql="update ${table} set <#list params as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); diff --git a/dsUtils/target/classes/Controller.ftl b/dsUtils/target/classes/Controller.ftl index 7727884c..ef4c6dc4 100644 --- a/dsUtils/target/classes/Controller.ftl +++ b/dsUtils/target/classes/Controller.ftl @@ -1,40 +1,40 @@ /** * 增加${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ @Before({POST.class}) @JwtCheckInterface({}) -public void add${beanNameWithoutT}(${fullParameters}){ - ${daoName}.add${beanNameWithoutT}(${parameters}); +public void add${beanName}(${fullParameters}){ + ${daoName}.add${beanName}(${daoFillParameters}); renderJson(RetKit.renderSuccess()); } /** * 删除${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ @Before({POST.class}) @JwtCheckInterface({}) @IsNumericInterface({"${key}"}) -public void del${beanNameWithoutT}ById(${key_type} ${key}){ - ${daoName}.del${beanNameWithoutT}ById(${key}); +public void del${beanName}ById(${key_type} ${key}){ + ${daoName}.del${beanName}ById(${key}); renderJson(RetKit.renderSuccess()); } /**按ID修改${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ @Before({POST.class}) @JwtCheckInterface({}) @IsNumericInterface({${key}) -public void update${beanNameWithoutT}ById(${key_type} ${key} , ${fullParameters}){ - ${daoName}.update${beanNameWithoutT}ById(${key} , ${parameters}); +public void update${beanName}ById(${key_type} ${key} , ${fullParameters}){ + ${daoName}.update${beanName}ById(${key} , ${daoFillParameters}); renderJson(RetKit.renderSuccess()); } @@ -44,15 +44,15 @@ public void update${beanNameWithoutT}ById(${key_type} ${key} , ${fullParameters} @Before({GET.class}) @JwtCheckInterface({}) @IsNumericInterface("{${key}}") -public void get${beanNameWithoutT}ById(${key_type} ${key}){ - renderJson(RetKit.renderSuccess(${daoName}.get${beanNameWithoutT}ById(${key}))); +public void get${beanName}ById(${key_type} ${key}){ + renderJson(RetKit.renderSuccess(${daoName}.get${beanName}ById(${key}))); } /** 分页查询${comment} */ @Before({GET.class}) @JwtCheckInterface({}) -public void get${beanNameWithoutT}List(int pageNum, int pageSize){ - Page listPage = ${daoName}.get${beanNameWithoutT}List(pageNum, pageSize); +public void get${beanName}List(int pageNum, int pageSize){ + Page listPage = ${daoName}.get${beanName}List(pageNum, pageSize); renderJson(RetKit.renderSuccess(listPage)); } \ No newline at end of file diff --git a/dsUtils/target/classes/Model.ftl b/dsUtils/target/classes/Model.ftl index 945202d9..7ee36cd6 100644 --- a/dsUtils/target/classes/Model.ftl +++ b/dsUtils/target/classes/Model.ftl @@ -1,11 +1,11 @@ /**增加${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ -public void add${beanNameWithoutT}(${fullParameters}){ +public void add${beanName}(${fullParameters}){ Record record = new Record(); -<#list params as entry> +<#list paramsList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now()); <#else> @@ -19,18 +19,18 @@ public void add${beanNameWithoutT}(${fullParameters}){ 删除${comment} @para ${key} 主键 */ -public void del${beanNameWithoutT}ById(${key_type} ${key}){ +public void del${beanName}ById(${key_type} ${key}){ String sql="delete from ${table} where ${key} =?"; Db.update(sql,${key}); } /**修改${comment} -<#list params as param> +<#list paramsList as param> * @param ${param.key} ${param.comment} */ -public void update${beanNameWithoutT}ById(${key_type} ${key} ,${fullParameters}){ +public void update${beanName}ById(${key_type} ${key} ,${fullParameters}){ String sql="update ${table} set <#list params as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now());