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

若依2.2版本发布

Browse Source
This commit is contained in:
RuoYi
2018-07-22 23:05:50 +08:00
parent 9e8d80a699
commit cc9c67cdfb
115 changed files with 1579 additions and 1216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/templates/include.html
View File

@ -40,8 +40,8 @@
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
<script th:src="@{/ajax/libs/layui/layui.js}"></script>
<script th:src="@{/ruoyi/js/common.js?v=2.1.0}"></script>
<script th:src="@{/ruoyi/js/ry-ui.min.js?v=2.1.0}"></script>
<script th:src="@{/ruoyi/js/common.js?v=2.2.0}"></script>
<script th:src="@{/ruoyi/js/ry-ui.min.js?v=2.2.0}"></script>
<script src="http://tajs.qq.com/stats?sId=62048022"></script>
<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
</div>

6
src/main/resources/templates/index.html
View File

@ -15,12 +15,12 @@
<link th:href="@{/css/font-awesome.css}" rel="stylesheet"/>
<link th:href="@{/css/animate.css}" rel="stylesheet"/>
<link th:href="@{/css/style.css}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.min.css?v=2.1.0}" rel="stylesheet"/>
<link th:href="@{/ruoyi/css/ry-ui.min.css?v=2.2.0}" rel="stylesheet"/>
<style type="text/css">
.nav > li:hover .dropdown-menu {display: block;}
</style>
</head>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden" th:classappend="${@configService.selectConfigByKey('sys.index.skinName')}">
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden" th:classappend="${@config.getKey('sys.index.skinName')}">
<div id="wrapper">
<!--左侧导航开始-->
@ -136,7 +136,7 @@
<script th:src="@{/js/plugins/slimscroll/jquery.slimscroll.min.js}"></script>
<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
<script src="http://tajs.qq.com/stats?sId=62048022"></script>
<script th:src="@{/ruoyi/js/ry-ui.min.js?v=2.1.0}"></script>
<script th:src="@{/ruoyi/js/ry-ui.min.js?v=2.2.0}"></script>
<script th:src="@{/ruoyi/index.js}"></script>
<script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
</body>

4
src/main/resources/templates/login.html
View File

@ -12,7 +12,7 @@
<link href="../static/css/style.css" th:href="@{css/style.css}" rel="stylesheet"/>
<link href="../static/css/login.min.css" th:href="@{css/login.min.css}" rel="stylesheet"/>
<link href="../static/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
<link href="../static/ruoyi/css/ry-ui.min.css" th:href="@{/ruoyi/css/ry-ui.min.css?v=2.1.0}" rel="stylesheet"/>
<link href="../static/ruoyi/css/ry-ui.min.css" th:href="@{/ruoyi/css/ry-ui.min.css?v=2.2.0}" rel="stylesheet"/>
<!--[if lt IE 9]>
<meta http-equiv="refresh" content="0;ie.html" />
<![endif]-->
@ -81,7 +81,7 @@
<script src="../static/ajax/libs/iCheck/icheck.min.js" th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
<script src="http://tajs.qq.com/stats?sId=62048022"></script>
<script src="../static/ruoyi/js/ry-ui.min.js" th:src="@{/ruoyi/js/ry-ui.min.js?v=2.1.0}"></script>
<script src="../static/ruoyi/js/ry-ui.min.js" th:src="@{/ruoyi/js/ry-ui.min.js?v=2.2.0}"></script>
<script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
</body>
</html>

28
src/main/resources/templates/main.html
View File

@ -97,10 +97,34 @@
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a data-toggle="collapse" data-parent="#version" href="#v20">v2.1.0</a><code class="pull-right">2018.07.10</code>
<a data-toggle="collapse" data-parent="#version" href="#v22">v2.2.0</a><code class="pull-right">2018.07.23</code>
</h5>
</div>
<div id="v20" class="panel-collapse collapse in">
<div id="v22" class="panel-collapse collapse in">
<div class="panel-body">
<ol>
<li>修复批量生成代码异常问题</li>
<li>修复定时器保存失败问题</li>
<li>修复热部署转换问题</li>
<li>支持查询&统一样式（菜单管理，部门管理）</li>
<li>大多数功能支持时间查询</li>
<li>去掉自定义导出注解column列变更为自动匹配</li>
<li>新增任务执行策略</li>
<li>操作详细动态显示类型</li>
<li>支持动态回显字典数据</li>
<li>后台代码优化调整</li>
<li>其他细节优化</li>
</ol>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h5 class="panel-title">
<a data-toggle="collapse" data-parent="#version" href="#v21">v2.1.0</a><code class="pull-right">2018.07.10</code>
</h5>
</div>
<div id="v21" class="panel-collapse collapse">
<div class="panel-body">
<ol>
<li>新增登陆超时提醒</li>

4
src/main/resources/templates/monitor/job/add.html
View File

@ -46,7 +46,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_job_status')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_job_status')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -85,7 +85,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-job-add').serialize());
$.operate.save(prefix + "/add", $('#form-job-add').serialize());
}
});
</script>

4
src/main/resources/templates/monitor/job/edit.html
View File

@ -47,7 +47,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_job_status')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_job_status')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -86,7 +86,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-job-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-job-edit').serialize());
}
});
</script>

15
src/main/resources/templates/monitor/job/job.html
View File

@ -18,7 +18,7 @@
方法名称：<input type="text" name="methodName"/>
</li>
<li>
任务状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_job_status')}">
任务状态：<select name="status" th:with="type=${@dict.getType('sys_job_status')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -51,9 +51,10 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('monitor:job:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('monitor:job:remove')}]];
var statusFlag = [[${@permissionService.hasPermi('monitor:job:changeStatus')}]];
var editFlag = [[${@permission.hasPermi('monitor:job:edit')}]];
var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];
var statusFlag = [[${@permission.hasPermi('monitor:job:changeStatus')}]];
var datas = [[${@dict.getType('sys_job_status')}]];
var prefix = ctx + "monitor/job"
$(function() {
@ -102,11 +103,7 @@
title: '任务状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">暂停</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

11
src/main/resources/templates/monitor/job/jobLog.html
View File

@ -18,7 +18,7 @@
<label>方法名称：</label><input type="text" name="methodName"/>
</li>
<li>
<label>执行状态：</label><select name="status" th:with="type=${@dictService.selectDictData('sys_common_status')}">
<label>执行状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -51,7 +51,8 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var removeFlag = [[${@permissionService.hasPermi('monitor:job:remove')}]];
var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];
var datas = [[${@dict.getType('sys_job_status')}]];
var prefix = ctx + "monitor/jobLog"
$(function() {
@ -98,11 +99,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">失败</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

11
src/main/resources/templates/monitor/logininfor/logininfor.html
View File

@ -18,7 +18,7 @@
<label>登录名称：</label><input type="text" name="loginName"/>
</li>
<li>
<label>登录状态：</label><select name="status" th:with="type=${@dictService.selectDictData('sys_common_status')}">
<label>登录状态：</label><select name="status" th:with="type=${@dict.getType('sys_common_status')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -51,7 +51,8 @@
</div>
<div th:include="include :: footer"></div>
<script type="text/javascript">
<script th:inline="javascript">
var datas = [[${@dict.getType('sys_common_status')}]];
var prefix = ctx + "monitor/logininfor"
$(function() {
@ -96,11 +97,7 @@
title: '登录状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">成功</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">失败</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

2
src/main/resources/templates/monitor/online/online.html
View File

@ -38,7 +38,7 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var forceFlag = [[${@permissionService.hasPermi('monitor:online:forceLogout')}]];
var forceFlag = [[${@permission.hasPermi('monitor:online:forceLogout')}]];
var prefix = ctx + "monitor/online"
$(function() {

2
src/main/resources/templates/monitor/operlog/detail.html
View File

@ -8,7 +8,7 @@
<form class="form-horizontal m-t" id="signupForm">
<div class="form-group">
<label class="col-sm-2 control-label">操作模块：</label>
<div class="form-control-static" th:text="${operLog.title} + ' / ' + ${operLog.action}">
<div class="form-control-static" th:text="${operLog.title} + ' / ' + ${@dict.getLabel('sys_oper_type',operLog.action)}">
</div>
</div>
<div class="form-group">

27
src/main/resources/templates/monitor/operlog/operlog.html
View File

@ -18,7 +18,7 @@
<label>操作人员： </label><input type="text" name="operName"/>
</li>
<li>
<label>操作类型： </label><select name="action" th:with="type=${@dictService.selectDictData('sys_oper_type')}">
<label>操作类型： </label><select name="action" th:with="type=${@dict.getType('sys_oper_type')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -52,7 +52,8 @@
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var detailFlag = [[${@permissionService.hasPermi('monitor:operlog:detail')}]];
var detailFlag = [[${@permission.hasPermi('monitor:operlog:detail')}]];
var datas = [[${@dict.getType('sys_oper_type')}]];
var prefix = ctx + "monitor/operlog"
$(function() {
@ -80,27 +81,7 @@
title: '操作类型',
align: 'center',
formatter: function(value, row, index) {
if (value == 1) {
return '<span class="badge badge-primary">新增</span>';
} else if (value == 2) {
return '<span class="badge badge-primary">修改</span>';
} else if (value == 3) {
return '<span class="badge badge-warning">保存</span>';
} else if (value == 4) {
return '<span class="badge badge-danger">删除</span>';
} else if (value == 5) {
return '<span class="badge badge-primary">授权</span>';
} else if (value == 6) {
return '<span class="badge badge-warning">导出</span>';
} else if (value == 7) {
return '<span class="badge badge-warning">导入</span>';
} else if (value == 8) {
return '<span class="badge badge-danger">强退</span>';
} else if (value == 9) {
return '<span class="badge badge-danger">禁止访问</span>';
} else if (value == 10) {
return '<span class="badge badge-warning">生成代码</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

4
src/main/resources/templates/system/config/add.html
View File

@ -25,7 +25,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">系统内置：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_yes_no')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_yes_no')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="configType" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -82,7 +82,7 @@
}
},
submitHandler: function(form) {
$.operate.save(prefix + "/save", $('#form-config-add').serialize());
$.operate.save(prefix + "/add", $('#form-config-add').serialize());
}
});
</script>

13
src/main/resources/templates/system/config/config.html
View File

@ -17,7 +17,7 @@
参数键名：<input type="text" name="configKey"/>
</li>
<li>
系统内置：<select name="configType" th:with="type=${@dictService.selectDictData('sys_yes_no')}">
系统内置：<select name="configType" th:with="type=${@dict.getType('sys_yes_no')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -52,8 +52,9 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:config:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:config:remove')}]];
var editFlag = [[${@permission.hasPermi('system:config:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:config:remove')}]];
var datas = [[${@dict.getType('sys_yes_no')}]];
var prefix = ctx + "system/config"
$(function() {
@ -92,11 +93,7 @@
title: '系统内置',
align: 'center',
formatter: function(value, row, index) {
if (value == 'Y') {
return '<span class="badge badge-primary">是</span>';
} else if (value == 'N') {
return '<span class="badge badge-danger">否</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

4
src/main/resources/templates/system/config/edit.html
View File

@ -26,7 +26,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">系统内置：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_yes_no')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_yes_no')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="configType" th:value="${dict['dictValue']}" th:field="*{configType}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -86,7 +86,7 @@
}
},
submitHandler: function(form) {
$.operate.save(prefix + "/save", $('#form-config-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-config-edit').serialize());
}
});
</script>

4
src/main/resources/templates/system/dept/add.html
View File

@ -44,7 +44,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -94,7 +94,7 @@
}
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dept-add').serialize());
$.operate.save(prefix + "/add", $('#form-dept-add').serialize());
}
});

15
src/main/resources/templates/system/dept/dept.html
View File

@ -14,7 +14,7 @@
部门名称：<input type="text" name="deptName"/>
</li>
<li>
部门状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
部门状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -39,9 +39,10 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var addFlag = [[${@permissionService.hasPermi('system:dept:add')}]];
var editFlag = [[${@permissionService.hasPermi('system:dept:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:dept:remove')}]];
var addFlag = [[${@permission.hasPermi('system:dept:add')}]];
var editFlag = [[${@permission.hasPermi('system:dept:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:dept:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/dept"
window.onload = function() {
@ -71,11 +72,7 @@
title: '状态',
align: "center",
formatter: function(item, index) {
if (item.status == '0') {
return '<span class="badge badge-primary">正常</span>';
} else if (item.status == '1') {
return '<span class="badge badge-danger">停用</span>';
}
return $.table.selectDictLabel(datas, item.status);
}
},
{

4
src/main/resources/templates/system/dept/edit.html
View File

@ -45,7 +45,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -97,7 +97,7 @@
}
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dept-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-dept-edit').serialize());
}
});

12
src/main/resources/templates/system/dict/data/add.html
View File

@ -29,9 +29,15 @@
<input class="form-control" type="text" id="cssClass" name="cssClass">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">回显样式：</label>
<div class="col-sm-8">
<input class="form-control" type="text" id="listClass" name="listClass">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">系统默认：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_yes_no')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_yes_no')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="isDefault" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -46,7 +52,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -86,7 +92,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dict-add').serialize());
$.operate.save(prefix + "/add", $('#form-dict-add').serialize());
}
});
</script>

13
src/main/resources/templates/system/dict/data/data.html
View File

@ -20,7 +20,7 @@
字典标签：<input type="text" name="dictLabel"/>
</li>
<li>
数据状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
数据状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -51,8 +51,9 @@
<div th:include="include :: footer"></div>
<script th:src="@{/ajax/libs/select/select2.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:dict:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:dict:remove')}]];
var editFlag = [[${@permission.hasPermi('system:dict:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:dict:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/dict/data"
$(function() {
@ -92,11 +93,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">停用</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

12
src/main/resources/templates/system/dict/data/edit.html
View File

@ -30,9 +30,15 @@
<input class="form-control" type="text" id="cssClass" name="cssClass" th:field="*{cssClass}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">回显样式：</label>
<div class="col-sm-8">
<input class="form-control" type="text" id="listClass" name="listClass" th:field="*{listClass}">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">系统默认：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_yes_no')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_yes_no')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="isDefault" th:value="${dict['dictValue']}" th:field="*{isDefault}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -47,7 +53,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -87,7 +93,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dict-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-dict-edit').serialize());
}
});
</script>

4
src/main/resources/templates/system/dict/type/add.html
View File

@ -19,7 +19,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -75,7 +75,7 @@
}
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dict-add').serialize());
$.operate.save(prefix + "/add", $('#form-dict-add').serialize());
}
});
</script>

4
src/main/resources/templates/system/dict/type/edit.html
View File

@ -20,7 +20,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -79,7 +79,7 @@
}
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-dict-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-dict-edit').serialize());
}
});
</script>

15
src/main/resources/templates/system/dict/type/type.html
View File

@ -18,7 +18,7 @@
字典类型：<input type="text" name="dictType"/>
</li>
<li>
字典状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
字典状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -54,9 +54,10 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:dict:edit')}]];
var listFlag = [[${@permissionService.hasPermi('system:dict:list')}]];
var removeFlag = [[${@permissionService.hasPermi('system:dict:remove')}]];
var editFlag = [[${@permission.hasPermi('system:dict:edit')}]];
var listFlag = [[${@permission.hasPermi('system:dict:list')}]];
var removeFlag = [[${@permission.hasPermi('system:dict:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/dict"
$(function() {
@ -96,11 +97,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">停用</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

4
src/main/resources/templates/system/menu/add.html
View File

@ -58,7 +58,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">菜单状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_show_hide')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_show_hide')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="visible" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -107,7 +107,7 @@
}
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-menu-add').serialize());
$.operate.save(prefix + "/add", $('#form-menu-add').serialize());
}
});

4
src/main/resources/templates/system/menu/edit.html
View File

@ -59,7 +59,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">菜单状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_show_hide')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_show_hide')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="visible" th:value="${dict['dictValue']}" th:field="*{visible}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -117,7 +117,7 @@
}
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-menu-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-menu-edit').serialize());
}
});

15
src/main/resources/templates/system/menu/menu.html
View File

@ -14,7 +14,7 @@
菜单名称：<input type="text" name="menuName"/>
</li>
<li>
菜单状态：<select name="visible" th:with="type=${@dictService.selectDictData('sys_show_hide')}">
菜单状态：<select name="visible" th:with="type=${@dict.getType('sys_show_hide')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -40,9 +40,10 @@
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var addFlag = [[${@permissionService.hasPermi('system:menu:add')}]];
var editFlag = [[${@permissionService.hasPermi('system:menu:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:menu:remove')}]];
var addFlag = [[${@permission.hasPermi('system:menu:add')}]];
var editFlag = [[${@permission.hasPermi('system:menu:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:menu:remove')}]];
var datas = [[${@dict.getType('sys_show_hide')}]];
var prefix = ctx + "system/menu"
window.onload = function() {
@ -106,11 +107,7 @@
width: '10%',
align: "center",
formatter: function(row, index) {
if (row.visible == 0) {
return '<span class="badge badge-primary">显示</span>';
} else if (row.visible == 1) {
return '<span class="badge badge-danger">隐藏</span>';
}
return $.table.selectDictLabel(datas, row.visible);
}
},
{

6
src/main/resources/templates/system/notice/add.html
View File

@ -16,7 +16,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">公告类型：</label>
<div class="col-sm-8">
<select name="noticeType" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_notice_type')}">
<select name="noticeType" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_type')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
</select>
</div>
@ -30,7 +30,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">公告状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_notice_status')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_notice_status')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -65,7 +65,7 @@
submitHandler: function(form) {
var sHTML = $('.summernote').code();
$("#noticeContent").val(sHTML);
$.operate.save(prefix + "/save", $('#form-notice-add').serialize());
$.operate.save(prefix + "/add", $('#form-notice-add').serialize());
}
});
</script>

6
src/main/resources/templates/system/notice/edit.html
View File

@ -17,7 +17,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">公告类型：</label>
<div class="col-sm-8">
<select name="noticeType" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_notice_type')}">
<select name="noticeType" class="form-control m-b" th:with="type=${@dict.getType('sys_notice_type')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{noticeType}"></option>
</select>
</div>
@ -31,7 +31,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">公告状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_notice_status')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_notice_status')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -69,7 +69,7 @@
submitHandler: function(form) {
var sHTML = $('.summernote').code();
$("#noticeContent").val(sHTML);
$.operate.save(prefix + "/save", $('#form-notice-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-notice-edit').serialize());
}
});
</script>

20
src/main/resources/templates/system/notice/notice.html
View File

@ -17,7 +17,7 @@
操作人员：<input type="text" name="createBy"/>
</li>
<li>
公告类型：<select name="noticeType" th:with="type=${@dictService.selectDictData('sys_notice_type')}">
公告类型：<select name="noticeType" th:with="type=${@dict.getType('sys_notice_type')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -46,8 +46,10 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:notice:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:notice:remove')}]];
var editFlag = [[${@permission.hasPermi('system:notice:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:notice:remove')}]];
var types = [[${@dict.getType('sys_notice_type')}]];
var datas = [[${@dict.getType('sys_notice_status')}]];
var prefix = ctx + "system/notice"
$(function() {
@ -74,11 +76,7 @@
title: '公告类型',
align: 'center',
formatter: function(value, row, index) {
if (value == '1') {
return '<span class="label label-warning">通知</span>';
} else if (value == '2') {
return '<span class="badge badge-success">公告</span>';
}
return $.table.selectDictLabel(types, value);
}
},
{
@ -86,11 +84,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == '0') {
return '<span class="badge badge-primary">正常</span>';
} else if (value == '1') {
return '<span class="badge badge-danger">关闭</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

4
src/main/resources/templates/system/post/add.html
View File

@ -25,7 +25,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">岗位状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -64,7 +64,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-post-add').serialize());
$.operate.save(prefix + "/add", $('#form-post-add').serialize());
}
});
</script>

4
src/main/resources/templates/system/post/edit.html
View File

@ -26,7 +26,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">岗位状态：</label>
<div class="col-sm-8" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
@ -65,7 +65,7 @@
},
},
submitHandler:function(form){
$.operate.save(prefix + "/save", $('#form-post-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-post-edit').serialize());
}
});
</script>

13
src/main/resources/templates/system/post/post.html
View File

@ -18,7 +18,7 @@
岗位名称：<input type="text" name="postName"/>
</li>
<li>
岗位状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
岗位状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -48,8 +48,9 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:post:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:post:remove')}]];
var editFlag = [[${@permission.hasPermi('system:post:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:post:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/post"
$(function() {
@ -90,11 +91,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">停用</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

2
src/main/resources/templates/system/role/add.html
View File

@ -137,7 +137,7 @@
$.ajax({
cache : true,
type : "POST",
url : ctx + "system/role/save",
url : ctx + "system/role/add",
data : {
"roleName": roleName,
"roleKey": roleKey,

2
src/main/resources/templates/system/role/edit.html
View File

@ -142,7 +142,7 @@
$.ajax({
cache : true,
type : "POST",
url : ctx + "system/role/save",
url : ctx + "system/role/edit",
data : {
"roleId": roleId,
"roleName": roleName,

14
src/main/resources/templates/system/role/role.html
View File

@ -18,7 +18,7 @@
权限字符：<input type="text" name="roleKey"/>
</li>
<li>
角色状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
角色状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -54,9 +54,11 @@
</div>
<div th:include="include :: footer"></div>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:role:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:role:remove')}]];
var editFlag = [[${@permission.hasPermi('system:role:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:role:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/role"
$(function() {
var options = {
@ -96,11 +98,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == 0) {
return '<span class="badge badge-primary">正常</span>';
} else if (value == 1) {
return '<span class="badge badge-danger">停用</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

6
src/main/resources/templates/system/user/add.html
View File

@ -28,7 +28,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">密码：</label>
<div class="col-sm-8">
<input class="form-control" type="password" name="password" id="password" th:value="${@configService.selectConfigByKey('sys.user.initPassword')}">
<input class="form-control" type="password" name="password" id="password" th:value="${@config.getKey('sys.user.initPassword')}">
</div>
</div>
<div class="form-group">
@ -46,7 +46,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_user_sex')}">
<select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
</select>
</div>
@ -193,7 +193,7 @@
$.ajax({
cache : true,
type : "POST",
url : ctx + "system/user/save",
url : ctx + "system/user/add",
data : {
"userId": userId,
"deptId": deptId,

4
src/main/resources/templates/system/user/edit.html
View File

@ -41,7 +41,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_user_sex')}">
<select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{sex}"></option>
</select>
</div>
@ -165,7 +165,7 @@
$.ajax({
cache : true,
type : "POST",
url : ctx + "system/user/save",
url : ctx + "system/user/edit",
data : {
"userId": userId,
"deptId": deptId,

2
src/main/resources/templates/system/user/profile/profile.html
View File

@ -44,7 +44,7 @@
<p><i class="fa fa-user"></i> [[${user.userName}]] / [[${#strings.defaultString(roleGroup,'无角色')}]]
<p><i class="fa fa-phone"></i> [[${user.phonenumber}]]</p>
<p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p>
<p><i class="fa fa-transgender"></i> [[${user.sex}]]</p>
<p><i class="fa fa-transgender"></i> 性别：[[${user.sex}]]</p>
<p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p>
<p><i class="fa fa-calendar"></i> [[${#dates.format(user.createTime, 'yyyy-MM-dd HH:mm:ss')}]]</p>
</div>

15
src/main/resources/templates/system/user/user.html
View File

@ -43,7 +43,7 @@
手机号码：<input type="text" name="phonenumber"/>
</li>
<li>
用户状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@ -81,9 +81,10 @@
<script th:src="@{/ajax/libs/jquery-layout/jquery.layout-latest.js}"></script>
<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:user:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:user:remove')}]];
var resetPwdFlag = [[${@permissionService.hasPermi('system:user:resetPwd')}]];
var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/user"
$(document).ready(function(){
@ -138,11 +139,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == '0') {
return '<span class="badge badge-primary">正常</span>';
} else if (value == '1') {
return '<span class="badge badge-danger">停用</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{

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

@ -33,7 +33,7 @@
},
},
submitHandler: function(form) {
$.operate.save(prefix + "/save", $('#form-${classname}-add').serialize());
$.operate.save(prefix + "/add", $('#form-${classname}-add').serialize());
}
});
</script>

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

@ -34,7 +34,7 @@
},
},
submitHandler: function(form) {
$.operate.save(prefix + "/save", $('#form-${classname}-edit').serialize());
$.operate.save(prefix + "/edit", $('#form-${classname}-edit').serialize());
}
});
</script>

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

@ -4,7 +4,7 @@ import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@ -56,41 +56,45 @@ public class ${className}Controller extends BaseController
/**
* 新增${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:add")
@Log(title = "${tableComment}", action = BusinessType.INSERT)
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
* 新增保存${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:add")
@Log(title = "${tableComment}", action = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(${className} ${classname})
{
return toAjax(${classname}Service.insert${className}(${classname}));
}
/**
* 修改${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:edit")
@Log(title = "${tableComment}", action = BusinessType.UPDATE)
@GetMapping("/edit/{${primaryKey.attrname}}")
public String edit(@PathVariable("${primaryKey.attrname}") ${primaryKey.attrType} ${primaryKey.attrname}, Model model)
public String edit(@PathVariable("${primaryKey.attrname}") ${primaryKey.attrType} ${primaryKey.attrname}, ModelMap mmap)
{
${className} ${classname} = ${classname}Service.select${className}ById(${primaryKey.attrname});
model.addAttribute("${classname}", ${classname});
mmap.put("${classname}", ${classname});
return prefix + "/edit";
}
/**
* 保存${tableComment}
* 修改保存${tableComment}
*/
@RequiresPermissions("${moduleName}:${classname}:save")
@Log(title = "${tableComment}", action = BusinessType.SAVE)
@PostMapping("/save")
@RequiresPermissions("${moduleName}:${classname}:edit")
@Log(title = "${tableComment}", action = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult save(${className} ${classname})
{
if (${classname}Service.save${className}(${classname}) > 0)
{
return success();
}
return error();
public AjaxResult editSave(${className} ${classname})
{
return toAjax(${classname}Service.update${className}(${classname}));
}
/**
@ -101,13 +105,8 @@ public class ${className}Controller extends BaseController
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
int rows = ${classname}Service.delete${className}ByIds(ids);
if (rows > 0)
{
return success();
}
return error();
{
return toAjax(${classname}Service.delete${className}ByIds(ids));
}
}

11
src/main/resources/templates/vm/java/Service.java.vm
View File

@ -42,16 +42,7 @@ public interface I${className}Service
* @return 结果
*/
public int update${className}(${className} ${classname});
/**
* 保存${tableComment}
*
* @param ${classname} ${tableComment}信息
* @return 结果
*/
public int save${className}(${className} ${classname});
/**
* 删除${tableComment}信息
*

25
src/main/resources/templates/vm/java/ServiceImpl.java.vm
View File

@ -3,7 +3,6 @@ package ${package}.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.StringUtils;
import ${package}.mapper.${className}Mapper;
import ${package}.domain.${className};
import ${package}.service.I${className}Service;
@ -68,29 +67,7 @@ public class ${className}ServiceImpl implements I${className}Service
{
return ${classname}Mapper.update${className}(${classname});
}
/**
* 保存${tableComment}
*
* @param ${classname} ${tableComment}信息
* @return 结果
*/
@Override
public int save${className}(${className} ${classname})
{
${primaryKey.attrType} ${primaryKey.attrname} = ${classname}.get${primaryKey.attrName}();
int rows = 0;
if (StringUtils.isNotNull(${primaryKey.attrname}))
{
rows = ${classname}Mapper.update${className}(${classname});
}
else
{
rows = ${classname}Mapper.insert${className}(${classname});
}
return rows;
}
/**
* 删除${tableComment}对象
*

3
src/main/resources/templates/vm/sql/sql.vm
View File

@ -17,6 +17,3 @@ values('${tableComment}修改', @parentId, '3', '#', 'F', '0', '${moduleName}:
insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
values('${tableComment}删除', @parentId, '4', '#', 'F', '0', '${moduleName}:${classname}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
values('${tableComment}保存', @parentId, '5', '#', 'F', '0', '${moduleName}:${classname}:save', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');