From e46007c15f1e8bbf80e4002ae2b31aeb604a1e9f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 30 七月 2021 22:03:59 +0800
Subject: [PATCH] 优化代码生成模板
---
src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java | 3 +
src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java | 1
src/main/resources/vm/java/serviceImpl.java.vm | 22 +++++-----
src/main/resources/vm/xml/mapper.xml.vm | 8 ++--
src/main/resources/vm/java/mapper.java.vm | 18 ++++----
src/main/resources/vm/java/controller.java.vm | 4 +-
src/main/resources/vm/java/service.java.vm | 12 +++---
7 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
index ea42acf..cee6db9 100644
--- a/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
+++ b/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.LogUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
index a336eb7..0d05572 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
@@ -279,7 +279,8 @@
*/
public static String getParentMenuId(JSONObject paramsObj)
{
- if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
+ if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+ && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
{
return paramsObj.getString(GenConstants.PARENT_MENU_ID);
}
diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm
index a620293..4232009 100644
--- a/src/main/resources/vm/java/controller.java.vm
+++ b/src/main/resources/vm/java/controller.java.vm
@@ -76,7 +76,7 @@
@GetMapping(value = "/{${pkColumn.javaField}}")
public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
{
- return AjaxResult.success(${className}Service.select${ClassName}ById(${pkColumn.javaField}));
+ return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
}
/**
@@ -109,6 +109,6 @@
@DeleteMapping("/{${pkColumn.javaField}s}")
public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
{
- return toAjax(${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s));
+ return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
}
}
diff --git a/src/main/resources/vm/java/mapper.java.vm b/src/main/resources/vm/java/mapper.java.vm
index 359ee50..f744640 100644
--- a/src/main/resources/vm/java/mapper.java.vm
+++ b/src/main/resources/vm/java/mapper.java.vm
@@ -17,10 +17,10 @@
/**
* 鏌ヨ${functionName}
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return ${functionName}
*/
- public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
+ public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/**
* 鏌ヨ${functionName}鍒楄〃
@@ -49,27 +49,27 @@
/**
* 鍒犻櫎${functionName}
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return 缁撴灉
*/
- public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
+ public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/**
* 鎵归噺鍒犻櫎${functionName}
*
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁ID
+ * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+ public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
#if($table.sub)
/**
* 鎵归噺鍒犻櫎${subTable.functionName}
*
- * @param customerIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
+ * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+ public int delete${subClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
/**
* 鎵归噺鏂板${subTable.functionName}
@@ -81,7 +81,7 @@
/**
- * 閫氳繃${functionName}ID鍒犻櫎${subTable.functionName}淇℃伅
+ * 閫氳繃${functionName}涓婚敭鍒犻櫎${subTable.functionName}淇℃伅
*
* @param ${pkColumn.javaField} ${functionName}ID
* @return 缁撴灉
diff --git a/src/main/resources/vm/java/service.java.vm b/src/main/resources/vm/java/service.java.vm
index af422f3..e3663e1 100644
--- a/src/main/resources/vm/java/service.java.vm
+++ b/src/main/resources/vm/java/service.java.vm
@@ -14,10 +14,10 @@
/**
* 鏌ヨ${functionName}
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return ${functionName}
*/
- public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
+ public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/**
* 鏌ヨ${functionName}鍒楄〃
@@ -46,16 +46,16 @@
/**
* 鎵归噺鍒犻櫎${functionName}
*
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}ID
+ * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+ public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
/**
* 鍒犻櫎${functionName}淇℃伅
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return 缁撴灉
*/
- public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
+ public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
}
diff --git a/src/main/resources/vm/java/serviceImpl.java.vm b/src/main/resources/vm/java/serviceImpl.java.vm
index b1b3c40..da6b0e7 100644
--- a/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/src/main/resources/vm/java/serviceImpl.java.vm
@@ -34,13 +34,13 @@
/**
* 鏌ヨ${functionName}
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return ${functionName}
*/
@Override
- public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
+ public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{
- return ${className}Mapper.select${ClassName}ById(${pkColumn.javaField});
+ return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
}
/**
@@ -106,36 +106,36 @@
}
/**
- * 鎵归噺鍒犻櫎${functionName}
+ * 鍒犻櫎${functionName}瀵硅薄
*
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}ID
+ * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭
* @return 缁撴灉
*/
#if($table.sub)
@Transactional
#end
@Override
- public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s)
+ public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
{
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
#end
- return ${className}Mapper.delete${ClassName}ByIds(${pkColumn.javaField}s);
+ return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
}
/**
* 鍒犻櫎${functionName}淇℃伅
*
- * @param ${pkColumn.javaField} ${functionName}ID
+ * @param ${pkColumn.javaField} ${functionName}涓婚敭
* @return 缁撴灉
*/
@Override
- public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
+ public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
#end
- return ${className}Mapper.delete${ClassName}ById(${pkColumn.javaField});
+ return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
}
#if($table.sub)
@@ -147,7 +147,7 @@
public void insert${subClassName}(${ClassName} ${className})
{
List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
- Long ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+ ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
if (StringUtils.isNotNull(${subclassName}List))
{
List<${subClassName}> list = new ArrayList<${subClassName}>();
diff --git a/src/main/resources/vm/xml/mapper.xml.vm b/src/main/resources/vm/xml/mapper.xml.vm
index 6d0954e..0c681d9 100644
--- a/src/main/resources/vm/xml/mapper.xml.vm
+++ b/src/main/resources/vm/xml/mapper.xml.vm
@@ -58,7 +58,7 @@
</where>
</select>
- <select id="select${ClassName}ById" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
+ <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
#if($table.crud || $table.tree)
<include refid="select${ClassName}Vo"/>
where ${pkColumn.columnName} = #{${pkColumn.javaField}}
@@ -102,11 +102,11 @@
where ${pkColumn.columnName} = #{${pkColumn.javaField}}
</update>
- <delete id="delete${ClassName}ById" parameterType="${pkColumn.javaType}">
+ <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
</delete>
- <delete id="delete${ClassName}ByIds" parameterType="String">
+ <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
delete from ${tableName} where ${pkColumn.columnName} in
<foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
#{${pkColumn.javaField}}
@@ -121,7 +121,7 @@
</foreach>
</delete>
- <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="Long">
+ <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
</delete>
--
Gitblit v1.9.3