Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
前端资源
RuoYi-Vue
提交
a1cc346a
R
RuoYi-Vue
项目概览
前端资源
/
RuoYi-Vue
11 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Vue
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a1cc346a
编写于
7月 30, 2021
作者:
R
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
优化代码生成模板
上级
5397e345
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
35 addition
and
33 deletion
+35
-33
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
...ava/com/ruoyi/framework/manager/factory/AsyncFactory.java
+1
-0
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
...src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+2
-1
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
...i-generator/src/main/resources/vm/java/controller.java.vm
+2
-2
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
+9
-9
ruoyi-generator/src/main/resources/vm/java/service.java.vm
ruoyi-generator/src/main/resources/vm/java/service.java.vm
+6
-6
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
...-generator/src/main/resources/vm/java/serviceImpl.java.vm
+11
-11
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+4
-4
未找到文件。
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
浏览文件 @
a1cc346a
...
...
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
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
;
...
...
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
浏览文件 @
a1cc346a
...
...
@@ -280,7 +280,8 @@ public class VelocityUtils
*/
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
);
}
...
...
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
浏览文件 @
a1cc346a
...
...
@@ -76,7 +76,7 @@ public class ${ClassName}Controller extends BaseController
@GetMapping(value = "/
{
${
pkColumn
.
javaField
}
}")
public AjaxResult getInfo(@PathVariable("
${
pkColumn
.
javaField
}
")
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
)
{
return AjaxResult.success(
${
className
}
Service.select
${
ClassName
}
By
Id
(
${
pkColumn
.
javaField
}
));
return AjaxResult.success(
${
className
}
Service.select
${
ClassName
}
By
${
pkColumn
.
capJavaField
}
(
${
pkColumn
.
javaField
}
));
}
/**
...
...
@@ -109,6 +109,6 @@ public class ${ClassName}Controller extends BaseController
@DeleteMapping("/
{
${
pkColumn
.
javaField
}
s}")
public AjaxResult remove(@PathVariable
${
pkColumn
.
javaType
}
[]
${
pkColumn
.
javaField
}
s)
{
return toAjax(
${
className
}
Service.delete
${
ClassName
}
By
Id
s(
${
pkColumn
.
javaField
}
s));
return toAjax(
${
className
}
Service.delete
${
ClassName
}
By
${
pkColumn
.
capJavaField
}
s(
${
pkColumn
.
javaField
}
s));
}
}
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
浏览文件 @
a1cc346a
...
...
@@ -17,10 +17,10 @@ public interface ${ClassName}Mapper
/**
* 查询
${
functionName
}
*
* @param
${
pkColumn
.
javaField
}
${
functionName
}
ID
* @param
${
pkColumn
.
javaField
}
${
functionName
}
主键
* @return
${
functionName
}
*/
public
${
ClassName
}
select
${
ClassName
}
By
Id
(
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
);
public
${
ClassName
}
select
${
ClassName
}
By
${
pkColumn
.
capJavaField
}
(
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
);
/**
* 查询
${
functionName
}
列表
...
...
@@ -49,27 +49,27 @@ public interface ${ClassName}Mapper
/**
* 删除
${
functionName
}
*
* @param
${
pkColumn
.
javaField
}
${
functionName
}
ID
* @param
${
pkColumn
.
javaField
}
${
functionName
}
主键
* @return 结果
*/
public int delete
${
ClassName
}
By
Id
(
${
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
}
By
Id
s(
${
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 @@ public interface ${ClassName}Mapper
/**
* 通过
${
functionName
}
ID
删除
${
subTable
.
functionName
}
信息
* 通过
${
functionName
}
主键
删除
${
subTable
.
functionName
}
信息
*
* @param
${
pkColumn
.
javaField
}
${
functionName
}
ID
* @return 结果
...
...
ruoyi-generator/src/main/resources/vm/java/service.java.vm
浏览文件 @
a1cc346a
...
...
@@ -14,10 +14,10 @@ public interface I${ClassName}Service
/**
* 查询
${
functionName
}
*
* @param
${
pkColumn
.
javaField
}
${
functionName
}
ID
* @param
${
pkColumn
.
javaField
}
${
functionName
}
主键
* @return
${
functionName
}
*/
public
${
ClassName
}
select
${
ClassName
}
By
Id
(
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
);
public
${
ClassName
}
select
${
ClassName
}
By
${
pkColumn
.
capJavaField
}
(
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
);
/**
* 查询
${
functionName
}
列表
...
...
@@ -46,16 +46,16 @@ public interface I${ClassName}Service
/**
* 批量删除
${
functionName
}
*
* @param
${
pkColumn
.
javaField
}
s 需要删除的
${
functionName
}
ID
* @param
${
pkColumn
.
javaField
}
s 需要删除的
数据主键集合
* @return 结果
*/
public int delete
${
ClassName
}
By
Id
s(
${
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
}
By
Id
(
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
);
public int delete
${
ClassName
}
By
${
pkColumn
.
capJavaField
}
(
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
);
}
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
浏览文件 @
a1cc346a
...
...
@@ -34,13 +34,13 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
/**
* 查询
${
functionName
}
*
* @param
${
pkColumn
.
javaField
}
${
functionName
}
ID
* @param
${
pkColumn
.
javaField
}
${
functionName
}
主键
* @return
${
functionName
}
*/
@Override
public
${
ClassName
}
select
${
ClassName
}
By
Id
(
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
)
public
${
ClassName
}
select
${
ClassName
}
By
${
pkColumn
.
capJavaField
}
(
${
pkColumn
.
javaType
}
${
pkColumn
.
javaField
}
)
{
return
${
className
}
Mapper.select
${
ClassName
}
By
Id
(
${
pkColumn
.
javaField
}
);
return
${
className
}
Mapper.select
${
ClassName
}
By
${
pkColumn
.
capJavaField
}
(
${
pkColumn
.
javaField
}
);
}
/**
...
...
@@ -106,36 +106,36 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
}
/**
*
批量删除
${
functionName
}
*
删除
${
functionName
}
对象
*
* @param
${
pkColumn
.
javaField
}
s 需要删除的
${
functionName
}
ID
* @param
${
pkColumn
.
javaField
}
s 需要删除的
数据主键
* @return 结果
*/
#
if
($
table
.
sub
)
@Transactional
#
end
@Override
public int delete
${
ClassName
}
By
Id
s(
${
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
}
By
Id
s(
${
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
}
By
Id
(
${
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
}
By
Id
(
${
pkColumn
.
javaField
}
);
return
${
className
}
Mapper.delete
${
ClassName
}
By
${
pkColumn
.
capJavaField
}
(
${
pkColumn
.
javaField
}
);
}
#
if
($
table
.
sub
)
...
...
@@ -147,7 +147,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
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
}
>
();
...
...
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
浏览文件 @
a1cc346a
...
...
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select
id=
"select
${
ClassName
}
By
Id
"
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 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where
${
pkColumn
.
columnName
}
=
#{
${
pkColumn
.
javaField
}
}
</update>
<delete
id=
"delete
${
ClassName
}
By
Id
"
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
}
By
Id
s"
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 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</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>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录