😎新增定时任务日志服务，前端页面
This commit is contained in:
parent
6f33cb21e7
commit
a9fa46095f
@ -0,0 +1,46 @@
|
|||||||
|
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||||
|
//
|
||||||
|
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||||
|
//
|
||||||
|
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||||
|
|
||||||
|
using Admin.NET.Core;
|
||||||
|
using SqlSugar;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Vistar.Application.Entity;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 定时任务日志表
|
||||||
|
/// </summary>
|
||||||
|
[SugarTable(null, "定时任务日志表")]
|
||||||
|
[SysTable]
|
||||||
|
[LogTable]
|
||||||
|
public class ScheduledTaskLog
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 日志时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime LogDateTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 任务名称
|
||||||
|
/// </summary>
|
||||||
|
public string? TaskName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 返回结果
|
||||||
|
/// </summary>
|
||||||
|
public string? ReturnResult { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 操作用时（毫秒）
|
||||||
|
/// </summary>
|
||||||
|
public long Elapsed { get; set; }
|
||||||
|
}
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||||
|
//
|
||||||
|
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||||
|
//
|
||||||
|
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||||
|
|
||||||
|
using Admin.NET.Core;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Vistar.Application.Service.Log.Dto;
|
||||||
|
public class PageTaskLogInput : BasePageInput
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 开始时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? StartTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 结束时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? EndTime { get; set; }
|
||||||
|
|
||||||
|
public string TaskName { get; set; }
|
||||||
|
}
|
||||||
@ -0,0 +1,63 @@
|
|||||||
|
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||||
|
//
|
||||||
|
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||||
|
//
|
||||||
|
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||||
|
|
||||||
|
using Admin.NET.Core;
|
||||||
|
using Furion.DependencyInjection;
|
||||||
|
using Furion.DynamicApiController;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Vistar.Application.Entity;
|
||||||
|
using Vistar.Application.Service.Log.Dto;
|
||||||
|
|
||||||
|
namespace Vistar.Application.Service.Log;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 定时任务日志服务 🧩
|
||||||
|
/// </summary>
|
||||||
|
[ApiDescriptionSettings(Order = 360, Description = "定时任务日志服务")]
|
||||||
|
public class ScheduledTaskLogService : IDynamicApiController, ITransient
|
||||||
|
{
|
||||||
|
private readonly SqlSugarRepository<ScheduledTaskLog> _scheduledTaskLogRep;
|
||||||
|
|
||||||
|
public ScheduledTaskLogService(SqlSugarRepository<ScheduledTaskLog> scheduledTaskLogRep)
|
||||||
|
{
|
||||||
|
_scheduledTaskLogRep = scheduledTaskLogRep;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取操作日志分页列表 🔖
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[SuppressMonitor]
|
||||||
|
[DisplayName("获取操作日志分页列表")]
|
||||||
|
public async Task<SqlSugarPagedList<ScheduledTaskLog>> Page(PageTaskLogInput input)
|
||||||
|
{
|
||||||
|
return await _scheduledTaskLogRep.AsQueryable()
|
||||||
|
.WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.LogDateTime >= input.StartTime)
|
||||||
|
.WhereIF(!string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.LogDateTime <= input.EndTime)
|
||||||
|
.WhereIF(!string.IsNullOrWhiteSpace(input.TaskName), u => u.TaskName == input.TaskName)
|
||||||
|
.ToPagedListAsync(input.Page, input.PageSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取日志详情 🔖
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[SuppressMonitor]
|
||||||
|
[DisplayName("获取日志详情")]
|
||||||
|
public async Task<string> GetDetail(long id)
|
||||||
|
{
|
||||||
|
var data= await _scheduledTaskLogRep.AsQueryable().Where(x => x.Id == id).FirstAsync();
|
||||||
|
|
||||||
|
return data.ReturnResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
18
admin.net.pro/Web/src/api/log/scheduledTaskLog.ts
Normal file
18
admin.net.pro/Web/src/api/log/scheduledTaskLog.ts
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
import request from '/@/utils/request';
|
||||||
|
enum Api {
|
||||||
|
PageScheduledTaskLog = '/api/scheduledTaskLog/page',
|
||||||
|
Detail = '/api/scheduledTaskLog/detail',
|
||||||
|
}
|
||||||
|
|
||||||
|
export const PageScheduledTaskLog = (params?: any) =>
|
||||||
|
request({
|
||||||
|
url: Api.PageScheduledTaskLog,
|
||||||
|
method: 'post',
|
||||||
|
data: params,
|
||||||
|
});
|
||||||
|
export const Detail = (id?: any) =>
|
||||||
|
request({
|
||||||
|
url: Api.Detail+"/"+id,
|
||||||
|
method: 'Get',
|
||||||
|
data: id,
|
||||||
|
});
|
||||||
185
admin.net.pro/Web/src/views/log/scheduledTaskLog/index.vue
Normal file
185
admin.net.pro/Web/src/views/log/scheduledTaskLog/index.vue
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
<template>
|
||||||
|
<div class="scheduledTaskLog-container">
|
||||||
|
<el-card shadow="hover"
|
||||||
|
:body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
|
||||||
|
<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true"
|
||||||
|
label-width="auto" style="flex: 1 1 0%">
|
||||||
|
<el-row :gutter="10">
|
||||||
|
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
|
||||||
|
<el-form-item label="开始时间" prop="name">
|
||||||
|
<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间"
|
||||||
|
:shortcuts="shortcuts" class="w100" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
|
||||||
|
<el-form-item label="结束时间" prop="code">
|
||||||
|
<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间"
|
||||||
|
:shortcuts="shortcuts" class="w100" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
|
||||||
|
<el-form-item label="任务名称">
|
||||||
|
<el-input v-model="state.queryParams.taskName" placeholder="任务名称" clearable />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<el-divider style="height: calc(100% - 5px); margin: 0 10px" direction="vertical" />
|
||||||
|
|
||||||
|
<el-row>
|
||||||
|
<el-col>
|
||||||
|
<el-button-group>
|
||||||
|
<el-button type="primary" icon="ele-Search" @click="handleQuery"
|
||||||
|
v-auth="'scheduledTaskLog/page'" :loading="options.loading"> 查询 </el-button>
|
||||||
|
<el-button icon="ele-Refresh" @click="resetQuery" :loading="options.loading"> 重置 </el-button>
|
||||||
|
</el-button-group>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
|
|
||||||
|
<el-dialog v-model="state.visible" draggable overflow destroy-on-close>
|
||||||
|
<template #header>
|
||||||
|
<div style="color: #fff">
|
||||||
|
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle">
|
||||||
|
<ele-Document /> </el-icon>
|
||||||
|
<span> 日志详情 </span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<el-tabs v-model="state.activeTab">
|
||||||
|
<el-scrollbar height="calc(100vh - 250px)">
|
||||||
|
<vue-json-pretty :data="state.detail.returnResult" showLength showIcon showLineNumber showSelectController />
|
||||||
|
</el-scrollbar>
|
||||||
|
</el-tabs>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
|
<el-card class="full-table" shadow="hover" style="margin-top: 5px">
|
||||||
|
<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents">
|
||||||
|
<template #toolbar_tools> </template>
|
||||||
|
<template #empty>
|
||||||
|
<el-empty :image-size="200" />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template #row_buttons="{ row }">
|
||||||
|
<el-button icon="ele-InfoFilled" text type="primary" @click="handleView({ row })">日志详情</el-button>
|
||||||
|
</template>
|
||||||
|
</vxe-grid>
|
||||||
|
</el-card>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup name="scheduledTaskLog">
|
||||||
|
import { onMounted, reactive, ref } from 'vue';
|
||||||
|
import { VxeGridInstance, VxeGridListeners, VxeGridPropTypes } from 'vxe-table';
|
||||||
|
import { useVxeTable } from '/@/hooks/useVxeTableOptionsHook';
|
||||||
|
import { Local } from '/@/utils/storage';
|
||||||
|
import { useDateTimeShortCust } from '/@/hooks/dateTimeShortCust';
|
||||||
|
import { PageScheduledTaskLog, Detail } from '/@/api/log/scheduledTaskLog';
|
||||||
|
import { StringToObj } from '/@/utils/json-utils';
|
||||||
|
import VueJsonPretty from 'vue-json-pretty';
|
||||||
|
import 'vue-json-pretty/lib/styles.css';
|
||||||
|
|
||||||
|
const xGrid = ref<VxeGridInstance>();
|
||||||
|
|
||||||
|
// 本地存储参数
|
||||||
|
const localPageParamKey = 'localPageParam:productDesignLibrary';
|
||||||
|
|
||||||
|
// 表格事件
|
||||||
|
const gridEvents: VxeGridListeners = {
|
||||||
|
// 只对 pager-config 配置时有效，分页发生改变时会触发该事件
|
||||||
|
async pageChange({ pageSize }) {
|
||||||
|
state.localPageParam.pageSize = pageSize;
|
||||||
|
Local.set(localPageParamKey, state.localPageParam);
|
||||||
|
},
|
||||||
|
// 当排序条件发生变化时会触发该事件
|
||||||
|
async sortChange({ field, order }) {
|
||||||
|
state.localPageParam.defaultSort = { field: field, order: order!, descStr: 'desc' };
|
||||||
|
Local.set(localPageParamKey, state.localPageParam);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const shortcuts = useDateTimeShortCust();
|
||||||
|
const state = reactive({
|
||||||
|
queryParams: {
|
||||||
|
startTime: undefined,
|
||||||
|
endTime: undefined,
|
||||||
|
taskName: undefined
|
||||||
|
},
|
||||||
|
localPageParam: {
|
||||||
|
pageSize: 50 as number,
|
||||||
|
defaultSort: { field: 'id', order: 'desc', descStr: 'desc' },
|
||||||
|
},
|
||||||
|
visible: false,
|
||||||
|
activeTab: 'message',
|
||||||
|
detail: {
|
||||||
|
returnResult: undefined
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 重置操作
|
||||||
|
const resetQuery = async () => {
|
||||||
|
state.queryParams.startTime = undefined;
|
||||||
|
state.queryParams.endTime = undefined;
|
||||||
|
state.queryParams.taskName = undefined;
|
||||||
|
await xGrid.value?.commitProxy('reload');
|
||||||
|
};
|
||||||
|
|
||||||
|
const options = useVxeTable({
|
||||||
|
id: 'scheduledTaskLog',
|
||||||
|
name: '产品设计库管理',
|
||||||
|
columns: [
|
||||||
|
{ type: 'seq', title: '序号', width: 60 },
|
||||||
|
{ field: 'taskName', title: '任务名称', minWidth: 100, showOverflow: 'tooltip', sortable: false },
|
||||||
|
{ field: 'logDateTime', title: '日志时间', minWidth: 100, showOverflow: 'tooltip', sortable: false },
|
||||||
|
{ field: 'elapsed', title: '操作用时（毫秒）', minWidth: 100, showOverflow: 'tooltip', sortable: false },
|
||||||
|
{ title: '操作', fixed: 'right', width: 300, showOverflow: true, slots: { default: 'row_buttons' } },
|
||||||
|
],
|
||||||
|
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// 代理配置
|
||||||
|
proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } },
|
||||||
|
// 排序配置
|
||||||
|
sortConfig: { defaultSort: Local.get(localPageParamKey)?.defaultSort || state.localPageParam.defaultSort },
|
||||||
|
// 分页配置
|
||||||
|
pagerConfig: { pageSize: Local.get(localPageParamKey)?.pageSize || state.localPageParam.pageSize },
|
||||||
|
// 工具栏配置
|
||||||
|
toolbarConfig: { export: false },
|
||||||
|
// 行设置
|
||||||
|
// rowConfig: { height: 80 },
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// 页面初始化
|
||||||
|
onMounted(() => {
|
||||||
|
state.localPageParam = Local.get(localPageParamKey) || state.localPageParam;
|
||||||
|
});
|
||||||
|
|
||||||
|
// 查询api
|
||||||
|
const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, sort: VxeGridPropTypes.ProxyAjaxQuerySortCheckedParams) => {
|
||||||
|
const params = Object.assign(state.queryParams, { page: page.currentPage, pageSize: page.pageSize, field: sort.field, order: sort.order, descStr: 'desc' });
|
||||||
|
var data = PageScheduledTaskLog(params)
|
||||||
|
return data;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 查询操作
|
||||||
|
const handleQuery = async (reset = false) => {
|
||||||
|
options.loading = true;
|
||||||
|
await xGrid.value?.commitProxy('query');
|
||||||
|
options.loading = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleView = async ({ row }: any) => {
|
||||||
|
var data = await Detail(row.id);
|
||||||
|
state.activeTab = 'message';
|
||||||
|
// 如果请求参数是JSON字符串，则尝试转为JSON对象
|
||||||
|
state.detail.returnResult = StringToObj(data?.data?.result);
|
||||||
|
|
||||||
|
state.visible = true;
|
||||||
|
console.log('aa', state.detail.returnResult)
|
||||||
|
};
|
||||||
|
|
||||||
|
</script>
|
||||||
Loading…
Reference in New Issue
Block a user