Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化分页统一返回

Browse Source
This commit is contained in:
不做码农
2021-11-28 11:11:34 +08:00
parent 79b3c306f9
commit 8dc832cdbd
37 changed files with 145 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs
View File

@@ -38,9 +38,8 @@ namespace ZR.Admin.WebApi.Controllers.monitor
public IActionResult LoignLogList([FromQuery] SysLogininfor sysLogininfoDto, [FromQuery] PagerInfo pagerInfo)
{
var list = sysLoginService.GetLoginLog(sysLogininfoDto, pagerInfo);
var vMPage = new VMPageResult<SysLogininfor>(list, pagerInfo);
return ToResponse(ToJson(vMPage.TotalNum, vMPage), TIME_FORMAT_FULL_2);
return ToResponse(ToJson(list.Count, list.ToPage(pagerInfo)), TIME_FORMAT_FULL_2);
}
/// <summary>

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

@@ -41,9 +41,8 @@ namespace ZR.Admin.WebApi.Controllers.monitor
PagerInfo pagerInfo = new PagerInfo(sysOperLog.pageNum);
var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo);
var vMPage = new VMPageResult<SysOperLog>(list, pagerInfo);
return ToResponse(ToJson(vMPage.TotalNum, vMPage), TIME_FORMAT_FULL_2);
return ToResponse(ToJson(list.TotalNum, list), TIME_FORMAT_FULL_2);
}
/// <summary>
@@ -84,7 +83,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor
public IActionResult Export([FromQuery] SysOperLogDto sysOperLog)
{
var list = sysOperLogService.SelectOperLogList(sysOperLog, new PagerInfo(1, 10000));
string sFileName = ExportExcel(list, "operlog", "操作日志");
string sFileName = ExportExcel(list.Result, "operlog", "操作日志");
return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
}