wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

操作日志新增请求参数查询

Browse Source
This commit is contained in:
不做码农 2022-12-14 18:45:30 +08:00
parent 1d9e628a5c
commit 3f9ae2213e
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs
View File

@ -36,9 +36,9 @@ namespace ZR.Admin.WebApi.Controllers.monitor
[HttpGet("list")] [HttpGet("list")]
public IActionResult OperList([FromQuery] SysOperLogDto sysOperLog) public IActionResult OperList([FromQuery] SysOperLogDto sysOperLog)
{ {
PagerInfo pagerInfo = new(sysOperLog.pageNum, sysOperLog.PageSize); PagerInfo pagerInfo = new(sysOperLog.PageNum, sysOperLog.PageSize);
sysOperLog.operName = !HttpContextExtension.IsAdmin(HttpContext) ? HttpContextExtension.GetName(HttpContext) : sysOperLog.operName; sysOperLog.OperName = !HttpContextExtension.IsAdmin(HttpContext) ? HttpContextExtension.GetName(HttpContext) : sysOperLog.OperName;
var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo); var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo);
return SUCCESS(list, "MM/dd HH:mm"); return SUCCESS(list, "MM/dd HH:mm");
@ -90,8 +90,8 @@ namespace ZR.Admin.WebApi.Controllers.monitor
public IActionResult Export([FromQuery] SysOperLogDto sysOperLog) public IActionResult Export([FromQuery] SysOperLogDto sysOperLog)
{ {
var list = sysOperLogService.SelectOperLogList(sysOperLog, new PagerInfo(1, 10000)); var list = sysOperLogService.SelectOperLogList(sysOperLog, new PagerInfo(1, 10000));
string sFileName = ExportExcel(list.Result, "operlog", "操作日志"); var result = ExportExcelMini(list.Result, "操作日志", "操作日志");
return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName }); return ExportExcel(result.Item2, result.Item1);
} }
} }

15
ZR.Model/System/Dto/SysOperLogDto.cs
View File

@ -1,21 +1,16 @@
using System; namespace ZR.Model.System.Dto
using System.Collections.Generic;
using System.Text;
using ZR.Model.System;
namespace ZR.Model.System.Dto
{ {
public class SysOperLogDto : SysBase public class SysOperLogDto : SysBase
{ {
/// <summary> /// <summary>
/// 页码 /// 页码
/// </summary> /// </summary>
public int pageNum { get; set; } public int PageNum { get; set; }
public int PageSize { get; set; } public int PageSize { get; set; }
/// <summary> /// <summary>
/// 操作人员 /// 操作人员
/// </summary> /// </summary>
public string operName { get; set; } public string OperName { get; set; }
/// <summary> /// <summary>
/// 业务类型 0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据 /// 业务类型 0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据
/// </summary> /// </summary>
@ -28,5 +23,9 @@ namespace ZR.Model.System.Dto
/// 操作模块 /// 操作模块
/// </summary> /// </summary>
public string Title { get; set; } public string Title { get; set; }
/// <summary>
/// 请求参数
/// </summary>
public string OperParam { get; set; }
} }
} }

4
ZR.Model/System/SysOperLog.cs
View File

@ -43,8 +43,8 @@ namespace ZR.Model.System
public string OperName { get; set; } public string OperName { get; set; }
/** 部门名称 */ /** 部门名称 */
[DisplayName("部门名称")] //[DisplayName("部门名称")]
public string DeptName { get; set; } //public string DeptName { get; set; }
/** 请求url */ /** 请求url */
[DisplayName("请求地址")] [DisplayName("请求地址")]

3
ZR.Service/System/SysOperLogService.cs
View File

@ -43,9 +43,10 @@ namespace ZR.Service.System
var exp = Expressionable.Create<SysOperLog>(); var exp = Expressionable.Create<SysOperLog>();
exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime); exp.And(it => it.OperTime >= sysOper.BeginTime && it.OperTime <= sysOper.EndTime);
exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title)); exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.Title.Contains(sysOper.Title));
exp.AndIF(sysOper.operName.IfNotEmpty(), it => it.OperName.Contains(sysOper.operName)); exp.AndIF(sysOper.OperName.IfNotEmpty(), it => it.OperName.Contains(sysOper.OperName));
exp.AndIF(sysOper.BusinessType != -1, it => it.BusinessType == sysOper.BusinessType); exp.AndIF(sysOper.BusinessType != -1, it => it.BusinessType == sysOper.BusinessType);
exp.AndIF(sysOper.Status != -1, it => it.Status == sysOper.Status); 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 GetPages(exp.ToExpression(), pager, x => x.OperId, OrderByType.Desc);
} }