lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-09-19 18:22:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔄refactor: 统一返回给前端的数据结构

Browse Source
This commit is contained in:
yubaolee
2025-06-11 21:14:41 +08:00
parent 0b930dc6b4
commit 069991504c
52 changed files with 265 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenAuth.App/Base/TableData.cs → OpenAuth.App/Base/PagedDynamicDataResp.cs
View File

@@ -18,41 +18,33 @@ using OpenAuth.Repository.Domain;
namespace OpenAuth.App.Response
{
/// <summary>
/// table的返回数据
/// 返回动态数据类型的分页数据
/// <para>带有列定义</para>
/// </summary>
public class TableData
public class PagedDynamicDataResp : Infrastructure.Response
{
/// <summary>
/// 状态码
/// </summary>
public int code { get; set; }
/// <summary>
/// 操作消息
/// </summary>
public string msg { get; set; }
/// <summary>
/// 总记录条数
/// </summary>
public int count { get; set; }
public int Count { get; set; }
/// <summary>
/// 返回的表格列定义
/// 该属性基于代码生成使用的列定义
/// </summary>
public List<BuilderTableColumn> columnFields;
public List<BuilderTableColumn> ColumnFields{ get; set; }
/// <summary>
/// 数据内容
/// </summary>
public dynamic data { get; set; }
public dynamic Data { get; set; }
public TableData()
public PagedDynamicDataResp()
{
code = 200;
msg = "加载成功";
columnFields = new List<BuilderTableColumn>();
Code = 200;
Message = "加载成功";
ColumnFields = new List<BuilderTableColumn>();
}
}
}

28
OpenAuth.App/Base/PagedListDataResp.cs Normal file
View File

@@ -0,0 +1,28 @@
using System.Collections.Generic;
using Infrastructure;
namespace OpenAuth.App.Response
{
/// <summary>
/// 返回确定类型的表格数据，可以为swagger提供精准的注释
/// </summary>
public class PagedListDataResp<T> : Infrastructure.Response
{
/// <summary>
/// 总记录条数
/// </summary>
public int Count { get; set; }
/// <summary>
/// 数据内容
/// </summary>
public List<T> Data { get; set; }
public PagedListDataResp()
{
Code = 200;
Message = "加载成功";
}
}
}

42
OpenAuth.App/Base/TableResp.cs
View File

@@ -1,42 +0,0 @@
using System.Collections.Generic;
using Infrastructure;
namespace OpenAuth.App.Response
{
/// <summary>
/// 返回确定类型的表格数据，可以为swagger提供精准的注释
/// </summary>
public class TableResp<T>
{
/// <summary>
/// 状态码
/// </summary>
public int code { get; set; }
/// <summary>
/// 操作消息
/// </summary>
public string msg { get; set; }
/// <summary>
/// 总记录条数
/// </summary>
public int count { get; set; }
/// <summary>
/// 数据内容
/// </summary>
public List<T> data { get; set; }
/// <summary>
/// 返回的列表头信息
/// </summary>
public List<KeyDescription> columnHeaders { get; set; }
public TableResp()
{
code = 200;
msg = "加载成功";
columnHeaders = new List<KeyDescription>();
}
}
}

16
OpenAuth.App/BuilderTable/BuilderTableApp.cs
View File

@@ -78,7 +78,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableResp<BuilderTable>> Load(QueryBuilderTableListReq request)
public async Task<PagedListDataResp<BuilderTable>> Load(QueryBuilderTableListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -86,17 +86,17 @@ namespace OpenAuth.App
throw new CommonException("登录已过期", Define.INVALID_TOKEN);
}
var result = new TableResp<BuilderTable>();
var result = new PagedListDataResp<BuilderTable>();
var objs = UnitWork.Find<BuilderTable>(null);
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.Id.Contains(request.key));
}
result.data = await objs.OrderBy(u => u.Id)
result.Data = await objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}
@@ -864,17 +864,17 @@ namespace OpenAuth.App
/// 加载所有的主表（parentId为空的）
/// </summary>
/// <returns></returns>
public async Task<TableData> AllMain()
public async Task<PagedDynamicDataResp> AllMain()
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = UnitWork.Find<BuilderTable>(u => string.IsNullOrEmpty(u.ParentTableId)).Select(u => new
{
Id = u.Id,
Name = u.TableName
});
result.data = await objs.OrderBy(u => u.Id).ToListAsync();
result.count = await objs.CountAsync();
result.Data = await objs.OrderBy(u => u.Id).ToListAsync();
result.Count = await objs.CountAsync();
return result;
}
}

8
OpenAuth.App/BuilderTable/BuilderTableColumnApp.cs
View File

@@ -21,24 +21,24 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableResp<BuilderTableColumn>> Load(QueryBuilderTableColumnListReq request)
public async Task<PagedListDataResp<BuilderTableColumn>> Load(QueryBuilderTableColumnListReq request)
{
if (string.IsNullOrEmpty(request.BuilderTableId))
{
throw new Exception($"缺少必要的参数BuilderTableId");
}
var result = new TableResp<BuilderTableColumn>();
var result = new PagedListDataResp<BuilderTableColumn>();
var objs = Repository.AsQueryable().Where(u => u.TableId == request.BuilderTableId);
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.ColumnName.Contains(request.key));
}
result.data = await objs.OrderByDescending(u => u.IsList)
result.Data = await objs.OrderByDescending(u => u.IsList)
.OrderBy(u => u.Sort)
.OrderBy(u => u.ColumnName)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}
public void Update(AddOrUpdateBuilderTableColumnReq obj)

10
OpenAuth.App/Category/CategoryApp.cs
View File

@@ -16,7 +16,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryCategoryListReq request)
public async Task<PagedDynamicDataResp> Load(QueryCategoryListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -36,7 +36,7 @@ namespace OpenAuth.App
};
}
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = SugarClient.Queryable<Category>();
if (!string.IsNullOrEmpty(request.TypeId))
{
@@ -54,11 +54,11 @@ namespace OpenAuth.App
}
var propertyStr = string.Join(',', columnFields.Select(u =>u.ColumnName));
result.columnFields = columnFields;
result.data = objs.OrderBy(u => u.DtCode)
result.ColumnFields = columnFields;
result.Data = objs.OrderBy(u => u.DtCode)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}

8
OpenAuth.App/Category/CategoryTypeApp.cs
View File

@@ -21,19 +21,19 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryCategoryTypeListReq request)
public async Task<PagedDynamicDataResp> Load(QueryCategoryTypeListReq request)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = UnitWork.Find<CategoryType>(null);
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.Id.Contains(request.key) || u.Name.Contains(request.key));
}
result.data =await objs.OrderBy(u => u.Name)
result.Data =await objs.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
result.Count =await objs.CountAsync();
return result;
}

10
OpenAuth.App/DataPrivilege/DataPrivilegeRuleApp.cs
View File

@@ -15,7 +15,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryDataPrivilegeRuleListReq request)
public async Task<PagedDynamicDataResp> Load(QueryDataPrivilegeRuleListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -29,7 +29,7 @@ namespace OpenAuth.App
throw new Exception("请在代码生成界面配置DataPrivilegeRule表的字段属性");
}
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = SugarClient.Queryable<DataPrivilegeRule>();
if (!string.IsNullOrEmpty(request.key))
{
@@ -41,11 +41,11 @@ namespace OpenAuth.App
}
var propertyStr = string.Join(',', columnFields.Select(u => u.ColumnName));
result.columnFields = columnFields;
result.data = objs.OrderBy(u => u.Id)
result.ColumnFields = columnFields;
result.Data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}

18
OpenAuth.App/DynamicApiApp/DynamicApiApp.cs
View File

@@ -36,16 +36,16 @@ namespace OpenAuth.App
/// </summary>
/// <param name="req">查询参数</param>
/// <returns></returns>
public async Task<TableData> GetList(QueryDynamicListReq req)
public async Task<PagedDynamicDataResp> GetList(QueryDynamicListReq req)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
try
{
// 验证表名是否存在
if (!TableExists(req.TableName))
{
result.code = 500;
result.msg = $"表不存在：{req.TableName}";
result.Code = 500;
result.Message = $"表不存在：{req.TableName}";
return result;
}
@@ -78,13 +78,13 @@ namespace OpenAuth.App
.Take(req.limit)
.ToListAsync();
result.data = list;
result.count = total;
result.Data = list;
result.Count = total;
}
catch (Exception ex)
{
result.code = 500;
result.msg = ex.InnerException?.Message ?? ex.Message;
result.Code = 500;
result.Message = ex.InnerException?.Message ?? ex.Message;
}
return result;
@@ -122,7 +122,7 @@ namespace OpenAuth.App
return result;
}
result.Result = entity;
result.Data = entity;
}
catch (Exception ex)
{

14
OpenAuth.App/ExtDataSourceApp/ExtDataSourceApp.cs
View File

@@ -18,7 +18,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryExternalDataSourceListReq request)
public async Task<PagedDynamicDataResp> Load(QueryExternalDataSourceListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -26,7 +26,7 @@ namespace OpenAuth.App
throw new CommonException("登录已过期", Define.INVALID_TOKEN);
}
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = GetDataPrivilege("u");
if (!string.IsNullOrEmpty(request.key))
{
@@ -37,10 +37,10 @@ namespace OpenAuth.App
objs = objs.Where(request.sqlWhere);
}
result.data = objs.OrderBy(u => u.Name)
result.Data = objs.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}
@@ -48,15 +48,15 @@ namespace OpenAuth.App
/// 获取数据库类型
/// </summary>
/// <returns></returns>
public TableData GetDbTypes()
public PagedDynamicDataResp GetDbTypes()
{
var result = new TableData();
var result = new PagedDynamicDataResp();
// 创建包含键值对的列表
var dbTypeList = Enum.GetValues(typeof(DbType))
.Cast<DbType>()
.Select(item => new { label = item.ToString(), value = (int)item })
.ToList();
result.data = dbTypeList;
result.Data = dbTypeList;
return result;
}

8
OpenAuth.App/Files/FileApp.cs
View File

@@ -44,19 +44,19 @@ namespace OpenAuth.App
/// <summary>
/// 加载附件列表
/// </summary>
public async Task<TableData> Load(QueryFileListReq request)
public async Task<PagedDynamicDataResp> Load(QueryFileListReq request)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = UnitWork.Find<UploadFile>(null);
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.FileName.Contains(request.key) || u.FilePath.Contains(request.key));
}
result.data =await objs.OrderByDescending(u => u.CreateTime)
result.Data =await objs.OrderByDescending(u => u.CreateTime)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
result.Count =await objs.CountAsync();
return result;
}

6
OpenAuth.App/FlowApproverApp/FlowApproverApp.cs
View File

@@ -70,13 +70,13 @@ namespace OpenAuth.App
/// <summary>
/// 加载当前节点的加签人
/// </summary>
public async Task<TableResp<FlowApprover>> Load(QueryApproverReq request)
public async Task<PagedListDataResp<FlowApprover>> Load(QueryApproverReq request)
{
var objs = await Repository.GetListAsync(u =>
u.InstanceId == request.FlowInstanceId && u.ActivityId == request.ActivityId);
return new TableResp<FlowApprover>()
return new PagedListDataResp<FlowApprover>()
{
data = objs
Data = objs
};
}

8
OpenAuth.App/FlowInstance/FlowInstanceApp.cs
View File

@@ -672,9 +672,9 @@ namespace OpenAuth.App
return resp;
}
public async Task<TableData> Load(QueryFlowInstanceListReq request)
public async Task<PagedDynamicDataResp> Load(QueryFlowInstanceListReq request)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var user = _auth.GetCurrentUser();
//行转列专用SQL
string groupConcatSql = $@" ( SELECT GROUP_CONCAT(Account SEPARATOR ',')
@@ -828,8 +828,8 @@ namespace OpenAuth.App
var finalQuery = SugarClient.SqlQueryable<FlowInstance>(sql)
.WhereIF(!string.IsNullOrEmpty(request.key), t => t.CustomName.Contains(request.key));
result.count = await finalQuery.CountAsync();
result.data = await finalQuery.OrderByDescending(u => u.CreateDate)
result.Count = await finalQuery.CountAsync();
result.Data = await finalQuery.OrderByDescending(u => u.CreateDate)
.ToPageListAsync(request.page, request.limit);
return result;

8
OpenAuth.App/FlowScheme/FlowSchemeApp.cs
View File

@@ -64,19 +64,19 @@ namespace OpenAuth.App
}
public async Task<TableData> Load(QueryFlowSchemeListReq request)
public async Task<PagedDynamicDataResp> Load(QueryFlowSchemeListReq request)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = GetDataPrivilege("u");
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.SchemeName.Contains(request.key) || u.Id.Contains(request.key));
}
result.data = await objs.OrderByDescending(u => u.CreateDate)
result.Data = await objs.OrderByDescending(u => u.CreateDate)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}

8
OpenAuth.App/Form/FormApp.cs
View File

@@ -23,19 +23,19 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryFormListReq request)
public async Task<PagedDynamicDataResp> Load(QueryFormListReq request)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var forms = GetDataPrivilege("u");
if (!string.IsNullOrEmpty(request.key))
{
forms = forms.Where(u => u.Name.Contains(request.key) || u.Id.Contains(request.key));
}
result.data = forms.OrderByDescending(u => u.CreateDate)
result.Data = forms.OrderByDescending(u => u.CreateDate)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
result.count = await forms.CountAsync();
result.Count = await forms.CountAsync();
return result;
}

8
OpenAuth.App/FrmLeave/FrmLeaveReqApp.cs
View File

@@ -18,12 +18,12 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryFrmLeaveReqListReq request)
public async Task<PagedDynamicDataResp> Load(QueryFrmLeaveReqListReq request)
{
return new TableData
return new PagedDynamicDataResp
{
count = await Repository.CountAsync(null),
data = await Repository.Find(request.page, request.limit, "Id desc").ToListAsync()
Count = await Repository.CountAsync(null),
Data = await Repository.Find(request.page, request.limit, "Id desc").ToListAsync()
};
}

8
OpenAuth.App/Jobs/OpenJobApp.cs
View File

@@ -28,19 +28,19 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryOpenJobListReq request)
public async Task<PagedDynamicDataResp> Load(QueryOpenJobListReq request)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = SugarClient.Queryable<OpenJob>();
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.Id.Contains(request.key));
}
result.data =await objs.OrderBy(u => u.Id)
result.Data =await objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count =await objs.CountAsync();
result.Count =await objs.CountAsync();
return result;
}

10
OpenAuth.App/Resources/ResourceApp.cs
View File

@@ -69,7 +69,7 @@ namespace OpenAuth.App
return SugarClient.Queryable<SysResource>().Where(u => elementIds.Contains(u.Id) && (appId == null || appId =="" || u.AppId == appId)).ToArray();
}
public async Task<TableData> Load(QueryResourcesReq request)
public async Task<PagedDynamicDataResp> Load(QueryResourcesReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -84,7 +84,7 @@ namespace OpenAuth.App
}
var result = new TableData();
var result = new PagedDynamicDataResp();
var resources = GetDataPrivilege("u");
if (!string.IsNullOrEmpty(request.key))
{
@@ -104,11 +104,11 @@ namespace OpenAuth.App
var columnnames = columnFields.Select(u => u.ColumnName);
var propertyStr = string.Join(',', columnnames);
result.columnFields = columnFields;
result.data = resources.OrderBy(u => u.TypeId)
result.ColumnFields = columnFields;
result.Data = resources.OrderBy(u => u.TypeId)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await resources.CountAsync();
result.Count = await resources.CountAsync();
return result;
}

8
OpenAuth.App/RoleManager/RoleApp.cs
View File

@@ -36,19 +36,19 @@ namespace OpenAuth.App
/// 获取所有的角色
/// 为了控制权限，通常只用于流程实例选择执行角色，其他地方请使用Load
/// </summary>
public async Task<TableResp<Role>> LoadAll(QueryRoleListReq request)
public async Task<PagedListDataResp<Role>> LoadAll(QueryRoleListReq request)
{
var result = new TableResp<Role>();
var result = new PagedListDataResp<Role>();
var objs = UnitWork.Find<Role>(null);
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.Name.Contains(request.key));
}
result.data = await objs.OrderBy(u => u.Name)
result.Data = await objs.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}

8
OpenAuth.App/SysLogs/SysLogApp.cs
View File

@@ -17,19 +17,19 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QuerySysLogListReq request)
public async Task<PagedDynamicDataResp> Load(QuerySysLogListReq request)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = UnitWork.Find<SysLog>(null);
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.Content.Contains(request.key) || u.Id.Contains(request.key));
}
result.data = await objs.OrderByDescending(u => u.CreateTime)
result.Data = await objs.OrderByDescending(u => u.CreateTime)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}

8
OpenAuth.App/SysMessage/SysMessageApp.cs
View File

@@ -22,7 +22,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QuerySysMessageListReq request)
public async Task<PagedDynamicDataResp> Load(QuerySysMessageListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -30,7 +30,7 @@ namespace OpenAuth.App
throw new CommonException("登录已过期", Define.INVALID_TOKEN);
}
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = UnitWork.Find<SysMessage>(u =>u.ToId == loginContext.User.Id && u.ToStatus != -1);
if (!string.IsNullOrEmpty(request.key))
@@ -44,10 +44,10 @@ namespace OpenAuth.App
objs = objs.Where(u => u.ToStatus == request.Status);
}
result.data =await objs.OrderByDescending(u => u.CreateTime)
result.Data =await objs.OrderByDescending(u => u.CreateTime)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToListAsync();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}

18
OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs
View File

@@ -17,7 +17,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QuerySysPrinterPlanListReq request)
public async Task<PagedDynamicDataResp> Load(QuerySysPrinterPlanListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -31,7 +31,7 @@ namespace OpenAuth.App
throw new Exception("请在代码生成界面配置SysPrinterPlan表的字段属性");
}
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = GetDataPrivilege("u");
if (!string.IsNullOrEmpty(request.key))
{
@@ -47,17 +47,17 @@ namespace OpenAuth.App
var columnnames = columnFields.Select(u => u.ColumnName);
var propertyStr = string.Join(',', columnnames);
result.columnFields = columnFields;
result.data = objs.OrderByDescending(u => u.CreateTime)
result.ColumnFields = columnFields;
result.Data = objs.OrderByDescending(u => u.CreateTime)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}
public async Task<TableData> Query(QueryReq request)
public async Task<PagedDynamicDataResp> Query(QueryReq request)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
var sugarParams = new List<SugarParameter>();
if (!string.IsNullOrEmpty(request.ParamJsonStr))
@@ -70,8 +70,8 @@ namespace OpenAuth.App
}
var objs = await SugarClient.Ado.SqlQueryAsync<dynamic>(request.SourceSql,sugarParams);
result.count = SugarClient.Ado.SqlQuery<dynamic>(request.SourceSql, sugarParams).Count;
result.data = objs.Skip((request.page - 1) * request.limit)
result.Count = SugarClient.Ado.SqlQuery<dynamic>(request.SourceSql, sugarParams).Count;
result.Data = objs.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList();
return result;

32
OpenAuth.App/UserManager/UserManagerApp.cs
View File

@@ -32,7 +32,7 @@ namespace OpenAuth.App
/// 加载当前登录用户可访问的一个部门及子部门全部用户
/// 如果请求的request.OrgId为空，则可以获取到已被删除机构的用户（即：没有分配任何机构的用户）
/// </summary>
public async Task<TableData> Load(QueryUserListReq request)
public async Task<PagedDynamicDataResp> Load(QueryUserListReq request)
{
var loginUser = _auth.GetCurrentUser();
IQueryable<SysUser> query = UnitWork.Find<SysUser>(null);
@@ -99,10 +99,10 @@ namespace OpenAuth.App
OrganizationIds = string.Join(",", u.Select(x=>x.OrgId))
,Organizations = string.Join(",", u.Select(x=>x.OrgName))
});
return new TableData
return new PagedDynamicDataResp
{
count =userViews.Count(),
data =userViews.OrderBy(u => u.Name)
Count =userViews.Count(),
Data =userViews.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit),
};
@@ -111,7 +111,7 @@ namespace OpenAuth.App
/// 获取所有的用户
/// 为了控制权限，通常只用于流程实例选择执行角色，其他地方请使用Load
/// </summary>
public async Task<TableResp<UserView>> LoadAll(QueryUserListReq request)
public async Task<PagedListDataResp<UserView>> LoadAll(QueryUserListReq request)
{
IQueryable<SysUser> query = UnitWork.Find<SysUser>(null);
if (!string.IsNullOrEmpty(request.key))
@@ -166,10 +166,10 @@ namespace OpenAuth.App
OrganizationIds = string.Join(",", u.Select(x=>x.OrgId))
,Organizations = string.Join(",", u.Select(x=>x.OrgName))
});
return new TableResp<UserView>()
return new PagedListDataResp<UserView>()
{
count = userViews.Count(),
data = userViews.OrderBy(u => u.Name)
Count = userViews.Count(),
Data = userViews.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).ToList()
};
@@ -252,17 +252,17 @@ namespace OpenAuth.App
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<TableData> LoadByRole(QueryUserListByRoleReq request)
public async Task<PagedDynamicDataResp> LoadByRole(QueryUserListByRoleReq request)
{
var users = from userRole in UnitWork.Find<Relevance>(u =>
u.SecondId == request.roleId && u.RelKey == Define.USERROLE)
join user in UnitWork.Find<SysUser>(null) on userRole.FirstId equals user.Id into temp
from c in temp.Where(u =>u.Id != null)
select c;
return new TableData
return new PagedDynamicDataResp
{
count =await users.CountAsync(),
data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
Count =await users.CountAsync(),
Data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
};
}
/// <summary>
@@ -270,17 +270,17 @@ namespace OpenAuth.App
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<TableData> LoadByOrg(QueryUserListByOrgReq request)
public async Task<PagedDynamicDataResp> LoadByOrg(QueryUserListByOrgReq request)
{
var users = from userOrg in UnitWork.Find<Relevance>(u =>
u.SecondId == request.orgId && u.RelKey == Define.USERORG)
join user in UnitWork.Find<SysUser>(null) on userOrg.FirstId equals user.Id into temp
from c in temp.Where(u =>u.Id != null)
select c;
return new TableData
return new PagedDynamicDataResp
{
count =await users.CountAsync(),
data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
Count =await users.CountAsync(),
Data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
};
}
/// <summary>

10
OpenAuth.App/WmsInbound/WmsInboundOrderDtblApp.cs
View File

@@ -14,7 +14,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryWmsInboundOrderDtblListReq request)
public async Task<PagedDynamicDataResp> Load(QueryWmsInboundOrderDtblListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -26,7 +26,7 @@ namespace OpenAuth.App
{
throw new Exception("请在代码生成界面配置WmsInboundOrderDtbl表的字段属性");
}
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = SugarClient.Queryable<WmsInboundOrderDtbl>();
if (!string.IsNullOrEmpty(request.InboundOrderId))
{
@@ -37,11 +37,11 @@ namespace OpenAuth.App
objs = objs.Where(u => u.GoodsId.Contains(request.key));
}
var propertyStr = string.Join(',', properties.Select(u => u.ColumnName));
result.columnFields = properties;
result.data = objs.OrderBy(u => u.Id)
result.ColumnFields = properties;
result.Data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}
public void Add(AddOrUpdateWmsInboundOrderDtblReq request)

10
OpenAuth.App/WmsInbound/WmsInboundOrderTblApp.cs
View File

@@ -15,7 +15,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryWmsInboundOrderTblListReq request)
public async Task<PagedDynamicDataResp> Load(QueryWmsInboundOrderTblListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -27,8 +27,8 @@ namespace OpenAuth.App
{
throw new Exception("请在代码生成界面配置WmsInboundOrderTbl表的字段属性");
}
var result = new TableData();
result.columnFields = columns;
var result = new PagedDynamicDataResp();
result.ColumnFields = columns;
var objs = GetDataPrivilege("u");
if (!string.IsNullOrEmpty(request.key))
{
@@ -39,10 +39,10 @@ namespace OpenAuth.App
objs = objs.Where(request.sqlWhere);
}
var propertyStr = string.Join(',', columns.Select(u => u.ColumnName));
result.data = objs.OrderBy(u => u.Id)
result.Data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}
public void Add(AddOrUpdateWmsInboundOrderTblReq request)