修改泛型通用接口

This commit is contained in:
2023-11-16 17:31:39 +08:00
parent 4689be2ed1
commit 9915cbd4f9
10 changed files with 211 additions and 153 deletions

View File

@@ -21,7 +21,7 @@ namespace Tnb.Vengine.AppService;
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, KeepVerb = true, Order = 1102)]
[Route("api/[area]/[controller]/[action]")]
public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel>, IVmodelAppService
public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel, VmQueryInput, VmGetListInput, Vmodel, VmodelCreateInput, VmodelUpdateInput>, IVmodelAppService
{
private readonly IViewEngine _viewEngine;
private readonly ICacheManager _cache;
@@ -36,51 +36,45 @@ public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel
}
/// <summary>
/// 获取一条 数据信息
/// 获取一条 数据信息, q参数无效
/// </summary>
public override async Task<Vmodel> GetAsync(VmodelGetInput input)
{
//VmodelGetInput para = new VmodelGetInput();
//if (!string.IsNullOrEmpty(input.q))
//{
// para = input.q.ToObject<VmodelGetInput>();
//}
//var query = _db.Queryable<Vmodel>().Where(a => a.deleted == 0);
//Vmodel? vm = null;
//if (!string.IsNullOrEmpty(input.id))
//{
// vm = await _dataAccess.GetVmodelAsync(input.id, para.drill);
//}
//else if (!string.IsNullOrEmpty(para.areaCode) && !string.IsNullOrEmpty(para.vmCode))
//{
// vm = await _dataAccess.GetVmodelAsync(para.areaCode, para.vmCode, para.drill);
//}
//ThrowIf.IsNull(vm, "输入参数有误, id 和 areaCode,vmCode 不可同时为空");
return await base.GetAsync(input);
var query = _db.Queryable<Vmodel>().Where(a => a.deleted == 0);
Vmodel? vm = null;
if (!string.IsNullOrEmpty(input.id))
{
vm = await _dataAccess.GetVmodelAsync(input.id, input.drill);
}
else if (!string.IsNullOrEmpty(input.areaCode) && !string.IsNullOrEmpty(input.vmCode))
{
vm = await _dataAccess.GetVmodelAsync(input.areaCode, input.vmCode, input.drill);
}
ThrowIf.IsNull(vm, "输入参数有误, id 和 areaCode,vmCode 不可同时为空");
return vm;
}
///// <summary>
///// 获取多条 数据列表
///// </summary>
//public override async Task<PagedOutput<dynamic>> GetListAsync(VmGetListInput input)
//{
// return await ListAsync(input.ToQueryInput());
//}
/// <summary>
/// 获取多条 数据列表
/// </summary>
public override async Task<PagedOutput<Vmodel>> GetListAsync(VmGetListInput input)
{
return await ListAsync(input.Adapt<VmQueryInput>());
}
[NonAction]
public override async Task<PagedOutput<dynamic>> ListAsync(VmQueryInput input)
public override async Task<PagedOutput<Vmodel>> ListAsync(VmQueryInput input)
{
VmPagedOutput ret = new();
var q = _db.Queryable<Vmodel>().WhereIF(!string.IsNullOrEmpty(input.k), a => a.vmCode.Contains(input.k!) || a.vmName.Contains(input.k!));
RefAsync<int> total = 0;
var data = await q.OrderBy(input.sort).ToPageListAsync((input.pnum - 1) * input.psize, input.psize, total);
return PagedOutput.Create(total, data.Adapt<List<dynamic>>());
return PagedOutput.Create(total, data);
}
/// <summary>
/// 新增 模型
/// </summary>
public override async Task<dynamic> CreateAsync(VmCreateInput input)
public override async Task<dynamic> CreateAsync(VmodelCreateInput input)
{
ThrowIf.IsNull(input.data);
//ArgumentNullException.ThrowIfNull(input.data);
@@ -94,7 +88,7 @@ public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel
/// <summary>
/// 更新 数据
/// </summary>
public override async Task<dynamic> UpdateAsync(VmUpdateInput input)
public override async Task<dynamic> UpdateAsync(VmodelUpdateInput input)
{
ThrowIf.IsNull(input.data);
//ArgumentNullException.ThrowIfNull(input.data);
@@ -104,7 +98,7 @@ public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel
vm.navProps.ForEach(a => a.naviModel = null);
await _db.Updateable(vm).WhereColumns(a => a.id).ExecuteCommandAsync();
await _cache.DelAsync(_dataAccess.GetVmodelCacheKey(vm.id));
return input;
return vm;
}
/// <summary>