From e7a3c6b82e8a4ee85bb405ab3a90c44b96b53024 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:38:11 +0800
Subject: [PATCH] 'commit'

---
 dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java | 4 ++--
 dsUtils/src/main/resources/Controller.ftl                 | 6 +++---
 dsUtils/src/main/resources/Model.ftl                      | 4 ++--
 dsUtils/target/classes/Controller.ftl                     | 6 +++---
 dsUtils/target/classes/Model.ftl                          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
index 8e73349d..45b18c3b 100644
--- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
+++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
@@ -233,7 +233,7 @@ public class GenerateCode {
         //主键
         String primary_key = jo.getStr("key");
         //主键类型
-        String key_type = jo.getStr("key_type");
+        String primary_key_type = jo.getStr("key_type");
         //表名
         String table = jo.getStr("table");
 
@@ -256,7 +256,7 @@ public class GenerateCode {
         dataModel.put("parasWithoutPrimaryKey", parasWithoutPrimaryKey);//不包括主键的参数列表，用于构建方法的参数
         dataModel.put("parasWithoutPrimaryKeyAndDataType", parasWithoutPrimaryKeyAndDataType);//不包括数据类型的parasWithoutPrimaryKey
         dataModel.put("primary_key", primary_key);//主键名称
-        dataModel.put("key_type", key_type);//主键类型
+        dataModel.put("primary_key_type", primary_key_type);//主键类型
         dataModel.put("table", table);//表名
 
         System.out.println(dataModel);
diff --git a/dsUtils/src/main/resources/Controller.ftl b/dsUtils/src/main/resources/Controller.ftl
index c478d1f4..3693b516 100644
--- a/dsUtils/src/main/resources/Controller.ftl
+++ b/dsUtils/src/main/resources/Controller.ftl
@@ -20,7 +20,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
 @Before({POST.class})
 @JwtCheckInterface({})
 @IsNumericInterface({"${primary_key}"})
-public void del${beanName}ById(${key_type} ${primary_key}){
+public void del${beanName}ById(${primary_key_type} ${primary_key}){
   ${daoName}.del${beanName}ById(${primary_key});
   renderJson(RetKit.renderSuccess());
 }
@@ -33,7 +33,7 @@ public void del${beanName}ById(${key_type} ${primary_key}){
 @Before({POST.class})
 @JwtCheckInterface({})
 @IsNumericInterface({${primary_key})
-public void update${beanName}ById(${key_type} ${primary_key} , ${parasWithoutPrimaryKey}){
+public void update${beanName}ById(${primary_key_type} ${primary_key} , ${parasWithoutPrimaryKey}){
   ${daoName}.update${beanName}ById(${primary_key} ,  ${parasWithoutPrimaryKeyAndDataType});
   renderJson(RetKit.renderSuccess());
 }
@@ -44,7 +44,7 @@ public void update${beanName}ById(${key_type} ${primary_key} , ${parasWithoutPri
 @Before({GET.class})
 @JwtCheckInterface({})
 @IsNumericInterface("{${primary_key}}")
-public void get${beanName}ById(${key_type}  ${primary_key}){
+public void get${beanName}ById(${primary_key_type}  ${primary_key}){
   renderJson(RetKit.renderSuccess(${daoName}.get${beanName}ById(${primary_key})));
 }
 
diff --git a/dsUtils/src/main/resources/Model.ftl b/dsUtils/src/main/resources/Model.ftl
index 842cd25f..1cf657c4 100644
--- a/dsUtils/src/main/resources/Model.ftl
+++ b/dsUtils/src/main/resources/Model.ftl
@@ -19,7 +19,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
 删除${comment}
 @para ${primary_key} 主键
 */
-public void del${beanName}ById(${key_type}  ${primary_key}){
+public void del${beanName}ById(${primary_key_type}  ${primary_key}){
   String sql="delete from ${table} where ${primary_key} =?";
   Db.update(sql,${primary_key});
 }
@@ -30,7 +30,7 @@ public void del${beanName}ById(${key_type}  ${primary_key}){
     * @param  ${param.key}  ${param.comment}
 </#list>
 */
-public void update${beanName}ById(${key_type}  ${primary_key} ,${parasWithoutPrimaryKey}){
+public void update${beanName}ById(${primary_key_type}  ${primary_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 c478d1f4..3693b516 100644
--- a/dsUtils/target/classes/Controller.ftl
+++ b/dsUtils/target/classes/Controller.ftl
@@ -20,7 +20,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
 @Before({POST.class})
 @JwtCheckInterface({})
 @IsNumericInterface({"${primary_key}"})
-public void del${beanName}ById(${key_type} ${primary_key}){
+public void del${beanName}ById(${primary_key_type} ${primary_key}){
   ${daoName}.del${beanName}ById(${primary_key});
   renderJson(RetKit.renderSuccess());
 }
@@ -33,7 +33,7 @@ public void del${beanName}ById(${key_type} ${primary_key}){
 @Before({POST.class})
 @JwtCheckInterface({})
 @IsNumericInterface({${primary_key})
-public void update${beanName}ById(${key_type} ${primary_key} , ${parasWithoutPrimaryKey}){
+public void update${beanName}ById(${primary_key_type} ${primary_key} , ${parasWithoutPrimaryKey}){
   ${daoName}.update${beanName}ById(${primary_key} ,  ${parasWithoutPrimaryKeyAndDataType});
   renderJson(RetKit.renderSuccess());
 }
@@ -44,7 +44,7 @@ public void update${beanName}ById(${key_type} ${primary_key} , ${parasWithoutPri
 @Before({GET.class})
 @JwtCheckInterface({})
 @IsNumericInterface("{${primary_key}}")
-public void get${beanName}ById(${key_type}  ${primary_key}){
+public void get${beanName}ById(${primary_key_type}  ${primary_key}){
   renderJson(RetKit.renderSuccess(${daoName}.get${beanName}ById(${primary_key})));
 }
 
diff --git a/dsUtils/target/classes/Model.ftl b/dsUtils/target/classes/Model.ftl
index 842cd25f..1cf657c4 100644
--- a/dsUtils/target/classes/Model.ftl
+++ b/dsUtils/target/classes/Model.ftl
@@ -19,7 +19,7 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
 删除${comment}
 @para ${primary_key} 主键
 */
-public void del${beanName}ById(${key_type}  ${primary_key}){
+public void del${beanName}ById(${primary_key_type}  ${primary_key}){
   String sql="delete from ${table} where ${primary_key} =?";
   Db.update(sql,${primary_key});
 }
@@ -30,7 +30,7 @@ public void del${beanName}ById(${key_type}  ${primary_key}){
     * @param  ${param.key}  ${param.comment}
 </#list>
 */
-public void update${beanName}ById(${key_type}  ${primary_key} ,${parasWithoutPrimaryKey}){
+public void update${beanName}ById(${primary_key_type}  ${primary_key} ,${parasWithoutPrimaryKey}){
 String sql="update ${table} set  <#list paraList as entry>
     <#if entry.key == "create_time">
         record.set("create_time", DateTime.now());