diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java index e41e40b1..5ad8c3e2 100644 --- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java +++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java @@ -206,18 +206,18 @@ public class GenerateCode { Map fields = (Map) jo.get("fields"); Map fieldsComment = (Map) jo.get("fieldsComment"); - String fullParameters = "";//带数据类型+字段名称 + String parasWithoutPrimaryKey = "";//带数据类型+字段名称 String daoFillParameters = "";//不带数据类型,只有字段名称 for (Map.Entry entry : fields.entrySet()) { if (!entry.getKey().equals("create_time") && !entry.getKey().equals("b_use")) { - fullParameters += entry.getValue() + " " + entry.getKey() + " , ";//这里必须是反着来的,否则数据类型会重复 + parasWithoutPrimaryKey += entry.getValue() + " " + entry.getKey() + " , ";//这里必须是反着来的,否则数据类型会重复 daoFillParameters += entry.getKey() + " , "; } } //移除最后一个逗号 - fullParameters = fullParameters.substring(0, fullParameters.length() - 1); - if (fullParameters.endsWith(",")) {//去掉最后的逗号 - fullParameters = fullParameters.substring(0, fullParameters.length() - 1); + parasWithoutPrimaryKey = parasWithoutPrimaryKey.substring(0, parasWithoutPrimaryKey.length() - 1); + if (parasWithoutPrimaryKey.endsWith(",")) {//去掉最后的逗号 + parasWithoutPrimaryKey = parasWithoutPrimaryKey.substring(0, parasWithoutPrimaryKey.length() - 1); } daoFillParameters = daoFillParameters.substring(0, daoFillParameters.length() - 1); if (daoFillParameters.endsWith(",")) { @@ -253,7 +253,7 @@ public class GenerateCode { dataModel.put("paraList", paraList);//用于注释,显示@para 参数名 参数含义 dataModel.put("daoName", PropKit.get("daoName"));//显示dao的名称,比如ym dataModel.put("beanName", beanName);//实体Bean的名称,用于构建方法名 - dataModel.put("fullParameters", fullParameters);//包括主键的参数列表,用于构建方法的参数 + dataModel.put("parasWithoutPrimaryKey", parasWithoutPrimaryKey);//包括主键的参数列表,用于构建方法的参数 dataModel.put("daoFillParameters", daoFillParameters);//不包括主键的参数列表,用于构建方法的参数 dataModel.put("key", key);//主键名称 dataModel.put("key_type", key_type);//主键类型 diff --git a/dsUtils/src/main/resources/Controller.ftl b/dsUtils/src/main/resources/Controller.ftl index 4cd07c06..134b4985 100644 --- a/dsUtils/src/main/resources/Controller.ftl +++ b/dsUtils/src/main/resources/Controller.ftl @@ -6,7 +6,7 @@ */ @Before({POST.class}) @JwtCheckInterface({}) -public void add${beanName}(${fullParameters}){ +public void add${beanName}(${parasWithoutPrimaryKey}){ ${daoName}.add${beanName}(${daoFillParameters}); renderJson(RetKit.renderSuccess()); } @@ -33,7 +33,7 @@ public void del${beanName}ById(${key_type} ${key}){ @Before({POST.class}) @JwtCheckInterface({}) @IsNumericInterface({${key}) -public void update${beanName}ById(${key_type} ${key} , ${fullParameters}){ +public void update${beanName}ById(${key_type} ${key} , ${parasWithoutPrimaryKey}){ ${daoName}.update${beanName}ById(${key} , ${daoFillParameters}); renderJson(RetKit.renderSuccess()); } diff --git a/dsUtils/src/main/resources/Model.ftl b/dsUtils/src/main/resources/Model.ftl index c2d54422..b968a0fe 100644 --- a/dsUtils/src/main/resources/Model.ftl +++ b/dsUtils/src/main/resources/Model.ftl @@ -3,7 +3,7 @@ * @param ${param.key} ${param.comment} */ -public void add${beanName}(${fullParameters}){ +public void add${beanName}(${parasWithoutPrimaryKey}){ Record record = new Record(); <#list paraList as entry> <#if entry.key == "create_time"> @@ -30,7 +30,7 @@ public void del${beanName}ById(${key_type} ${key}){ * @param ${param.key} ${param.comment} */ -public void update${beanName}ById(${key_type} ${key} ,${fullParameters}){ +public void update${beanName}ById(${key_type} ${key} ,${parasWithoutPrimaryKey}){ String sql="update ${table} set <#list paraList 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 4cd07c06..134b4985 100644 --- a/dsUtils/target/classes/Controller.ftl +++ b/dsUtils/target/classes/Controller.ftl @@ -6,7 +6,7 @@ */ @Before({POST.class}) @JwtCheckInterface({}) -public void add${beanName}(${fullParameters}){ +public void add${beanName}(${parasWithoutPrimaryKey}){ ${daoName}.add${beanName}(${daoFillParameters}); renderJson(RetKit.renderSuccess()); } @@ -33,7 +33,7 @@ public void del${beanName}ById(${key_type} ${key}){ @Before({POST.class}) @JwtCheckInterface({}) @IsNumericInterface({${key}) -public void update${beanName}ById(${key_type} ${key} , ${fullParameters}){ +public void update${beanName}ById(${key_type} ${key} , ${parasWithoutPrimaryKey}){ ${daoName}.update${beanName}ById(${key} , ${daoFillParameters}); renderJson(RetKit.renderSuccess()); } diff --git a/dsUtils/target/classes/Model.ftl b/dsUtils/target/classes/Model.ftl index c2d54422..b968a0fe 100644 --- a/dsUtils/target/classes/Model.ftl +++ b/dsUtils/target/classes/Model.ftl @@ -3,7 +3,7 @@ * @param ${param.key} ${param.comment} */ -public void add${beanName}(${fullParameters}){ +public void add${beanName}(${parasWithoutPrimaryKey}){ Record record = new Record(); <#list paraList as entry> <#if entry.key == "create_time"> @@ -30,7 +30,7 @@ public void del${beanName}ById(${key_type} ${key}){ * @param ${param.key} ${param.comment} */ -public void update${beanName}ById(${key_type} ${key} ,${fullParameters}){ +public void update${beanName}ById(${key_type} ${key} ,${parasWithoutPrimaryKey}){ String sql="update ${table} set <#list paraList as entry> <#if entry.key == "create_time"> record.set("create_time", DateTime.now());