From 00e203ea65e5041e11db0cf650cbe3043ba70000 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:37:13 +0800
Subject: [PATCH] 'commit'

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

diff --git a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
index 0c0e45f9..8e73349d 100644
--- a/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
+++ b/dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java
@@ -231,7 +231,7 @@ public class GenerateCode {
         //表的描述
         String comment = jo.getStr("comment");
         //主键
-        String key = jo.getStr("key");
+        String primary_key = jo.getStr("key");
         //主键类型
         String key_type = jo.getStr("key_type");
         //表名
@@ -255,7 +255,7 @@ public class GenerateCode {
         dataModel.put("beanName", beanName);//实体Bean的名称，用于构建方法名
         dataModel.put("parasWithoutPrimaryKey", parasWithoutPrimaryKey);//不包括主键的参数列表，用于构建方法的参数
         dataModel.put("parasWithoutPrimaryKeyAndDataType", parasWithoutPrimaryKeyAndDataType);//不包括数据类型的parasWithoutPrimaryKey
-        dataModel.put("key", key);//主键名称
+        dataModel.put("primary_key", primary_key);//主键名称
         dataModel.put("key_type", key_type);//主键类型
         dataModel.put("table", table);//表名
 
diff --git a/dsUtils/src/main/resources/Controller.ftl b/dsUtils/src/main/resources/Controller.ftl
index 3aa56227..c478d1f4 100644
--- a/dsUtils/src/main/resources/Controller.ftl
+++ b/dsUtils/src/main/resources/Controller.ftl
@@ -19,9 +19,9 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
 */
 @Before({POST.class})
 @JwtCheckInterface({})
-@IsNumericInterface({"${key}"})
-public void del${beanName}ById(${key_type} ${key}){
-  ${daoName}.del${beanName}ById(${key});
+@IsNumericInterface({"${primary_key}"})
+public void del${beanName}ById(${key_type} ${primary_key}){
+  ${daoName}.del${beanName}ById(${primary_key});
   renderJson(RetKit.renderSuccess());
 }
 
@@ -32,20 +32,20 @@ public void del${beanName}ById(${key_type} ${key}){
 */
 @Before({POST.class})
 @JwtCheckInterface({})
-@IsNumericInterface({${key})
-public void update${beanName}ById(${key_type} ${key} , ${parasWithoutPrimaryKey}){
-  ${daoName}.update${beanName}ById(${key} ,  ${parasWithoutPrimaryKeyAndDataType});
+@IsNumericInterface({${primary_key})
+public void update${beanName}ById(${key_type} ${primary_key} , ${parasWithoutPrimaryKey}){
+  ${daoName}.update${beanName}ById(${primary_key} ,  ${parasWithoutPrimaryKeyAndDataType});
   renderJson(RetKit.renderSuccess());
 }
 
 /**按ID查询${comment}
-* @para ${key} 主键
+* @para ${primary_key} 主键
 */
 @Before({GET.class})
 @JwtCheckInterface({})
-@IsNumericInterface("{${key}}")
-public void get${beanName}ById(${key_type}  ${key}){
-  renderJson(RetKit.renderSuccess(${daoName}.get${beanName}ById(${key})));
+@IsNumericInterface("{${primary_key}}")
+public void get${beanName}ById(${key_type}  ${primary_key}){
+  renderJson(RetKit.renderSuccess(${daoName}.get${beanName}ById(${primary_key})));
 }
 
 /** 分页查询${comment}
diff --git a/dsUtils/src/main/resources/Model.ftl b/dsUtils/src/main/resources/Model.ftl
index b968a0fe..842cd25f 100644
--- a/dsUtils/src/main/resources/Model.ftl
+++ b/dsUtils/src/main/resources/Model.ftl
@@ -12,16 +12,16 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
     record.set("${entry.key}", ${entry.key});
    </#if>
 </#list>
-    Db.save("${table}","${key}",record);
+    Db.save("${table}","${primary_key}",record);
 }
 
 /**
 删除${comment}
-@para ${key} 主键
+@para ${primary_key} 主键
 */
-public void del${beanName}ById(${key_type}  ${key}){
-  String sql="delete from ${table} where ${key} =?";
-  Db.update(sql,${key});
+public void del${beanName}ById(${key_type}  ${primary_key}){
+  String sql="delete from ${table} where ${primary_key} =?";
+  Db.update(sql,${primary_key});
 }
 
 
@@ -30,14 +30,14 @@ public void del${beanName}ById(${key_type}  ${key}){
     * @param  ${param.key}  ${param.comment}
 </#list>
 */
-public void update${beanName}ById(${key_type}  ${key} ,${parasWithoutPrimaryKey}){
+public void update${beanName}ById(${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());
     <#else>
         record.set("${entry.key}", ${entry.key});
     </#if>
-</#list>  where ${key} =?";
+</#list>  where ${primary_key} =?";
 
 <#--for (Map.Entry<String, String> entry : fields.entrySet()) {-->
 <#--if (!entry.getKey().equals("create_time")) {-->
diff --git a/dsUtils/target/classes/Controller.ftl b/dsUtils/target/classes/Controller.ftl
index 3aa56227..c478d1f4 100644
--- a/dsUtils/target/classes/Controller.ftl
+++ b/dsUtils/target/classes/Controller.ftl
@@ -19,9 +19,9 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
 */
 @Before({POST.class})
 @JwtCheckInterface({})
-@IsNumericInterface({"${key}"})
-public void del${beanName}ById(${key_type} ${key}){
-  ${daoName}.del${beanName}ById(${key});
+@IsNumericInterface({"${primary_key}"})
+public void del${beanName}ById(${key_type} ${primary_key}){
+  ${daoName}.del${beanName}ById(${primary_key});
   renderJson(RetKit.renderSuccess());
 }
 
@@ -32,20 +32,20 @@ public void del${beanName}ById(${key_type} ${key}){
 */
 @Before({POST.class})
 @JwtCheckInterface({})
-@IsNumericInterface({${key})
-public void update${beanName}ById(${key_type} ${key} , ${parasWithoutPrimaryKey}){
-  ${daoName}.update${beanName}ById(${key} ,  ${parasWithoutPrimaryKeyAndDataType});
+@IsNumericInterface({${primary_key})
+public void update${beanName}ById(${key_type} ${primary_key} , ${parasWithoutPrimaryKey}){
+  ${daoName}.update${beanName}ById(${primary_key} ,  ${parasWithoutPrimaryKeyAndDataType});
   renderJson(RetKit.renderSuccess());
 }
 
 /**按ID查询${comment}
-* @para ${key} 主键
+* @para ${primary_key} 主键
 */
 @Before({GET.class})
 @JwtCheckInterface({})
-@IsNumericInterface("{${key}}")
-public void get${beanName}ById(${key_type}  ${key}){
-  renderJson(RetKit.renderSuccess(${daoName}.get${beanName}ById(${key})));
+@IsNumericInterface("{${primary_key}}")
+public void get${beanName}ById(${key_type}  ${primary_key}){
+  renderJson(RetKit.renderSuccess(${daoName}.get${beanName}ById(${primary_key})));
 }
 
 /** 分页查询${comment}
diff --git a/dsUtils/target/classes/Model.ftl b/dsUtils/target/classes/Model.ftl
index b968a0fe..842cd25f 100644
--- a/dsUtils/target/classes/Model.ftl
+++ b/dsUtils/target/classes/Model.ftl
@@ -12,16 +12,16 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
     record.set("${entry.key}", ${entry.key});
    </#if>
 </#list>
-    Db.save("${table}","${key}",record);
+    Db.save("${table}","${primary_key}",record);
 }
 
 /**
 删除${comment}
-@para ${key} 主键
+@para ${primary_key} 主键
 */
-public void del${beanName}ById(${key_type}  ${key}){
-  String sql="delete from ${table} where ${key} =?";
-  Db.update(sql,${key});
+public void del${beanName}ById(${key_type}  ${primary_key}){
+  String sql="delete from ${table} where ${primary_key} =?";
+  Db.update(sql,${primary_key});
 }
 
 
@@ -30,14 +30,14 @@ public void del${beanName}ById(${key_type}  ${key}){
     * @param  ${param.key}  ${param.comment}
 </#list>
 */
-public void update${beanName}ById(${key_type}  ${key} ,${parasWithoutPrimaryKey}){
+public void update${beanName}ById(${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());
     <#else>
         record.set("${entry.key}", ${entry.key});
     </#if>
-</#list>  where ${key} =?";
+</#list>  where ${primary_key} =?";
 
 <#--for (Map.Entry<String, String> entry : fields.entrySet()) {-->
 <#--if (!entry.getKey().equals("create_time")) {-->