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

优化分页查询

Browse Source
This commit is contained in:
不做码农 2021-12-18 10:56:02 +08:00
parent c5c83a0b22
commit 6305fe3164
12 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
View File

@ -69,8 +69,15 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult FindListTable(string dbName, string tableName, PagerInfo pager)
{
List<DbTableInfo> list = _CodeGeneraterService.GetAllTables(dbName, tableName, pager);
return SUCCESS(list.ToPage(pager));
var page = new PagedInfo<DbTableInfo>
{
TotalPage = pager.TotalPage,
TotalNum = pager.TotalNum,
PageSize = pager.PageSize,
PageIndex = pager.PageNum,
Result = list
};
return SUCCESS(page);
}
/// <summary>

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

@ -56,7 +56,7 @@ namespace ZR.Admin.WebApi.Controllers.System
{
var list = UserService.SelectUserList(user, pager);
return SUCCESS(list.ToPage(pager), TIME_FORMAT_FULL);
return SUCCESS(list, TIME_FORMAT_FULL);
}
/// <summary>
@ -218,7 +218,7 @@ namespace ZR.Admin.WebApi.Controllers.System
var list = UserService.SelectUserList(user, new PagerInfo(1, 10000));
//调试模式需要加上
string sFileName = ExportExcel(list, "user", "用户列表");
string sFileName = ExportExcel(list.Result, "user", "用户列表");
return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName });
}
}

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

@ -39,7 +39,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor
{
var list = sysLoginService.GetLoginLog(sysLogininfoDto, pagerInfo);
return ToResponse(ToJson(list.Count, list.ToPage(pagerInfo)), TIME_FORMAT_FULL_2);
return SUCCESS(list, TIME_FORMAT_FULL_2);
}
/// <summary>

5
ZR.Model/ZR.Model.csproj
View File

@ -4,6 +4,10 @@
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Extensions\QueryableExtension.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="EPPlus" Version="5.8.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
@ -14,6 +18,7 @@
<ItemGroup>
<Folder Include="Dto\" />
<Folder Include="Enum\" />
<Folder Include="Extensions\" />
<Folder Include="Vo\" />
</ItemGroup>

7
ZR.Repository/BaseRepository.cs
View File

@ -379,14 +379,17 @@ namespace ZR.Repository
}
}
/// <summary>
/// 分页查询扩展
/// </summary>
public static class QueryableExtension
{
/// <summary>
/// 读取列表
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="source"></param>
/// <param name="parm"></param>
/// <param name="source">查询表单式</param>
/// <param name="parm">分页参数</param>
/// <returns></returns>
public static PagedInfo<T> ToPage<T>(this ISugarQueryable<T> source, PagerInfo parm)
{

25
ZR.Repository/System/SysLogininfoRepository.cs
View File

@ -4,6 +4,7 @@ using System.Collections.Generic;
using ZR.Model;
using ZR.Model.System.Dto;
using ZR.Model.System;
using SqlSugar;
namespace ZR.Repository.System
{
@ -16,19 +17,19 @@ namespace ZR.Repository.System
/// <param name="logininfoDto"></param>
/// <param name="pager"></param>
/// <returns></returns>
public List<SysLogininfor> GetLoginLog(SysLogininfor logininfoDto, PagerInfo pager)
public PagedInfo<SysLogininfor> GetLoginLog(SysLogininfor logininfoDto, PagerInfo pager)
{
int totalCount = 0;
var list = Context.Queryable<SysLogininfor>()
.Where(it => it.loginTime >= logininfoDto.BeginTime && it.loginTime <= logininfoDto.EndTime)
.WhereIF(logininfoDto.ipaddr.IfNotEmpty(), f => f.ipaddr == logininfoDto.ipaddr)
.WhereIF(logininfoDto.userName.IfNotEmpty(), f => f.userName.Contains(logininfoDto.userName))
.WhereIF(logininfoDto.status.IfNotEmpty(), f => f.status == logininfoDto.status)
.OrderBy(it => it.infoId, SqlSugar.OrderByType.Desc)
.IgnoreColumns(it => new { it.Create_by, it.Create_time, it.Update_by, it.Update_time, it.Remark })
.ToPageList(pager.PageNum, pager.PageSize, ref totalCount);
pager.TotalNum = totalCount;
return list;
var exp = Expressionable.Create<SysLogininfor>();
exp.And(it => it.loginTime >= logininfoDto.BeginTime && it.loginTime <= logininfoDto.EndTime);
exp.AndIF(logininfoDto.ipaddr.IfNotEmpty(), f => f.ipaddr == logininfoDto.ipaddr);
exp.AndIF(logininfoDto.userName.IfNotEmpty(), f => f.userName.Contains(logininfoDto.userName));
exp.AndIF(logininfoDto.status.IfNotEmpty(), f => f.status == logininfoDto.status);
var query = Context.Queryable<SysLogininfor>()
.Where(exp.ToExpression())
.OrderBy(it => it.infoId, OrderByType.Desc)
.IgnoreColumns(it => new { it.Create_by, it.Create_time, it.Update_by, it.Update_time, it.Remark });
return query.ToPage(pager);
}
/// <summary>

37
ZR.Repository/System/SysUserRepository.cs
View File

@ -1,4 +1,5 @@
using Infrastructure.Attribute;
using SqlSugar;
using System;
using System.Collections.Generic;
using ZR.Model;
@ -18,23 +19,27 @@ namespace ZR.Repository.System
/// <paramref name="user"/>
/// </summary>
/// <returns></returns>
public List<SysUser> SelectUserList(SysUser user, PagerInfo pager)
public PagedInfo<SysUser> SelectUserList(SysUser user, PagerInfo pager)
{
string sql = @"SELECT u.*,d.deptName, d.leader
FROM sys_user u
left join sys_dept d on u.deptId = d.deptId
WHERE u.delFlag = '0' ";
int totalCount = 0;
var list = Context.SqlQueryable<SysUser>(sql)
.WhereIF(!string.IsNullOrEmpty(user.UserName), it => it.UserName.Contains(user.UserName))
.WhereIF(!string.IsNullOrEmpty(user.Status), it => it.Status == user.Status)
.WhereIF(user.BeginTime != DateTime.MinValue && user.BeginTime != null, it => it.Create_time >= user.BeginTime)
.WhereIF(user.EndTime != DateTime.MinValue && user.BeginTime != null, it => it.Create_time <= user.EndTime)
.WhereIF(user.DeptId != 0, it => it.DeptId == user.DeptId)
.OrderBy(it => it.UserId)
.ToPageList(pager.PageNum, pager.PageSize, ref totalCount);
pager.TotalNum = totalCount;
return list;
var exp = Expressionable.Create<SysUser>();
exp.AndIF(!string.IsNullOrEmpty(user.UserName), it => it.UserName.Contains(user.UserName));
exp.AndIF(!string.IsNullOrEmpty(user.Status), it => it.Status == user.Status);
exp.AndIF(user.BeginTime != DateTime.MinValue && user.BeginTime != null, it => it.Create_time >= user.BeginTime);
exp.AndIF(user.EndTime != DateTime.MinValue && user.BeginTime != null, it => it.Create_time <= user.EndTime);
exp.AndIF(user.DeptId != 0, it => it.DeptId == user.DeptId);
exp.And(user => user.DelFlag == "0");
var query = Context.Queryable<SysUser>()
.LeftJoin<SysDept>((user, dept) => user.DeptId == dept.DeptId)
.Where(exp.ToExpression())
.Select((user, dept) => new SysUser
{
UserId = user.UserId.SelectAll(),
DeptName = dept.DeptName,
})
.OrderBy((user) => user.UserId);
return query.ToPage(pager);
}
/// <summary>

2
ZR.Service/System/GenTableService.cs
View File

@ -96,7 +96,7 @@ namespace ZR.Service.System
var predicate = Expressionable.Create<GenTable>();
predicate = predicate.AndIF(genTable.TableName.IfNotEmpty(), it => it.TableName.Contains(genTable.TableName));
return GenTableRepository.GetPages(predicate.ToExpression(), pagerInfo);
return GenTableRepository.GetPages(predicate.ToExpression(), pagerInfo, x => x.TableId, OrderByType.Desc);
}
/// <summary>

2
ZR.Service/System/IService/ISysLoginService.cs
View File

@ -17,7 +17,7 @@ namespace ZR.Service.System.IService
/// <param name="logininfoDto"></param>
/// <param name="pager">分页</param>
/// <returns></returns>
public List<SysLogininfor> GetLoginLog(SysLogininfor logininfoDto, PagerInfo pager);
public PagedInfo<SysLogininfor> GetLoginLog(SysLogininfor logininfoDto, PagerInfo pager);
/// <summary>
/// 记录登录日志

2
ZR.Service/System/IService/ISysUserService.cs
View File

@ -10,7 +10,7 @@ namespace ZR.Service.System.IService
{
public interface ISysUserService : IBaseService<SysUser>
{
public List<SysUser> SelectUserList(SysUser user, PagerInfo pager);
public PagedInfo<SysUser> SelectUserList(SysUser user, PagerInfo pager);
/// <summary>
/// 通过用户ID查询用户

2
ZR.Service/System/SysLoginService.cs
View File

@ -66,7 +66,7 @@ namespace ZR.Service.System
/// <param name="logininfoDto"></param>
/// <param name="pager">分页</param>
/// <returns></returns>
public List<SysLogininfor> GetLoginLog(SysLogininfor logininfoDto, PagerInfo pager)
public PagedInfo<SysLogininfor> GetLoginLog(SysLogininfor logininfoDto, PagerInfo pager)
{
logininfoDto.BeginTime = DateTimeHelper.GetBeginTime(logininfoDto.BeginTime, -1);
logininfoDto.EndTime = DateTimeHelper.GetBeginTime(logininfoDto.EndTime, 1);

2
ZR.Service/System/SysUserService.cs
View File

@ -37,7 +37,7 @@ namespace ZR.Service
/// 根据条件分页查询用户列表
/// </summary>
/// <returns></returns>
public List<SysUser> SelectUserList(SysUser user, PagerInfo pager)
public PagedInfo<SysUser> SelectUserList(SysUser user, PagerInfo pager)
{
var list = UserRepository.SelectUserList(user, pager);