diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/LogService.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/LogService.java index 52cb7095..4b72467c 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/LogService.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/LogService.java @@ -43,7 +43,7 @@ public interface LogService { * 分页查询条件 * @return 操作日志分页信息 */ - PageDataVO list(OperationLogQuery query, PageQuery pageQuery); + PageDataVO page(OperationLogQuery query, PageQuery pageQuery); /** * 分页查询登录日志列表 @@ -54,7 +54,7 @@ public interface LogService { * 分页查询条件 * @return 登录日志分页信息 */ - PageDataVO list(LoginLogQuery query, PageQuery pageQuery); + PageDataVO page(LoginLogQuery query, PageQuery pageQuery); /** * 分页查询系统日志列表 @@ -65,7 +65,7 @@ public interface LogService { * 分页查询条件 * @return 系统日志分页信息 */ - PageDataVO list(SystemLogQuery query, PageQuery pageQuery); + PageDataVO page(SystemLogQuery query, PageQuery pageQuery); /** * 查看系统日志详情 @@ -74,5 +74,5 @@ public interface LogService { * 日志 ID * @return 系统日志详情 */ - SystemLogDetailVO detail(Long logId); + SystemLogDetailVO get(Long logId); } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java index 8a3c11fd..7302938f 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java @@ -69,7 +69,7 @@ public class LogServiceImpl implements LogService { } @Override - public PageDataVO list(OperationLogQuery query, PageQuery pageQuery) { + public PageDataVO page(OperationLogQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = QueryHelper.build(query); // 限定查询信息 @@ -93,7 +93,7 @@ public class LogServiceImpl implements LogService { } @Override - public PageDataVO list(LoginLogQuery query, PageQuery pageQuery) { + public PageDataVO page(LoginLogQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = QueryHelper.build(query); queryWrapper.lambda() .and(qw -> qw.like(LogDO::getRequestUrl, "/auth/login").or().like(LogDO::getRequestUrl, "/auth/logout")); @@ -114,7 +114,7 @@ public class LogServiceImpl implements LogService { } @Override - public PageDataVO list(SystemLogQuery query, PageQuery pageQuery) { + public PageDataVO page(SystemLogQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = QueryHelper.build(query); // 限定查询信息 @@ -133,7 +133,7 @@ public class LogServiceImpl implements LogService { } @Override - public SystemLogDetailVO detail(Long logId) { + public SystemLogDetailVO get(Long logId) { LogDO logDO = logMapper.selectById(logId); CheckUtils.throwIfNull(logDO, String.format("ID为 [%s] 的日志已不存在", logId)); diff --git a/continew-admin-ui/src/api/monitor/log.ts b/continew-admin-ui/src/api/monitor/log.ts index 2ca32586..38cef1f3 100644 --- a/continew-admin-ui/src/api/monitor/log.ts +++ b/continew-admin-ui/src/api/monitor/log.ts @@ -4,7 +4,7 @@ import qs from 'query-string'; const BASE_URL = '/monitor/log'; export interface LogRecord { - logId: string; + logId?: number; clientIp: string; location: string; browser: string; @@ -52,7 +52,7 @@ export interface LoginLogListRes { total: number; } -export function listLoginLogList(params: LoginLogParam) { +export function listLoginLog(params: LoginLogParam) { return axios.get(`${BASE_URL}/login`, { params, paramsSerializer: (obj) => { @@ -82,7 +82,7 @@ export function listOperationLog(params: OperationLogParam) { }); } -export interface SystemLogParams extends Partial { +export interface SystemLogParam extends Partial { page: number; size: number; sort: Array; @@ -93,7 +93,7 @@ export interface SystemLogListRes { total: number; } -export function getSystemLogList(params: SystemLogParams) { +export function listSystemLog(params: SystemLogParam) { return axios.get(`${BASE_URL}/system`, { params, paramsSerializer: (obj) => { @@ -102,6 +102,6 @@ export function getSystemLogList(params: SystemLogParams) { }); } -export function getSystemLogDetail(logId: string) { +export function getSystemLog(logId: number) { return axios.get(`${BASE_URL}/system/${logId}`); } \ No newline at end of file diff --git a/continew-admin-ui/src/views/monitor/log/login/index.vue b/continew-admin-ui/src/views/monitor/log/login/index.vue index 6f6853d4..4d9e8382 100644 --- a/continew-admin-ui/src/views/monitor/log/login/index.vue +++ b/continew-admin-ui/src/views/monitor/log/login/index.vue @@ -83,9 +83,9 @@ import { getCurrentInstance, ref, toRefs, reactive } from 'vue'; import { SelectOptionData } from '@arco-design/web-vue'; import { - LoginLogRecord, LoginLogParam, - listLoginLogList, + LoginLogRecord, + listLoginLog, } from '@/api/monitor/log'; const { proxy } = getCurrentInstance() as any; @@ -117,7 +117,7 @@ */ const getList = (params: LoginLogParam = { ...queryParams.value }) => { loading.value = true; - listLoginLogList(params).then((res) => { + listLoginLog(params).then((res) => { loginLogList.value = res.data.list; total.value = res.data.total; loading.value = false; diff --git a/continew-admin-ui/src/views/monitor/log/system/index.vue b/continew-admin-ui/src/views/monitor/log/system/index.vue index 6a7dbda4..8cff7903 100644 --- a/continew-admin-ui/src/views/monitor/log/system/index.vue +++ b/continew-admin-ui/src/views/monitor/log/system/index.vue @@ -2,202 +2,210 @@
- - - - + +
+ +
+ - + + + + + + 查询 + + + 重置 + + - - - 查询 - - - - 重置 - - - +
+
- + - - - - -