diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs index a6fd1a1e..867d32bf 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -1,12 +1,10 @@ using Infrastructure.Attribute; using Infrastructure.Enums; using Infrastructure.Model; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Common; -using ZR.Model; using ZR.Model.System.Dto; using ZR.Service.System.IService; @@ -34,12 +32,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor /// /// [HttpGet("list")] - public IActionResult OperList([FromQuery] SysOperLogDto sysOperLog) + public IActionResult OperList([FromQuery] SysOperLogQueryDto sysOperLog) { - PagerInfo pagerInfo = new(sysOperLog.PageNum, sysOperLog.PageSize); - sysOperLog.OperName = !HttpContextExtension.IsAdmin(HttpContext) ? HttpContextExtension.GetName(HttpContext) : sysOperLog.OperName; - var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo); + var list = sysOperLogService.SelectOperLogList(sysOperLog); return SUCCESS(list); } @@ -87,9 +83,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor [Log(Title = "操作日志", BusinessType = BusinessType.EXPORT)] [ActionPermissionFilter(Permission = "monitor:operlog:export")] [HttpGet("export")] - public IActionResult Export([FromQuery] SysOperLogDto sysOperLog) + public IActionResult Export([FromQuery] SysOperLogQueryDto sysOperLog) { - var list = sysOperLogService.SelectOperLogList(sysOperLog, new PagerInfo(1, 10000)); + sysOperLog.PageSize = 100000; + var list = sysOperLogService.SelectOperLogList(sysOperLog); var result = ExportExcelMini(list.Result, "操作日志", "操作日志"); return ExportExcel(result.Item2, result.Item1); } diff --git a/ZR.Model/System/Dto/SysOperLogDto.cs b/ZR.Model/System/Dto/SysOperLogDto.cs index 0131ac12..36c69378 100644 --- a/ZR.Model/System/Dto/SysOperLogDto.cs +++ b/ZR.Model/System/Dto/SysOperLogDto.cs @@ -1,5 +1,33 @@ -namespace ZR.Model.System.Dto +using System; + +namespace ZR.Model.System.Dto { + public class SysOperLogQueryDto : PagerInfo + { + /// + /// 操作人员 + /// + public string OperName { get; set; } + /// + /// 业务类型 0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据 + /// + public int BusinessType { get; set; } = -1; + /// + /// 状态 + /// + public int Status { get; set; } = -1; + /// + /// 操作模块 + /// + public string Title { get; set; } + /// + /// 请求参数 + /// + public string OperParam { get; set; } + public DateTime? BeginTime { get; set; } + public DateTime? EndTime { get; set; } + } + public class SysOperLogDto : SysBase { /// diff --git a/ZR.Service/System/IService/ISysOperLogService.cs b/ZR.Service/System/IService/ISysOperLogService.cs index fe6948bf..f96402ec 100644 --- a/ZR.Service/System/IService/ISysOperLogService.cs +++ b/ZR.Service/System/IService/ISysOperLogService.cs @@ -1,9 +1,6 @@ -using System.Collections.Generic; -using ZR.Model; -using ZR.Model.System.Dto; +using ZR.Model; using ZR.Model.System; -using ZR.Service.System; -using Infrastructure.Model; +using ZR.Model.System.Dto; namespace ZR.Service.System.IService { @@ -15,9 +12,8 @@ namespace ZR.Service.System.IService /// 查询系统操作日志集合 /// /// 操作日志对象 - /// /// 操作日志集合 - public PagedInfo SelectOperLogList(SysOperLogDto operLog, PagerInfo pager); + public PagedInfo SelectOperLogList(SysOperLogQueryDto operLog); /// /// 清空操作日志 diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs index 076653d7..0671a78e 100644 --- a/ZR.Service/System/SysOperLogService.cs +++ b/ZR.Service/System/SysOperLogService.cs @@ -5,6 +5,7 @@ using SqlSugar; using ZR.Model; using ZR.Model.System; using ZR.Model.System.Dto; +using ZR.Repository; using ZR.Service.System.IService; namespace ZR.Service.System @@ -35,7 +36,7 @@ namespace ZR.Service.System /// 操作日志对象 /// /// 操作日志集合 - public PagedInfo SelectOperLogList(SysOperLogDto sysOper, PagerInfo pager) + public PagedInfo SelectOperLogList(SysOperLogQueryDto sysOper) { sysOper.BeginTime = DateTimeHelper.GetBeginTime(sysOper.BeginTime, -1); sysOper.EndTime = DateTimeHelper.GetBeginTime(sysOper.EndTime, 1); @@ -48,7 +49,10 @@ namespace ZR.Service.System exp.AndIF(sysOper.Status != -1, it => it.Status == sysOper.Status); exp.AndIF(sysOper.OperParam != null, it => it.OperParam.Contains(sysOper.OperParam)); - return GetPages(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc); + return Queryable().Where(exp.ToExpression()) + .OrderBy(x => x.OperId, OrderByType.Desc) + .ToPage(sysOper); + //return GetList(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc); } ///