lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-09-19 01:58:01 +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

8
OpenAuth.WebApi/Controllers/ApplicationsController.cs
View File

@@ -25,13 +25,13 @@ namespace OpenAuth.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryAppListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryAppListReq request)
{
var applications =await _app.GetList(request);
return new TableData
return new PagedDynamicDataResp
{
data = applications,
count = applications.Count
Data = applications,
Count = applications.Count
};
}

4
OpenAuth.WebApi/Controllers/BuilderTableColumnsController.cs
View File

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<BuilderTableColumn>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -83,7 +83,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableResp<BuilderTableColumn>> Load([FromQuery]QueryBuilderTableColumnListReq request)
public async Task<PagedListDataResp<BuilderTableColumn>> Load([FromQuery]QueryBuilderTableColumnListReq request)
{
var tableResp = await _app.Load(request);
return tableResp;

6
OpenAuth.WebApi/Controllers/BuilderTablesController.cs
View File

@@ -30,7 +30,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<string>();
try
{
result.Result = _app.Add(obj);
result.Data = _app.Add(obj);
}
catch (Exception ex)
@@ -69,7 +69,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableResp<BuilderTable>> Load([FromQuery]QueryBuilderTableListReq request)
public async Task<PagedListDataResp<BuilderTable>> Load([FromQuery]QueryBuilderTableListReq request)
{
return await _app.Load(request);
}
@@ -78,7 +78,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载所有的主表（parentId为空的）
/// </summary>
[HttpGet]
public async Task<TableData> AllMain()
public async Task<PagedDynamicDataResp> AllMain()
{
return await _app.AllMain();
}

2
OpenAuth.WebApi/Controllers/CategoryTypesController.cs
View File

@@ -60,7 +60,7 @@ using OpenAuth.App.Response;
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryCategoryTypeListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryCategoryTypeListReq request)
{
return await _app.Load(request);
}

4
OpenAuth.WebApi/Controllers/CategorysController.cs
View File

@@ -30,7 +30,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<Category>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -88,7 +88,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery] QueryCategoryListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery] QueryCategoryListReq request)
{
return await _app.Load(request);
}

36
OpenAuth.WebApi/Controllers/CheckController.cs
View File

@@ -57,7 +57,7 @@ namespace OpenAuth.WebApi.Controllers
var resp = new Response<UserView>();
try
{
resp.Result = _authStrategyContext.User.MapTo<UserView>();
resp.Data = _authStrategyContext.User.MapTo<UserView>();
}
catch (Exception e)
{
@@ -80,7 +80,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<bool>();
try
{
result.Result = _authUtil.CheckLogin();
result.Data = _authUtil.CheckLogin();
}
catch (Exception ex)
{
@@ -99,7 +99,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<Role>>();
try
{
result.Result = _authStrategyContext.Roles;
result.Data = _authStrategyContext.Roles;
}
catch (CommonException ex)
{
@@ -132,7 +132,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<BuilderTableColumn>>();
try
{
result.Result = _authStrategyContext.GetTableColumns(moduleCode);
result.Data = _authStrategyContext.GetTableColumns(moduleCode);
}
catch (Exception ex)
{
@@ -151,7 +151,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<OrgView>>();
try
{
result.Result = _authStrategyContext.Orgs;
result.Data = _authStrategyContext.Orgs;
}
catch (CommonException ex)
{
@@ -179,7 +179,7 @@ namespace OpenAuth.WebApi.Controllers
/// <param name="orgId">机构ID</param>
/// <returns></returns>
[HttpGet]
public TableData GetSubOrgs(string orgId)
public PagedDynamicDataResp GetSubOrgs(string orgId)
{
string cascadeId = ".0.";
if (!string.IsNullOrEmpty(orgId))
@@ -187,10 +187,10 @@ namespace OpenAuth.WebApi.Controllers
var org = _authStrategyContext.Orgs.SingleOrDefault(u => u.Id == orgId);
if (org == null)
{
return new TableData
return new PagedDynamicDataResp
{
msg = "未找到指定的节点",
code = 500,
Message = "未找到指定的节点",
Code = 500,
};
}
cascadeId = org.CascadeId;
@@ -200,10 +200,10 @@ namespace OpenAuth.WebApi.Controllers
.Where(u => u.CascadeId.Contains(cascadeId))
.OrderBy(u =>u.CascadeId);
return new TableData
return new PagedDynamicDataResp
{
data = query.ToList(),
count = query.Count(),
Data = query.ToList(),
Count = query.Count(),
};
}
@@ -216,7 +216,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<ModuleView>>();
try
{
result.Result = _authStrategyContext.Modules;
result.Data = _authStrategyContext.Modules;
}
catch (CommonException ex)
{
@@ -247,7 +247,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<IEnumerable<TreeItem<ModuleView>>>();
try
{
result.Result = _authStrategyContext.Modules.GenerateTree(u => u.Id, u => u.ParentId);
result.Data = _authStrategyContext.Modules.GenerateTree(u => u.Id, u => u.ParentId);
}
catch (CommonException ex)
{
@@ -278,7 +278,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<SysResource>>();
try
{
result.Result = _authStrategyContext.Resources;
result.Data = _authStrategyContext.Resources;
}
catch (CommonException ex)
{
@@ -309,7 +309,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<string>();
try
{
result.Result = _authStrategyContext.User.Account;
result.Data = _authStrategyContext.User.Account;
}
catch (CommonException ex)
{
@@ -364,11 +364,11 @@ namespace OpenAuth.WebApi.Controllers
var resp = new Response<bool>();
try
{
resp.Result = _authUtil.Logout();
resp.Data = _authUtil.Logout();
}
catch (Exception e)
{
resp.Result = false;
resp.Data = false;
resp.Message = e.Message;
}

4
OpenAuth.WebApi/Controllers/DataPrivilegeRulesController.cs
View File

@@ -30,7 +30,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<DataPrivilegeRule>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -88,7 +88,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryDataPrivilegeRuleListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryDataPrivilegeRuleListReq request)
{
return await _app.Load(request);
}

10
OpenAuth.WebApi/Controllers/DynamicApiController.cs
View File

@@ -34,9 +34,9 @@ namespace OpenAuth.WebApi.Controllers
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<TableData> GetList([FromBody] QueryDynamicListReq req)
public async Task<PagedDynamicDataResp> GetList([FromBody] QueryDynamicListReq req)
{
TableData result = new TableData();
PagedDynamicDataResp result = new PagedDynamicDataResp();
try
{
// 获取实体类型
@@ -44,8 +44,8 @@ namespace OpenAuth.WebApi.Controllers
}
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;
@@ -160,7 +160,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<object>();
try
{
result.Result = await _app.Invoke(req);
result.Data = await _app.Invoke(req);
}
catch (Exception ex)
{

6
OpenAuth.WebApi/Controllers/ExternalDataSourcesController.cs
View File

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<ExternalDataSource>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -98,7 +98,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryExternalDataSourceListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryExternalDataSourceListReq request)
{
return await _app.Load(request);
}
@@ -108,7 +108,7 @@ namespace OpenAuth.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpGet]
public TableData GetDbTypes()
public PagedDynamicDataResp GetDbTypes()
{
return _app.GetDbTypes();

6
OpenAuth.WebApi/Controllers/FilesController.cs
View File

@@ -33,7 +33,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载附件列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryFileListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryFileListReq request)
{
return await _app.Load(request);
}
@@ -74,7 +74,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<IList<UploadFile>>();
try
{
result.Result = _app.Add(files);
result.Data = _app.Add(files);
}
catch (Exception ex)
{
@@ -99,7 +99,7 @@ namespace OpenAuth.WebApi.Controllers
try
{
var files = HttpContext.Request.Form.Files;
result.Result = _app.Add(files);
result.Data = _app.Add(files);
}
catch (Exception ex)
{

2
OpenAuth.WebApi/Controllers/FlowApproversController.cs
View File

@@ -59,7 +59,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableResp<FlowApprover>> Load([FromQuery] QueryApproverReq request)
public async Task<PagedListDataResp<FlowApprover>> Load([FromQuery] QueryApproverReq request)
{
return await _app.Load(request);
}

8
OpenAuth.WebApi/Controllers/FlowInstancesController.cs
View File

@@ -33,7 +33,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<FlowVerificationResp>();
try
{
result.Result = _app.GetForVerification(id);
result.Data = _app.GetForVerification(id);
}
catch (Exception ex)
{
@@ -53,7 +53,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<FlowInstanceOperationHistory>>();
try
{
result.Result= _app.QueryHistories(request);
result.Data= _app.QueryHistories(request);
}
catch (Exception ex)
{
@@ -73,7 +73,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<string>();
try
{
result.Result = _app.CreateInstance(obj);
result.Data = _app.CreateInstance(obj);
}
catch (Exception ex)
{
@@ -192,7 +192,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryFlowInstanceListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryFlowInstanceListReq request)
{
return await _app.Load(request);
}

6
OpenAuth.WebApi/Controllers/FlowSchemesController.cs
View File

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<FlowScheme>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -79,7 +79,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryFlowSchemeListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryFlowSchemeListReq request)
{
return await _app.Load(request);
}
@@ -91,7 +91,7 @@ namespace OpenAuth.WebApi.Controllers
public Response<List<FlowScheme>> LoadUrlFormFlowScheme()
{
var result = new Response<List<FlowScheme>>();
result.Result = _app.LoadUrlFormFlowScheme();
result.Data = _app.LoadUrlFormFlowScheme();
return result;
}

6
OpenAuth.WebApi/Controllers/FormsController.cs
View File

@@ -31,11 +31,11 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<FormResp>();
try
{
result.Result = _app.FindSingle(id);
result.Data = _app.FindSingle(id);
if (!string.IsNullOrEmpty(canWriteFormItemIds))
{
result.Result.CanWriteFormItemIds = JsonHelper.Instance.Deserialize<string[]>(canWriteFormItemIds);
result.Data.CanWriteFormItemIds = JsonHelper.Instance.Deserialize<string[]>(canWriteFormItemIds);
}
}
catch (Exception ex)
@@ -89,7 +89,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryFormListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryFormListReq request)
{
return await _app.Load(request);
}

18
OpenAuth.WebApi/Controllers/ModulesController.cs
View File

@@ -37,7 +37,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<IEnumerable<Module>>();
try
{
result.Result = _app.LoadForRole(firstId);
result.Data = _app.LoadForRole(firstId);
}
catch (Exception ex)
{
@@ -58,7 +58,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<IEnumerable<ModuleElement>>();
try
{
result.Result = _app.LoadMenusForRole(moduleId, firstId);
result.Data = _app.LoadMenusForRole(moduleId, firstId);
}
catch (Exception ex)
{
@@ -81,7 +81,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<IEnumerable<string>>();
try
{
result.Result = _app.LoadPropertiesForRole(roleId, moduleCode);
result.Data = _app.LoadPropertiesForRole(roleId, moduleCode);
}
catch (Exception ex)
{
@@ -105,7 +105,7 @@ namespace OpenAuth.WebApi.Controllers
var user = _authUtil.GetCurrentUser();
if (string.IsNullOrEmpty(moduleId))
{
result.Result = user.ModuleElements;
result.Data = user.ModuleElements;
}
else
{
@@ -115,7 +115,7 @@ namespace OpenAuth.WebApi.Controllers
throw new Exception("模块不存在");
}
result.Result = module.Elements;
result.Data = module.Elements;
}
}
catch (Exception ex)
@@ -138,7 +138,7 @@ namespace OpenAuth.WebApi.Controllers
try
{
_app.Add(obj);
result.Result = obj;
result.Data = obj;
}
catch (Exception ex)
{
@@ -198,7 +198,7 @@ namespace OpenAuth.WebApi.Controllers
try
{
_app.AddMenu(obj);
result.Result = obj;
result.Data = obj;
}
catch (Exception ex)
{
@@ -259,7 +259,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<SysPrinterPlan>>();
try
{
result.Result = _app.LoadPrinterPlans(moduleId).ToList();
result.Data = _app.LoadPrinterPlans(moduleId).ToList();
}
catch (Exception ex)
{
@@ -279,7 +279,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<FlowScheme>>();
try
{
result.Result = _app.LoadFlowSchemes(moduleId).ToList();
result.Data = _app.LoadFlowSchemes(moduleId).ToList();
}
catch (Exception ex)
{

6
OpenAuth.WebApi/Controllers/OpenJobsController.cs
View File

@@ -28,7 +28,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<OpenJob>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -89,7 +89,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryOpenJobListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryOpenJobListReq request)
{
return await _app.Load(request);
}
@@ -124,7 +124,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<string>>();
try
{
result.Result = _app.QueryLocalHandlers();
result.Data = _app.QueryLocalHandlers();
}
catch (Exception ex)
{

4
OpenAuth.WebApi/Controllers/OrgsController.cs
View File

@@ -25,7 +25,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<SysOrg>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -49,7 +49,7 @@ namespace OpenAuth.WebApi.Controllers
try
{
_app.Add(obj);
result.Result = obj;
result.Data = obj;
}
catch (Exception ex)
{

8
OpenAuth.WebApi/Controllers/ResourcesController.cs
View File

@@ -27,7 +27,7 @@ namespace OpenAuth.WebApi.Controllers
_app = app;
}
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryResourcesReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryResourcesReq request)
{
return await _app.Load(request);
}
@@ -77,7 +77,7 @@ namespace OpenAuth.WebApi.Controllers
try
{
_app.Add(obj);
resp.Result = obj.Id;
resp.Data = obj.Id;
}
catch (Exception e)
{
@@ -114,7 +114,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<SysResource>>();
try
{
result.Result = _app.LoadForRole(appId, firstId).ToList();
result.Data = _app.LoadForRole(appId, firstId).ToList();
}
catch (Exception e)
@@ -135,7 +135,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<SysResourceApp>>();
try
{
result.Result = await _app.GetResourceApps();
result.Data = await _app.GetResourceApps();
}
catch (Exception e)
{

10
OpenAuth.WebApi/Controllers/RolesController.cs
View File

@@ -32,7 +32,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<Role>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -53,7 +53,7 @@ namespace OpenAuth.WebApi.Controllers
try
{
_app.Add(obj);
result.Result = obj;
result.Data = obj;
}
catch (Exception ex)
@@ -93,7 +93,7 @@ namespace OpenAuth.WebApi.Controllers
/// 为了控制权限，通常只用于流程实例选择执行角色，其他地方请使用Load
/// </summary>
[HttpGet]
public async Task<TableResp<Role>> LoadAll([FromQuery]QueryRoleListReq request)
public async Task<PagedListDataResp<Role>> LoadAll([FromQuery]QueryRoleListReq request)
{
return await _app.LoadAll(request);
}
@@ -107,7 +107,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<Role>>();
try
{
result.Result = _app.Load(request);
result.Data = _app.Load(request);
}
catch (Exception ex)
@@ -128,7 +128,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<string>>();
try
{
result.Result = _revelanceManagerApp.Get(Define.USERROLE, true, userId);
result.Data = _revelanceManagerApp.Get(Define.USERROLE, true, userId);
}
catch (Exception e)
{

14
OpenAuth.WebApi/Controllers/SysConfController.cs
View File

@@ -38,7 +38,7 @@ namespace OpenAuth.WebApi.Controllers
{
return new Response<bool>
{
Result = _appConfiguration.Value.IsIdentityAuth
Data = _appConfiguration.Value.IsIdentityAuth
};
}
@@ -54,7 +54,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<SysTableColumn>>();
try
{
result.Result = _dbExtension.GetDbTableStructure(tableName, externalDataSourceId).ToList();
result.Data = _dbExtension.GetDbTableStructure(tableName, externalDataSourceId).ToList();
}
catch (Exception ex)
{
@@ -71,12 +71,12 @@ namespace OpenAuth.WebApi.Controllers
/// <param name="externalDataSourceId">外部数据源ID</param>
/// <returns></returns>
[HttpGet]
public TableData GetDbTableStructureForSelect(string tableName, string externalDataSourceId)
public PagedDynamicDataResp GetDbTableStructureForSelect(string tableName, string externalDataSourceId)
{
var result = new TableData();
var result = new PagedDynamicDataResp();
try
{
result.data = _dbExtension.GetDbTableStructure(tableName, externalDataSourceId).Select(u => new
result.Data = _dbExtension.GetDbTableStructure(tableName, externalDataSourceId).Select(u => new
{
Id = u.ColumnName,
Name = u.ColumnName
@@ -84,8 +84,8 @@ namespace OpenAuth.WebApi.Controllers
}
catch (Exception ex)
{
result.code = 500;
result.msg = ex.Message;
result.Code = 500;
result.Message = ex.Message;
}
return result;
}

4
OpenAuth.WebApi/Controllers/SysLogsController.cs
View File

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<SysLog>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -83,7 +83,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QuerySysLogListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QuerySysLogListReq request)
{
return await _app.Load(request);
}

4
OpenAuth.WebApi/Controllers/SysMessagesController.cs
View File

@@ -30,7 +30,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<SysMessage>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -68,7 +68,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QuerySysMessageListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QuerySysMessageListReq request)
{
return await _app.Load(request);
}

12
OpenAuth.WebApi/Controllers/SysPrinterPlansController.cs
View File

@@ -28,7 +28,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<SysPrinterPlan>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -46,7 +46,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<string>();
try
{
result.Result=_app.Add(obj);
result.Data=_app.Add(obj);
}
catch (Exception ex)
@@ -68,7 +68,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<DbTableInfo>>();
try
{
result.Result = _app.GetTables();
result.Data = _app.GetTables();
}
catch (Exception ex)
{
@@ -90,7 +90,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<List<DbColumnInfo>>();
try
{
result.Result = _app.GetColumns(tableViewName);
result.Data = _app.GetColumns(tableViewName);
}
catch (Exception ex)
{
@@ -124,7 +124,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QuerySysPrinterPlanListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QuerySysPrinterPlanListReq request)
{
return await _app.Load(request);
}
@@ -133,7 +133,7 @@ namespace OpenAuth.WebApi.Controllers
/// 打印方案根据数据源获取打印数据
/// </summary>
[HttpPost]
public async Task<TableData> Query([FromBody] QueryReq request)
public async Task<PagedDynamicDataResp> Query([FromBody] QueryReq request)
{
return await _app.Query(request);
}

12
OpenAuth.WebApi/Controllers/UsersController.cs
View File

@@ -24,7 +24,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<UserView>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -89,7 +89,7 @@ namespace OpenAuth.WebApi.Controllers
try
{
_app.AddOrUpdate(obj);
result.Result = obj.Id; //返回ID
result.Data = obj.Id; //返回ID
}
catch (Exception ex)
{
@@ -106,7 +106,7 @@ namespace OpenAuth.WebApi.Controllers
/// 获取当前登录用户可访问的一个部门及子部门全部用户
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryUserListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryUserListReq request)
{
return await _app.Load(request);
}
@@ -116,7 +116,7 @@ namespace OpenAuth.WebApi.Controllers
/// 为了控制权限，通常只用于流程实例选择执行角色，其他地方请使用Load
/// </summary>
[HttpGet]
public async Task<TableResp<UserView>> LoadAll([FromQuery]QueryUserListReq request)
public async Task<PagedListDataResp<UserView>> LoadAll([FromQuery]QueryUserListReq request)
{
return await _app.LoadAll(request);
}
@@ -143,7 +143,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载指定角色的用户
/// </summary>
[HttpGet]
public async Task<TableData> LoadByRole([FromQuery]QueryUserListByRoleReq request)
public async Task<PagedDynamicDataResp> LoadByRole([FromQuery]QueryUserListByRoleReq request)
{
return await _app.LoadByRole(request);
}
@@ -153,7 +153,7 @@ namespace OpenAuth.WebApi.Controllers
/// 不包含下级部门的用户
/// </summary>
[HttpGet]
public async Task<TableData> LoadByOrg([FromQuery]QueryUserListByOrgReq request)
public async Task<PagedDynamicDataResp> LoadByOrg([FromQuery]QueryUserListByOrgReq request)
{
return await _app.LoadByOrg(request);
}

6
OpenAuth.WebApi/Controllers/WmsInboundOrderDtblsController.cs
View File

@@ -27,7 +27,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<WmsInboundOrderDtbl>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -46,7 +46,7 @@ namespace OpenAuth.WebApi.Controllers
try
{
_app.Add(obj);
result.Result = obj.Id;
result.Data = obj.Id;
}
catch (Exception ex)
{
@@ -85,7 +85,7 @@ namespace OpenAuth.WebApi.Controllers
/// </summary>
[HttpGet]
[AllowAnonymous]
public async Task<TableData> Load([FromQuery]QueryWmsInboundOrderDtblListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryWmsInboundOrderDtblListReq request)
{
return await _app.Load(request);
}

4
OpenAuth.WebApi/Controllers/WmsInboundOrderTblsController.cs
View File

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
var result = new Response<WmsInboundOrderTbl>();
try
{
result.Result = _app.Get(id);
result.Data = _app.Get(id);
}
catch (Exception ex)
{
@@ -90,7 +90,7 @@ namespace OpenAuth.WebApi.Controllers
/// 加载列表
/// </summary>
[HttpGet]
public async Task<TableData> Load([FromQuery]QueryWmsInboundOrderTblListReq request)
public async Task<PagedDynamicDataResp> Load([FromQuery]QueryWmsInboundOrderTblListReq request)
{
return await _app.Load(request);
}