From bc28357a804ced8dd41c06bddf18060199f19d22 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 3 Oct 2018 17:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=85=E7=A9=BA=EF=BC=88?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=81=E6=93=8D=E4=BD=9C=E3=80=81=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=EF=BC=89=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/{ry_20181001.sql => ry_20181008.sql} | 19 +++++----- .../aspectj/lang/enums/BusinessType.java | 5 +++ .../job/controller/JobLogController.java | 10 +++++ .../monitor/job/mapper/JobLogMapper.java | 5 +++ .../monitor/job/service/IJobLogService.java | 7 +++- .../job/service/JobLogServiceImpl.java | 9 +++++ .../controller/LogininforController.java | 10 +++++ .../logininfor/mapper/LogininforMapper.java | 5 +++ .../service/ILogininforService.java | 5 +++ .../service/LogininforServiceImpl.java | 9 +++++ .../operlog/controller/OperlogController.java | 10 +++++ .../monitor/operlog/mapper/OperLogMapper.java | 5 +++ .../operlog/service/IOperLogService.java | 5 +++ .../operlog/service/OperLogServiceImpl.java | 9 +++++ .../mybatis/monitor/JobLogMapper.xml | 4 ++ .../mybatis/monitor/LogininforMapper.xml | 4 ++ .../mybatis/monitor/OperLogMapper.xml | 4 ++ src/main/resources/static/ruoyi/js/common.js | 5 +++ src/main/resources/static/ruoyi/js/ry-ui.js | 7 ++++ src/main/resources/templates/include.html | 4 +- src/main/resources/templates/index.html | 4 +- src/main/resources/templates/login.html | 4 +- src/main/resources/templates/main.html | 37 ++++++++++++++++--- .../resources/templates/monitor/job/job.html | 12 +++--- .../templates/monitor/job/jobLog.html | 14 ++++--- .../monitor/logininfor/logininfor.html | 11 ++++-- .../templates/monitor/online/online.html | 6 +-- .../templates/monitor/operlog/operlog.html | 12 ++++-- .../templates/system/config/config.html | 10 ++--- .../resources/templates/system/dept/dept.html | 6 +-- .../templates/system/dict/data/data.html | 10 ++--- .../templates/system/dict/type/type.html | 10 ++--- .../resources/templates/system/menu/menu.html | 6 +-- .../templates/system/notice/notice.html | 8 ++-- .../resources/templates/system/post/post.html | 8 ++-- .../resources/templates/system/role/role.html | 10 ++--- .../resources/templates/system/user/user.html | 10 ++--- .../resources/templates/tool/gen/gen.html | 4 +- 38 files changed, 240 insertions(+), 83 deletions(-) rename sql/{ry_20181001.sql => ry_20181008.sql} (98%) diff --git a/sql/ry_20181001.sql b/sql/ry_20181008.sql similarity index 98% rename from sql/ry_20181001.sql rename to sql/ry_20181008.sql index 81d0db12..783c0339 100644 --- a/sql/ry_20181001.sql +++ b/sql/ry_20181008.sql @@ -479,15 +479,16 @@ insert into sys_dict_data values(13, 2, '公告', '2', 'sys_notice_type', insert into sys_dict_data values(14, 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态'); insert into sys_dict_data values(15, 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '关闭状态'); insert into sys_dict_data values(16, 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作'); -insert into sys_dict_data values(17, 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作'); -insert into sys_dict_data values(18, 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作'); -insert into sys_dict_data values(19, 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作'); -insert into sys_dict_data values(20, 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作'); -insert into sys_dict_data values(21, 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作'); -insert into sys_dict_data values(22, 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作'); -insert into sys_dict_data values(23, 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '新增操作'); -insert into sys_dict_data values(24, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态'); -insert into sys_dict_data values(25, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '停用状态'); +insert into sys_dict_data values(17, 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '修改操作'); +insert into sys_dict_data values(18, 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '删除操作'); +insert into sys_dict_data values(19, 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '授权操作'); +insert into sys_dict_data values(20, 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '导出操作'); +insert into sys_dict_data values(21, 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '导入操作'); +insert into sys_dict_data values(22, 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '强退操作'); +insert into sys_dict_data values(23, 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '生成操作'); +insert into sys_dict_data values(24, 8, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '清空操作'); +insert into sys_dict_data values(25, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '正常状态'); +insert into sys_dict_data values(26, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '停用状态'); -- ---------------------------- diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java b/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java index dbc027ed..e140d614 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java +++ b/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java @@ -52,4 +52,9 @@ public enum BusinessType * 生成代码 */ GENCODE, + + /** + * 清空数据 + */ + CLEAN, } diff --git a/src/main/java/com/ruoyi/project/monitor/job/controller/JobLogController.java b/src/main/java/com/ruoyi/project/monitor/job/controller/JobLogController.java index aed1402b..9f0ea54b 100644 --- a/src/main/java/com/ruoyi/project/monitor/job/controller/JobLogController.java +++ b/src/main/java/com/ruoyi/project/monitor/job/controller/JobLogController.java @@ -67,4 +67,14 @@ public class JobLogController extends BaseController { return toAjax(jobLogService.deleteJobLogByIds(ids)); } + + @Log(title = "调度日志", businessType = BusinessType.CLEAN) + @RequiresPermissions("monitor:job:remove") + @PostMapping("/clean") + @ResponseBody + public AjaxResult clean() + { + jobLogService.cleanJobLog(); + return success(); + } } diff --git a/src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java b/src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java index 76b6b2f5..7a3fb4e5 100644 --- a/src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java +++ b/src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java @@ -50,5 +50,10 @@ public interface JobLogMapper * @return 结果 */ public int deleteJobLogById(Long jobId); + + /** + * 清空任务日志 + */ + public void cleanJobLog(); } diff --git a/src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java b/src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java index ce38bb46..401ae402 100644 --- a/src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java +++ b/src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java @@ -49,5 +49,10 @@ public interface IJobLogService * @return 结果 */ public int deleteJobLogById(Long jobId); - + + /** + * 清空任务日志 + */ + public void cleanJobLog(); + } diff --git a/src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java index 44e61266..8abd6ed6 100644 --- a/src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java @@ -76,5 +76,14 @@ public class JobLogServiceImpl implements IJobLogService { return jobLogMapper.deleteJobLogById(jobId); } + + /** + * 清空任务日志 + */ + @Override + public void cleanJobLog() + { + jobLogMapper.cleanJobLog(); + } } diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java b/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java index 27a3e410..10c03c9c 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java @@ -67,4 +67,14 @@ public class LogininforController extends BaseController { return toAjax(logininforService.deleteLogininforByIds(ids)); } + + @RequiresPermissions("monitor:logininfor:remove") + @Log(title = "登陆日志", businessType = BusinessType.CLEAN) + @PostMapping("/clean") + @ResponseBody + public AjaxResult clean() + { + logininforService.cleanLogininfor(); + return success(); + } } diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/mapper/LogininforMapper.java b/src/main/java/com/ruoyi/project/monitor/logininfor/mapper/LogininforMapper.java index 8217c201..50c2995d 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/mapper/LogininforMapper.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/mapper/LogininforMapper.java @@ -32,4 +32,9 @@ public interface LogininforMapper * @return */ public int deleteLogininforByIds(String[] ids); + + /** + * 清空系统登录日志 + */ + public int cleanLogininfor(); } diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java index 3ec08cfc..fee7d212 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java @@ -33,4 +33,9 @@ public interface ILogininforService * @return */ public int deleteLogininforByIds(String ids); + + /** + * 清空系统登录日志 + */ + public void cleanLogininfor(); } diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java index 35b2bf18..fc1b197b 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java @@ -53,4 +53,13 @@ public class LogininforServiceImpl implements ILogininforService { return logininforMapper.deleteLogininforByIds(Convert.toStrArray(ids)); } + + /** + * 清空系统登录日志 + */ + @Override + public void cleanLogininfor() + { + logininforMapper.cleanLogininfor(); + } } diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java b/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java index 773022e0..1294db42 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java @@ -76,4 +76,14 @@ public class OperlogController extends BaseController mmap.put("operLog", operLogService.selectOperLogById(deptId)); return prefix + "/detail"; } + + @Log(title = "操作日志", businessType = BusinessType.CLEAN) + @RequiresPermissions("monitor:operlog:remove") + @PostMapping("/clean") + @ResponseBody + public AjaxResult clean() + { + operLogService.cleanOperLog(); + return success(); + } } diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/mapper/OperLogMapper.java b/src/main/java/com/ruoyi/project/monitor/operlog/mapper/OperLogMapper.java index 4759312e..7ffbe77c 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/mapper/OperLogMapper.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/mapper/OperLogMapper.java @@ -40,4 +40,9 @@ public interface OperLogMapper * @return 操作日志对象 */ public OperLog selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + public void cleanOperLog(); } diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java b/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java index 4725e1db..f4dcdff9 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java @@ -40,4 +40,9 @@ public interface IOperLogService * @return 操作日志对象 */ public OperLog selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + public void cleanOperLog(); } diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java index b2f01b98..21abb930 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java @@ -64,4 +64,13 @@ public class OperLogServiceImpl implements IOperLogService { return operLogMapper.selectOperLogById(operId); } + + /** + * 清空操作日志 + */ + @Override + public void cleanOperLog() + { + operLogMapper.cleanOperLog(); + } } diff --git a/src/main/resources/mybatis/monitor/JobLogMapper.xml b/src/main/resources/mybatis/monitor/JobLogMapper.xml index 073fc9b1..cd2d0704 100644 --- a/src/main/resources/mybatis/monitor/JobLogMapper.xml +++ b/src/main/resources/mybatis/monitor/JobLogMapper.xml @@ -62,6 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + truncate table sys_job_log + + insert into sys_job_log( job_log_id, diff --git a/src/main/resources/mybatis/monitor/LogininforMapper.xml b/src/main/resources/mybatis/monitor/LogininforMapper.xml index c45fcca4..de7634fa 100644 --- a/src/main/resources/mybatis/monitor/LogininforMapper.xml +++ b/src/main/resources/mybatis/monitor/LogininforMapper.xml @@ -48,5 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{infoId} + + + truncate table sys_logininfor + \ No newline at end of file diff --git a/src/main/resources/mybatis/monitor/OperLogMapper.xml b/src/main/resources/mybatis/monitor/OperLogMapper.xml index 5c770eb0..426a6543 100644 --- a/src/main/resources/mybatis/monitor/OperLogMapper.xml +++ b/src/main/resources/mybatis/monitor/OperLogMapper.xml @@ -63,5 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where oper_id = #{operId} + + + truncate table sys_oper_log + \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/js/common.js b/src/main/resources/static/ruoyi/js/common.js index da09e2f6..47403985 100644 --- a/src/main/resources/static/ruoyi/js/common.js +++ b/src/main/resources/static/ruoyi/js/common.js @@ -81,6 +81,11 @@ $(function() { $.tree.searchNode(e); }).bind("input propertychange", $.tree.searchNode); } + // 复选框后按钮样式状态变更 + $("#bootstrap-table").on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", function () { + var ids = $("#bootstrap-table").bootstrapTable("getSelections"); + $('#toolbar .btn-del').toggleClass('disabled', !ids.length); + }); }); /** 创建选项卡 */ diff --git a/src/main/resources/static/ruoyi/js/ry-ui.js b/src/main/resources/static/ruoyi/js/ry-ui.js index 9a7268c7..99af28bf 100644 --- a/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/src/main/resources/static/ruoyi/js/ry-ui.js @@ -425,6 +425,13 @@ $.operate.submit(url, "post", "json", data); }); }, + // 清空信息 + clean: function() { + $.modal.confirm("确定清空所有" + $.table._option.modalName + "吗？", function() { + var url = $.table._option.cleanUrl; + $.operate.submit(url, "post", "json", ""); + }); + }, // 添加信息 add: function(id) { var url = $.common.isEmpty(id) ? $.table._option.createUrl : $.table._option.createUrl.replace("{id}", id); diff --git a/src/main/resources/templates/include.html b/src/main/resources/templates/include.html index 04c0d061..7d7ee2fd 100644 --- a/src/main/resources/templates/include.html +++ b/src/main/resources/templates/include.html @@ -38,8 +38,8 @@ - - + + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index f5993e94..3a1baf66 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -15,7 +15,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 6636c458..641edd93 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -12,7 +12,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html index 5a763a05..daec243e 100644 --- a/src/main/resources/templates/main.html +++ b/src/main/resources/templates/main.html @@ -15,10 +15,12 @@
-
您是否需要自己做一款后台、会员中心等等的，但是又缺乏html等前端知识…。 -
您是否一直在苦苦寻找一款适合自己的后台主题… -
………… -

那么，现在若依来了。

+
+ 阿里云优惠活动（2CPU 4GRAM 1M带宽 40G高效云盘） +
https://promotion.aliyun.com/ntms/act/vm/aliyun-group/buy.html?group=BphATfDhsQ… +
云产品通用代金券，可叠加官网常规优惠使用 +
https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=brki8iof… +

限时活动推广。

@@ -94,13 +96,38 @@
+
+
+
+ v3.0.02018.10.08 +
+
+
+
+
    +
  1. 升级poi到最新版3.17
    2. +
  2. 导出修改临时目录绝对路径
    3. +
  3. 升级laydate升级到最新版5.0.9
    4. +
  4. 升级SpringBoot到最新版本2.0.5
    5. +
  5. 优化开始/结束时间校验限制
    6. +
  6. 重置密码参数表中获取默认值
    7. +
  7. 修复头像修改显示问题
    8. +
  8. 新增数据权限过滤注解
    9. +
  9. 新增表格检索折叠按钮
    10. +
  10. 新增清空（登录、操作、调度）日志
    11. +
  11. 部分细节调整优化
    12. +
  12. 项目采用分模块
    13. +
+
+
+
v2.4.02018.09.03
-
+
  1. 支持部门多级查询
    2. diff --git a/src/main/resources/templates/monitor/job/job.html b/src/main/resources/templates/monitor/job/job.html index ef9d7e00..73f7aa50 100644 --- a/src/main/resources/templates/monitor/job/job.html +++ b/src/main/resources/templates/monitor/job/job.html @@ -32,14 +32,14 @@
- - -