From 52f8693e1df392a1bbae5961dddba85c3271b6c7 Mon Sep 17 00:00:00 2001
From: Ricky <hk_ricky@163.com>
Date: Fri, 30 Jul 2021 18:35:52 +0800
Subject: [PATCH] 优化代码生成
---
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm | 12 +++---
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm | 20 +++++-----
ruoyi-ui/src/views/system/role/selectUser.vue | 2
ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm | 8 ++--
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm | 24 ++++++------
5 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm
index 359ee50..a2f3b51 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm
+++ b/ruoyi-modules/ruoyi-gen/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,11 +81,11 @@
/**
- * 通过${functionName}ID删除${subTable.functionName}信息
+ * 通过${functionName}主键删除${subTable.functionName}信息
*
* @param ${pkColumn.javaField} ${functionName}ID
* @return 结果
*/
- public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
+ public int delete${subClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
#end
}
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
index af422f3..250f68c 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-modules/ruoyi-gen/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 需要删除的${functionName}主键集合
* @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/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
index 2e928e0..410f1d6 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
@@ -3,7 +3,7 @@
import java.util.List;
#foreach ($column in $columns)
#if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
-import com.ruoyi.common.core.utils.DateUtils;
+import com.scxt.common.core.utils.DateUtils;
#break
#end
#end
@@ -11,7 +11,7 @@
import org.springframework.stereotype.Service;
#if($table.sub)
import java.util.ArrayList;
-import com.ruoyi.common.core.utils.StringUtils;
+import com.scxt.common.core.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import ${packageName}.domain.${subClassName};
#end
@@ -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});
}
/**
@@ -108,34 +108,34 @@
/**
* 批量删除${functionName}
*
- * @param ${pkColumn.javaField}s 需要删除的${functionName}ID
+ * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
* @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/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
index 6d0954e..e1891d2 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-modules/ruoyi-gen/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="${subTableFkjavaType}">
delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
</delete>
diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue
index 14ae0bb..5a97095 100644
--- a/ruoyi-ui/src/views/system/role/selectUser.vue
+++ b/ruoyi-ui/src/views/system/role/selectUser.vue
@@ -64,7 +64,7 @@
props: {
// 角色编号
roleId: {
- type: Number
+ type: [Number, String]
}
},
data() {
--
Gitblit v1.9.3