gitee/snowy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【新增】日志列表界面增加时间段查询

Browse Source
This commit is contained in:
俞宝山 2021-01-04 22:46:04 +08:00
parent 25fe5d190a
commit 1c78c52f75
4 changed files with 79 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
_web/src/views/system/log/oplog/index.vue
View File

@ -9,9 +9,11 @@
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-select v-model="queryParam.opType" allow-clear placeholder="请选择操作类型" >
<a-select-option v-for="(item,index) in opTypeDict" :key="index" :value="item.code" >{{ item.value }}</a-select-option>
</a-select>
<a-form-item label="操作类型">
<a-select v-model="queryParam.opType" allow-clear placeholder="请选择操作类型" >
<a-select-option v-for="(item,index) in opTypeDict" :key="index" :value="item.code" >{{ item.value }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<template v-if="advanced">
<a-col :md="8" :sm="24">
@ -21,6 +23,18 @@
</a-select>
</a-form-item>
</a-col>
<a-col :md="10" :sm="24">
<a-form-item label="操作时间">
<a-range-picker
v-model="queryParam.dates"
:show-time="{
hideDisabledOptions: true,
defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
}"
format="YYYY-MM-DD HH:mm:ss"
/>
</a-form-item>
</a-col>
</template>
<a-col :md="!advanced && 8 || 24" :sm="24">
<span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
@ -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
},
/**
* 获取字典数据
*/

33
_web/src/views/system/log/vislog/index.vue
View File

@ -23,6 +23,18 @@
</a-select>
</a-form-item>
</a-col>
<a-col :md="10" :sm="24">
<a-form-item label="访问时间">
<a-range-picker
v-model="queryParam.dates"
:show-time="{
hideDisabledOptions: true,
defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
}"
format="YYYY-MM-DD HH:mm:ss"
/>
</a-form-item>
</a-col>
</template>
<a-col :md="!advanced && 8 || 24" :sm="24">
<span class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
@ -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
},
/**
* 清空日志
*/

5
xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java
View File

@ -68,6 +68,11 @@ public class SysOpLogServiceImpl extends ServiceImpl<SysOpLogMapper, SysOpLog> 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<SysOpLog> page = this.page(PageFactory.defaultPage(), queryWrapper);
return new PageResult<>(page);

5
xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java
View File

@ -61,6 +61,11 @@ public class SysVisLogServiceImpl extends ServiceImpl<SysVisLogMapper, SysVisLog
if (ObjectUtil.isNotEmpty(sysVisLogParam.getSuccess())) {
queryWrapper.eq(SysVisLog::getSuccess, sysVisLogParam.getSuccess());
}
// 根据时间范围查询
if (ObjectUtil.isAllNotEmpty(sysVisLogParam.getSearchBeginTime(), sysVisLogParam.getSearchEndTime())) {
queryWrapper.apply("date_format (vis_time,'%Y-%m-%d') >= 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));
}