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

5
ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs
View File

@@ -19,7 +19,7 @@ using ZR.Common;
using ZR.Model;
using ZR.Model.System.Dto;
using ZR.Model.System.Generate;
using ZR.Model.Vo;
using ZR.Service;
using ZR.Service.System.IService;
namespace ZR.Admin.WebApi.Controllers
@@ -72,9 +72,8 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult FindListTable(string dbName, string tableName, PagerInfo pager)
{
List<DbTableInfo> list = _CodeGeneraterService.GetAllTables(dbName, tableName, pager);
var vm = new VMPageResult<DbTableInfo>(list, pager);
return SUCCESS(vm);
return SUCCESS(list.ToPage(pager));
}
/// <summary>

8
ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs
View File

@@ -38,10 +38,8 @@ namespace ZR.Admin.WebApi.Controllers.System
[HttpGet("list")]
public IActionResult List([FromQuery] SysDictData dictData, [FromQuery] PagerInfo pagerInfo)
{
var list = SysDictDataService.SelectDictDataList(dictData);
pagerInfo.TotalNum = list.Count;
var vm = new VMPageResult<SysDictData>(list, pagerInfo);
return SUCCESS(vm);
var list = SysDictDataService.SelectDictDataList(dictData, pagerInfo);
return SUCCESS(list);
}
/// <summary>
@@ -107,7 +105,7 @@ namespace ZR.Admin.WebApi.Controllers.System
[HttpDelete("{dictCode}")]
public IActionResult Remove(string dictCode)
{
long[] dictCodes = ZR.Common.Tools.SpitLongArrary(dictCode);
long[] dictCodes = Common.Tools.SpitLongArrary(dictCode);
return SUCCESS(SysDictDataService.DeleteDictDataByIds(dictCodes));
}

3
ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs
View File

@@ -38,8 +38,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{
var list = SysDictService.SelectDictTypeList(dict, pagerInfo);
var vm = new VMPageResult<SysDictType>(list, pagerInfo);
return SUCCESS(vm, TIME_FORMAT_FULL);
return SUCCESS(list, TIME_FORMAT_FULL);
}
/// <summary>

6
ZR.Admin.WebApi/Controllers/System/SysUserController.cs
View File

@@ -11,7 +11,7 @@ using System.IO;
using ZR.Admin.WebApi.Filters;
using ZR.Model;
using ZR.Model.System;
using ZR.Model.Vo;
using ZR.Service;
using ZR.Service.System.IService;
namespace ZR.Admin.WebApi.Controllers.System
@@ -53,9 +53,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{
var list = UserService.SelectUserList(user, pager);
var vm = new VMPageResult<SysUser>(list, pager);
return SUCCESS(vm, TIME_FORMAT_FULL);
return SUCCESS(list.ToPage(pager), TIME_FORMAT_FULL);
}
/// <summary>

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 });
}