'commit'

dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Controller.txt

@@ -4,7 +4,7 @@
 */
 @Before({POST.class})
 @JwtCheckInterface({})
-public void addWxFaultType(String type_name ){
+public void addWxFaultType(String type_name){
     ym.addWxFaultType(type_name );
     renderJson(RetKit.renderSuccess());
 }
@@ -27,7 +27,7 @@ public void delWxFaultTypeById(int type_id){
 @Before({POST.class})
 @JwtCheckInterface({})
 @IsNumericInterface({type_id)
-public void updateWxFaultTypeById(int type_id , String type_name ){
+public void updateWxFaultTypeById(int type_id , String type_name){
   ym.updateWxFaultTypeById(type_id ,  type_name );
   renderJson(RetKit.renderSuccess());
 }

dsUtils/src/main/java/com/dsideal/Code/t_wx_fault_type_Model.txt

@@ -1,7 +1,7 @@
 /**增加维修故障类型字典
 * @param  type_name  类型名称
 */
-public void addWxFaultType(String type_name ){
+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);
@@ -11,17 +11,17 @@ public void addWxFaultType(String type_name ){
 删除维修故障类型字典
 @para type_id 主键
 */
-public void delWxFaultTypeById(int  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  类型名称
+@para type_id 主键
+* @param  type_name  类型名称
 */
-public void updateWxFaultTypeById(int  type_id ,String type_name ){
+public void updateWxFaultTypeById(int type_id,String type_name){
-String sql="update t_wx_fault_type set  
+    String sql="update t_wx_fault_type set type_name =? where type_id =?";
-        record.set("type_name", type_name);
+    Db.update(sql,type_name ,type_id);
-  where type_id =?";
+}
-

dsUtils/src/main/java/com/dsideal/Tools/GenerateCode.java

@@ -250,6 +250,9 @@ public class GenerateCode {
                 paraList.add(record);
             }
         }
+        if(parasWithoutPrimaryKey.endsWith(" ")){
+            parasWithoutPrimaryKey = parasWithoutPrimaryKey.substring(0, parasWithoutPrimaryKey.length() - 1);
+        }
         dataModel.put("paraList", paraList);//用于注释，显示@para 参数名 参数含义
         dataModel.put("daoName", PropKit.get("daoName"));//显示dao的名称，比如ym
         dataModel.put("beanName", beanName);//实体Bean的名称，用于构建方法名
@@ -259,6 +262,19 @@ public class GenerateCode {
         dataModel.put("primary_key_type", primary_key_type);//主键类型
         dataModel.put("tableName", tableName);//表名
 
+        String updateParas = "";
+        for (String s : parasWithoutPrimaryKeyAndDataType.split(",")) {
+            if (s.equals("create_time")) {
+                updateParas += s+"=now(),";
+            } else {
+                updateParas += s + "=?,";
+            }
+        }
+        if (updateParas.endsWith(",")) {
+            updateParas = updateParas.substring(0, updateParas.length() - 1);
+        }
+        dataModel.put("updateParas", updateParas);
+
         System.out.println(dataModel);
 
         //调用FreeMarker模板引擎

dsUtils/src/main/resources/Model.ftl

@@ -19,26 +19,22 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
 删除${comment}
 @para ${primary_key} 主键
 */
-public void del${beanName}ById(${primary_key_type}  ${primary_key}){
+public void del${beanName}ById(${primary_key_type} ${primary_key}){
   String sql="delete from ${tableName} where ${primary_key} =?";
   Db.update(sql,${primary_key});
 }
 
 
 /**修改${comment}
+@para ${primary_key} 主键
 <#list paraList as param>
-    * @param  ${param.key}  ${param.comment}
+* @param  ${param.key}  ${param.comment}
 </#list>
 */
-public void update${beanName}ById(${primary_key_type}  ${primary_key} ,${parasWithoutPrimaryKey}){
+public void update${beanName}ById(${primary_key_type} ${primary_key},${parasWithoutPrimaryKey}){
-String sql="update ${tableName} set  <#list paraList as entry>
+    String sql="update ${tableName} set ${updateParas} where ${primary_key} =?";
-    <#if entry.key == "create_time">
+    Db.update(sql,${parasWithoutPrimaryKeyAndDataType},${primary_key});
-        record.set("create_time", DateTime.now());
+}
-    <#else>
-        record.set("${entry.key}", ${entry.key});
-    </#if>
-</#list>  where ${primary_key} =?";
-
 <#--for (Map.Entry<String, String> entry : fields.entrySet()) {-->
 <#--if (!entry.getKey().equals("create_time")) {-->
 <#--sb.append(entry.getKey() + "= ?,");-->

dsUtils/target/classes/Model.ftl

@@ -19,26 +19,22 @@ public void add${beanName}(${parasWithoutPrimaryKey}){
 删除${comment}
 @para ${primary_key} 主键
 */
-public void del${beanName}ById(${primary_key_type}  ${primary_key}){
+public void del${beanName}ById(${primary_key_type} ${primary_key}){
   String sql="delete from ${tableName} where ${primary_key} =?";
   Db.update(sql,${primary_key});
 }
 
 
 /**修改${comment}
+@para ${primary_key} 主键
 <#list paraList as param>
-    * @param  ${param.key}  ${param.comment}
+* @param  ${param.key}  ${param.comment}
 </#list>
 */
-public void update${beanName}ById(${primary_key_type}  ${primary_key} ,${parasWithoutPrimaryKey}){
+public void update${beanName}ById(${primary_key_type} ${primary_key},${parasWithoutPrimaryKey}){
-String sql="update ${tableName} set  <#list paraList as entry>
+    String sql="update ${tableName} set ${updateParas} where ${primary_key} =?";
-    <#if entry.key == "create_time">
+    Db.update(sql,${parasWithoutPrimaryKeyAndDataType},${primary_key});
-        record.set("create_time", DateTime.now());
+}
-    <#else>
-        record.set("${entry.key}", ${entry.key});
-    </#if>
-</#list>  where ${primary_key} =?";
-
 <#--for (Map.Entry<String, String> entry : fields.entrySet()) {-->
 <#--if (!entry.getKey().equals("create_time")) {-->
 <#--sb.append(entry.getKey() + "= ?,");-->