From 1c78c52f75a0cba71f9246ba79da21481ed476af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E5=AE=9D=E5=B1=B1?= <1253070437@qq.com> Date: Mon, 4 Jan 2021 22:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _web/src/views/system/log/oplog/index.vue | 41 +++++++++++++++++-- _web/src/views/system/log/vislog/index.vue | 33 ++++++++++++++- .../log/service/impl/SysOpLogServiceImpl.java | 5 +++ .../service/impl/SysVisLogServiceImpl.java | 5 +++ 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/_web/src/views/system/log/oplog/index.vue b/_web/src/views/system/log/oplog/index.vue index a00f1b0a..53fd8199 100644 --- a/_web/src/views/system/log/oplog/index.vue +++ b/_web/src/views/system/log/oplog/index.vue @@ -9,9 +9,11 @@ - - {{ item.value }} - + + + {{ item.value }} + + @@ -78,6 +92,7 @@ import { sysOpLogPage, sysOpLogDelete } from '@/api/modular/system/logManage' import detailsOplog from './details' import { sysDictTypeDropDown } from '@/api/modular/system/dictManage' + import moment from 'moment' export default { components: { STable, @@ -133,7 +148,7 @@ ], // 加载数据方法 必须为 Promise 对象 loadData: parameter => { - return sysOpLogPage(Object.assign(parameter, this.queryParam)).then((res) => { + return sysOpLogPage(Object.assign(parameter, this.switchingDate())).then((res) => { return res.data }) }, @@ -148,6 +163,7 @@ this.sysDictTypeDropDown() }, methods: { + moment, opTypeFilter (opType) { // eslint-disable-next-line eqeqeq const values = this.opTypeDict.filter(item => item.code == opType) @@ -162,6 +178,23 @@ return values[0].value } }, + /** + * 查询参数组装 + */ + switchingDate () { + const dates = this.queryParam.dates + if (dates != null) { + this.queryParam.searchBeginTime = moment(dates[0]).format('YYYY-MM-DD HH:mm:ss') + this.queryParam.searchEndTime = moment(dates[1]).format('YYYY-MM-DD HH:mm:ss') + if (dates.length < 1) { + delete this.queryParam.searchBeginTime + delete this.queryParam.searchEndTime + } + } + const obj = JSON.parse(JSON.stringify(this.queryParam)) + delete obj.dates + return obj + }, /** * 获取字典数据 */ diff --git a/_web/src/views/system/log/vislog/index.vue b/_web/src/views/system/log/vislog/index.vue index fba9d8ff..6df99e7e 100644 --- a/_web/src/views/system/log/vislog/index.vue +++ b/_web/src/views/system/log/vislog/index.vue @@ -23,6 +23,18 @@ + + + + + @@ -77,6 +89,7 @@ import { sysVisLogPage, sysVisLogDelete } from '@/api/modular/system/logManage' import detailsVislog from './details' import { sysDictTypeDropDown } from '@/api/modular/system/dictManage' + import moment from 'moment' export default { components: { STable, @@ -131,7 +144,7 @@ ], // 加载数据方法 必须为 Promise 对象 loadData: parameter => { - return sysVisLogPage(Object.assign(parameter, this.queryParam)).then((res) => { + return sysVisLogPage(Object.assign(parameter, this.switchingDate())).then((res) => { return res.data }) }, @@ -149,6 +162,7 @@ this.sysDictTypeDropDown() }, methods: { + moment, visTypeFilter (visType) { // eslint-disable-next-line eqeqeq const values = this.visTypeDict.filter(item => item.code == visType) @@ -174,6 +188,23 @@ this.successDict = res.data }) }, + /** + * 查询参数组装 + */ + switchingDate () { + const dates = this.queryParam.dates + if (dates != null) { + this.queryParam.searchBeginTime = moment(dates[0]).format('YYYY-MM-DD HH:mm:ss') + this.queryParam.searchEndTime = moment(dates[1]).format('YYYY-MM-DD HH:mm:ss') + if (dates.length < 1) { + delete this.queryParam.searchBeginTime + delete this.queryParam.searchEndTime + } + } + const obj = JSON.parse(JSON.stringify(this.queryParam)) + delete obj.dates + return obj + }, /** * 清空日志 */ diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java index 6b24d7ba..460c3e25 100644 --- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java +++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java @@ -68,6 +68,11 @@ public class SysOpLogServiceImpl extends ServiceImpl i if (ObjectUtil.isNotEmpty(sysOpLogParam.getSuccess())) { queryWrapper.eq(SysOpLog::getSuccess, sysOpLogParam.getSuccess()); } + // 根据时间范围查询 + if (ObjectUtil.isAllNotEmpty(sysOpLogParam.getSearchBeginTime(), sysOpLogParam.getSearchEndTime())) { + queryWrapper.apply("date_format (op_time,'%Y-%m-%d') >= date_format('" + sysOpLogParam.getSearchBeginTime() + "','%Y-%m-%d')") + .apply("date_format (op_time,'%Y-%m-%d') <= date_format('" + sysOpLogParam.getSearchEndTime() + "','%Y-%m-%d')"); + } } Page page = this.page(PageFactory.defaultPage(), queryWrapper); return new PageResult<>(page); diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java index e8f95900..226693c4 100644 --- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java +++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java @@ -61,6 +61,11 @@ public class SysVisLogServiceImpl extends ServiceImpl= date_format('" + sysVisLogParam.getSearchBeginTime() + "','%Y-%m-%d')") + .apply("date_format (vis_time,'%Y-%m-%d') <= date_format('" + sysVisLogParam.getSearchEndTime() + "','%Y-%m-%d')"); + } } return new PageResult<>(this.page(PageFactory.defaultPage(), queryWrapper)); }