hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

若依开源1.1.4发布

Browse Source
This commit is contained in:
RuoYi
2018-05-20 09:25:01 +08:00
parent fab59267ed
commit 01d61b1d0e
50 changed files with 1364 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/resources/templates/vm/html/add.html.vm
View File

@ -5,23 +5,24 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-${classname}-add">
#foreach($column in $columns)
#if($column.columnName != $primaryKey.columnName)
<div class="form-group">
<label class="col-sm-3 control-label">${column.columnComment}：</label>
<div class="col-sm-8">
<input id="${column.attrname}" name="${column.attrname}" class="form-control" type="text">
</div>
</div>
#end
#end
<div class="form-group">
<div class="col-sm-8 col-sm-offset-3">
<button type="submit" class="btn btn-primary">提交</button>
</div>
</div>
</form>
</div>
#foreach($column in $columns)
#if($column.columnName != $primaryKey.columnName)
<div class="form-group">
<label class="col-sm-3 control-label">${column.columnComment}：</label>
<div class="col-sm-8">
<input id="${column.attrname}" name="${column.attrname}" class="form-control" type="text">
</div>
</div>
#end
#end
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
<button th:onclick="'javascript:layer_close()'" class="btn btn-danger" type="button">关闭</button>
</div>
</div>
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/${moduleName}/${classname}/add.js" th:src="@{/ruoyi/${moduleName}/${classname}/add.js}">
</script>

22
src/main/resources/templates/vm/html/edit.html.vm
View File

@ -6,23 +6,23 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-${classname}-edit">
<input id="${primaryKey.attrname}" name="${primaryKey.attrname}" th:value="${${classname}.${primaryKey.attrname}}" type="hidden">
#foreach($column in $columns)
#if($column.columnName != $primaryKey.columnName)
#foreach($column in $columns)
#if($column.columnName != $primaryKey.columnName)
<div class="form-group">
<label class="col-sm-3 control-label">${column.columnComment}：</label>
<div class="col-sm-8">
<input id="${column.attrname}" name="${column.attrname}" th:value="${${classname}.${column.attrname}}" class="form-control" type="text">
</div>
</div>
#end
#end
<div class="form-group">
<div class="col-sm-8 col-sm-offset-3">
<button type="submit" class="btn btn-primary">提交</button>
</div>
</div>
</div>
</form>
#end
#end
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
<button th:onclick="'javascript:layer_close()'" class="btn btn-danger" type="button">关闭</button>
</div>
</div>
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/${moduleName}/${classname}/edit.js" th:src="@{/ruoyi/${moduleName}/${classname}/edit.js}">

14
src/main/resources/templates/vm/java/Controller.java.vm
View File

@ -42,8 +42,8 @@ public class ${className}Controller extends BaseController
/**
* 查询${tableComment}列表
*/
@GetMapping("/list")
@RequiresPermissions("${moduleName}:${classname}:list")
@GetMapping("/list")
@ResponseBody
public TableDataInfo list(${className} ${classname})
{
@ -55,8 +55,8 @@ public class ${className}Controller extends BaseController
/**
* 新增${tableComment}
*/
@GetMapping("/add")
@RequiresPermissions("${moduleName}:${classname}:add")
@GetMapping("/add")
public String add()
{
return prefix + "/add";
@ -65,8 +65,8 @@ public class ${className}Controller extends BaseController
/**
* 修改${tableComment}
*/
@GetMapping("/edit/{${primaryKey.attrname}}")
@RequiresPermissions("${moduleName}:${classname}:edit")
@GetMapping("/edit/{${primaryKey.attrname}}")
public String edit(@PathVariable("${primaryKey.attrname}") ${primaryKey.attrType} ${primaryKey.attrname}, Model model)
{
${className} ${classname} = ${classname}Service.select${className}ById(${primaryKey.attrname});
@ -77,9 +77,9 @@ public class ${className}Controller extends BaseController
/**
* 保存${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:save")
PostMapping("/save")
@ResponseBody
@PostMapping("/save")
@RequiresPermissions("${moduleName}:${classname}:add")
public Message save(${className} ${classname})
{
if (${classname}Service.save${className}(${classname}) > 0)
@ -92,9 +92,9 @@ public class ${className}Controller extends BaseController
/**
* 删除${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:remove")
@PostMapping( "/remove/{${primaryKey.attrname}}")
@ResponseBody
@RequiresPermissions("${moduleName}:${classname}:remove")
public Message remove(@PathVariable("${primaryKey.attrname}") ${primaryKey.attrType} ${primaryKey.attrname})
{
if (${classname}Service.delete${className}ById(${primaryKey.attrname}) > 0)
@ -107,9 +107,9 @@ public class ${className}Controller extends BaseController
/**
* 批量删除${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:batchRemove")
@PostMapping( "/batchRemove")
@ResponseBody
@RequiresPermissions("${moduleName}:${classname}:batchRemove")
public Message remove(@RequestParam("ids[]") ${primaryKey.attrType}[] ${primaryKey.attrname}s)
{
int rows = ${classname}Service.batchDelete${className}(${primaryKey.attrname}s);

2
src/main/resources/templates/vm/java/domain.java.vm
View File

@ -6,7 +6,7 @@ import java.math.BigDecimal;
#end
/**
* ${tableName} ${tableComment}
* ${tableComment}表 ${tableName}
*
* @author ${author}
* @date ${datetime}

4
src/main/resources/templates/vm/js/edit.js.vm
View File

@ -5,10 +5,10 @@ $("#form-${classname}-edit").validate({
},
},
submitHandler:function(form){
edit();
update();
}
});
function edit() {
function update() {
_ajax_save(ctx + "${moduleName}/${classname}/save", $('#form-${classname}-edit').serialize());
}

4
src/main/resources/templates/vm/js/list.js.vm
View File

@ -4,12 +4,12 @@ $(function() {
var columns = [{
checkbox: true
},
#foreach($column in $columns)
#foreach($column in $columns)
{
field : '${column.attrname}',
title : '${column.columnComment}'
},
#end
#end
{
title: '操作',
align: 'center',

29
src/main/resources/templates/vm/xml/Mapper.xml.vm
View File

@ -5,40 +5,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="${package}.mapper.${className}Mapper">
<resultMap type="${className}" id="${className}Result">
#foreach ($column in $columns)
#foreach ($column in $columns)
<result property="${column.attrname}" column="${column.columnName}" />
#end
#end
</resultMap>
<select id="select${className}ById" parameterType="${primaryKey.attrType}" resultMap="${className}Result">
select #foreach($column in $columns) $column.columnName #if($velocityCount != $columns.size()),#end#end from ${tableName}
select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName}
where ${primaryKey.columnName} = #{${primaryKey.attrname}}
</select>
<select id="select${className}List" parameterType="${className}" resultMap="${className}Result">
select #foreach($column in $columns) $column.columnName #if($velocityCount != $columns.size()),#end#end from ${tableName}
select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName}
<where>
#foreach($column in $columns)
<if test="$column.attrname != null and $column.attrname.trim() != ''"> and $column.columnName = #{$column.attrname} </if>
#end
#foreach($column in $columns)
<if test="$column.attrname != null and $column.attrname.trim() != ''"> and $column.columnName = #{$column.attrname}</if>
#end
</where>
</select>
<insert id="insert${className}" parameterType="${className}"#if($primaryKey.extra == 'auto_increment') useGeneratedKeys="true" keyProperty="$primaryKey.attrname"#end>
insert into ${tableName} (
#foreach($column in $columns)
#foreach($column in $columns)
#if($column.columnName != $primaryKey.columnName || $primaryKey.extra != 'auto_increment')
$column.columnName#if($velocityCount != $columns.size()), #end
<if test="$column.attrname != null and $column.attrname != '' ">$column.columnName#if($velocityCount != $columns.size()), #end</if>
#end
#end
)
values (
#foreach($column in $columns)
)values(
#foreach($column in $columns)
#if($column.columnName != $primaryKey.columnName || $primaryKey.extra != 'auto_increment')
#{$column.attrname}#if($velocityCount != $columns.size()), #end
<if test="$column.attrname != null and $column.attrname != ''">#{$column.attrname}#if($velocityCount != $columns.size()), #end</if>
#end
#end
)
)
</insert>
<update id="update${className}" parameterType="${className}">
@ -46,7 +45,7 @@ $column.columnName#if($velocityCount != $columns.size()), #end
<set>
#foreach($column in $columns)
#if($column.columnName != $primaryKey.columnName)
<if test="$column.attrname != null">$column.columnName = #{$column.attrname}#if($velocityCount != $columns.size()), #end</if>
<if test="$column.attrname != null and $column.attrname != ''">$column.columnName = #{$column.attrname}#if($velocityCount != $columns.size()), #end</if>
#end
#end
</set>