blog/blog-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

操作日志列表新增IP地址查询

Browse Source
This commit is contained in:
dataprince 2023-10-21 11:54:15 +08:00
parent f6626d7a30
commit 92189d68c8
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -117,7 +117,7 @@ management:
--- # 监控中心客户端配置 --- # 监控中心客户端配置
spring.boot.admin.client: spring.boot.admin.client:
# 增加客户端开关 # 增加客户端开关
enabled: true enabled: false
url: http://localhost:9090/admin url: http://localhost:9090/admin
instance: instance:
service-host-type: IP service-host-type: IP
@ -128,7 +128,7 @@ spring.boot.admin.client:
powerjob: powerjob:
worker: worker:
# 如何开启调度中心请查看文档教程 # 如何开启调度中心请查看文档教程
enabled: true enabled: false
# 需要先在 powerjob 登录页执行应用注册后才能使用 # 需要先在 powerjob 登录页执行应用注册后才能使用
app-name: ruoyi-worker app-name: ruoyi-worker
# 28080 端口 随着主应用端口飘逸 避免集群冲突 # 28080 端口 随着主应用端口飘逸 避免集群冲突

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
View File

@ -86,14 +86,18 @@ public class SysOperLogServiceImpl extends BaseServiceImpl<SysOperLogMapper, Sys
queryWrapper.and(SYS_OPER_LOG.BUSINESS_TYPE.in(Arrays.asList(operLogBo.getBusinessTypes()))); queryWrapper.and(SYS_OPER_LOG.BUSINESS_TYPE.in(Arrays.asList(operLogBo.getBusinessTypes())));
} }
if (ObjectUtil.isNotNull(operLogBo.getStatus())) { if (StringUtils.isNotNull(operLogBo.getStatus())) {
queryWrapper.and(SYS_OPER_LOG.STATUS.eq(operLogBo.getStatus())); queryWrapper.and(SYS_OPER_LOG.STATUS.eq(operLogBo.getStatus()));
} }
if (ObjectUtil.isNotNull(operLogBo.getOperName())) { if (StringUtils.isNotNull(operLogBo.getOperName())) {
queryWrapper.and(SYS_OPER_LOG.OPER_NAME.eq(operLogBo.getOperName())); queryWrapper.and(SYS_OPER_LOG.OPER_NAME.eq(operLogBo.getOperName()));
} }
if (StringUtils.isNotEmpty(operLogBo.getOperIp())) {
queryWrapper.and(SYS_OPER_LOG.OPER_IP.eq(operLogBo.getOperIp()));
}
Map<String, Object> params = operLogBo.getParams(); Map<String, Object> params = operLogBo.getParams();
if (params.get("beginTime") != null && params.get("endTime") != null) { if (params.get("beginTime") != null && params.get("endTime") != null) {
queryWrapper.and(SYS_OPER_LOG.OPER_TIME.between(params.get("beginTime"), params.get("endTime"))); queryWrapper.and(SYS_OPER_LOG.OPER_TIME.between(params.get("beginTime"), params.get("endTime")));

3
ruoyi-ui/src/views/monitor/operlog/index.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="操作地址" prop="operIp">
<el-input v-model="queryParams.operIp" placeholder="请输入操作地址" clearable style="width: 240px;" @keyup.enter="handleQuery"/>
</el-form-item>
<el-form-item label="系统模块" prop="title"> <el-form-item label="系统模块" prop="title">
<el-input <el-input
v-model="queryParams.title" v-model="queryParams.title"