wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善通用接口输入参数

Browse Source
This commit is contained in:
潘飞
2023-11-21 00:19:45 +08:00
parent 079eec500b
commit 70de358f97
17 changed files with 375 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
View File

@@ -5,11 +5,15 @@
using JNPF;
using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Manager;
using JNPF.Common.Security;
using JNPF.ViewEngine;
using Mapster;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Org.BouncyCastle.Crypto;
using SqlSugar;
using Tnb.Core;
using Tnb.Vengine.DataAccess;
@@ -23,7 +27,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, VmQueryInput, VmGetListInput, Vmodel, VmodelCreateInput, VmodelUpdateInput>, IVmodelAppService
public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel, VmQueryInput, Vmodel, VmodelCreateInput>, IVmodelAppService
{
private readonly IViewEngine _viewEngine;
private readonly ICacheManager _cache;
@@ -39,41 +43,113 @@ public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel
_user = user;
}
protected override Task<Vmodel> GetVmodelAsync()
{
var vm = new Vmodel
{
//id = "30285088677397",
areaCode = "tnb",
vmCode = "vmodel",
vmName = "视图模型",
dbCode = "",
tableName = "sys_vmodel",
dbProps = new List<VmDbProp> {
new VmDbProp{field="id",csType="string",length=50,digit=0,ordinal=1,required=true,pkey=true,fuzzy=false,defValue=null,descrip=null,code="id",name="主键标识"},
new VmDbProp{field="area_code",csType="string",length=50,digit=0,ordinal=2,required=true,pkey=false,fuzzy=false,defValue=null,descrip=null,code="areaCode",name="模块代码"},
new VmDbProp{field="vm_code",csType="string",length=100,digit=0,ordinal=3,required=true,pkey=false,fuzzy=true,defValue=null,descrip=null,code="vmCode",name="视图代码"},
new VmDbProp{field="vm_name",csType="string",length=100,digit=0,ordinal=4,required=true,pkey=false,fuzzy=true,defValue=null,descrip=null,code="vmName",name="视图名称"},
new VmDbProp{field="db_code",csType="string",length=50,digit=0,ordinal=5,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="dbCode",name="数据库连接"},
new VmDbProp{field="table_name",csType="string",length=50,digit=0,ordinal=6,required=true,pkey=false,fuzzy=true,defValue=null,descrip=null,code="tableName",name="主表名称"},
new VmDbProp{field="db_props",csType="string",length=0,digit=0,ordinal=7,required=true,pkey=false,fuzzy=false,defValue=null,descrip=null,code="dbProps",name="表字段属性"},
new VmDbProp{field="nav_props",csType="string",length=0,digit=0,ordinal=8,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="navProps",name="导航属性"},
new VmDbProp{field="cal_props",csType="string",length=0,digit=0,ordinal=9,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="calProps",name="计算配置"},
new VmDbProp{field="ordinal",csType="int",length=0,digit=0,ordinal=10,required=true,pkey=false,fuzzy=false,defValue=null,descrip=null,code="ordinal",name="排序"},
new VmDbProp{field="soft_delete",csType="short",length=0,digit=0,ordinal=11,required=true,pkey=false,fuzzy=false,defValue=null,descrip=null,code="softDelete",name="软删除"},
new VmDbProp{field="enabled",csType="short",length=0,digit=0,ordinal=12,required=true,pkey=false,fuzzy=false,defValue=null,descrip=null,code="enabled",name="是否激活"},
new VmDbProp{field="deleted",csType="short",length=0,digit=0,ordinal=13,required=true,pkey=false,fuzzy=false,defValue=null,descrip=null,code="deleted",name="是否删除"},
new VmDbProp{field="descrip",csType="string",length=250,digit=0,ordinal=14,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="descrip",name="描述"},
new VmDbProp{field="create_time",csType="DateTime",length=0,digit=0,ordinal=15,required=true,pkey=false,fuzzy=false,defValue=null,descrip=null,code="createTime",name="创建时间"},
new VmDbProp{field="create_id",csType="string",length=50,digit=0,ordinal=16,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="createId",name="创建人"},
new VmDbProp{field="modify_time",csType="DateTime",length=0,digit=0,ordinal=17,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="modifyTime",name="修改时间"},
new VmDbProp{field="modify_id",csType="string",length=50,digit=0,ordinal=18,required=false,pkey=false,fuzzy=false,defValue=null,descrip=null,code="modifyId",name="修改人"}
},
navProps = [],
calProps = [],
ordinal = 0,
softDelete = 0,
enabled = 1,
deleted = 0,
descrip = null
};
return Task.FromResult(vm);
}
/// <summary>
/// 获取一条 数据信息, q参数无效
/// </summary>
public override async Task<Vmodel> GetAsync(VmodelGetInput input)
{
input.LoadFromHttpContext(App.HttpContext);
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);
vm = await _dataAccess.GetVmodelAsync(input.id);
}
else if (!string.IsNullOrEmpty(input.areaCode) && !string.IsNullOrEmpty(input.vmCode))
else if (input.q.ContainsKey("areaCode") && input.q.ContainsKey("vmCode"))
{
vm = await _dataAccess.GetVmodelAsync(input.areaCode, input.vmCode, input.drill);
vm = await _dataAccess.GetVmodelAsync(input.q["areaCode"].ToString()!, input.q["vmCode"].ToString()!);
}
ThrowIf.IsNull(vm, "输入参数有误, id 和 areaCode,vmCode 不可同时为空");
if (input.drill)
{
List<string> vmids = vm.navProps.Select(a => a.vmid).Distinct().ToList();
if (vmids.Count > 0)
{
List<Vmodel> ls = await _db.Queryable<Vmodel>().Where(a => vmids.Contains(a.id)).ToListAsync();
Dictionary<string, Vmodel> navs = ls.ToDictionary(a => a.id);
foreach (VmNavProp navProp in vm.navProps)
{
navProp.naviModel = navs.GetOrDefault(navProp.vmid);
}
}
}
//var serializer = new Newtonsoft.Json.JsonSerializer();
//var stringWriter = new StringWriter();
//using (var writer = new Newtonsoft.Json.JsonTextWriter(stringWriter))
//{
// writer.QuoteName = false;
// serializer.Serialize(writer, vm);
//}
//var json = stringWriter.ToString();
return vm;
}
/// <summary>
/// 获取多条 数据列表
/// </summary>
public override async Task<PagedOutput<Vmodel>> GetListAsync(VmGetListInput input)
public override async Task<PagedOutput<Vmodel>> GetListAsync(VmQueryInput input)
{
return await ListAsync(input.Adapt<VmQueryInput>());
input.LoadFromHttpContext(App.HttpContext);
return await ListAsync(input);
}
[NonAction]
public override async Task<PagedOutput<Vmodel>> ListAsync(VmQueryInput input)
{
var q = _db.Queryable<Vmodel>().Where(a => a.deleted == 0)
.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);
PagedOutput<Vmodel> result = new PagedOutput<Vmodel>();
var vm = await GetVmodelAsync();
var ls = await _dataAccess.QueryDataAsync(vm, input);
foreach (var item in ls.items)
{
item["dbProps"] = JsonConvert.DeserializeObject<List<VmDbProp>>(item["dbProps"].ToString()!)!;
item["navProps"] = JsonConvert.DeserializeObject<List<VmNavProp>>(item["navProps"].ToString()!)!;
item["calProps"] = JsonConvert.DeserializeObject<List<VmCalProp>>(item["calProps"].ToString()!)!;
}
return ls.ToPagedOutput<Vmodel>();
}
/// <summary>
@@ -95,20 +171,30 @@ public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel
/// <summary>
/// 更新 数据
/// </summary>
public override async Task<dynamic> UpdateAsync(VmodelUpdateInput input)
public override async Task<dynamic> UpdateAsync(VmEditInput input)
{
ThrowIf.IsNull(input.data);
ThrowIf.IsNullOrEmpty(input.data.id, $"更新数据时主键(id)不可为空");
Vmodel vm = input.data.Adapt<Vmodel>();
vm.areaCode = vm.areaCode.ToKebab();
vm.vmCode = vm.vmCode.ToKebab();
vm.navProps.ForEach(a => a.naviModel = null);
vm.modifyTime = DateTime.Now;
vm.modifyId = _user.UserId;
await _db.Updateable(vm).WhereColumns(a => a.id).ExecuteCommandAsync();
await _cache.DelAsync(_dataAccess.GetVmodelCacheKey(vm.id));
return vm;
var ret = await base.UpdateAsync(input);
if (input.data != null)
{
var id = ret as string;
await _cache.DelAsync(_dataAccess.GetVmodelCacheKey(id!));
}
else if (input.items != null)
{
var ids = ret as List<string>;
foreach (var item in ids!)
{
await _cache.DelAsync(_dataAccess.GetVmodelCacheKey(item));
}
}
return ret;
//vm.areaCode = vm.areaCode.ToKebab();
//vm.vmCode = vm.vmCode.ToKebab();
//vm.navProps.ForEach(a => a.naviModel = null);
//vm.modifyTime = DateTime.Now;
//vm.modifyId = _user.UserId;
//await _db.Updateable(vm).WhereColumns(a => a.id).ExecuteCommandAsync();
//return vm;
}
/// <summary>
@@ -116,8 +202,21 @@ public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel
/// </summary>
public override async Task<dynamic> DeleteAsync(VmDeleteInput input)
{
var ret = await _db.Updateable<Vmodel>().SetColumns(a => a.deleted, 1).Where(a => a.id == input.id).ExecuteCommandAsync();
await _cache.DelAsync(_dataAccess.GetVmodelCacheKey(input.id!));
List<string> ids = new();
if (input.id != null)
{
ids.Add(input.id);
}
else if (input.ids != null)
{
ids.AddRange(input.ids);
}
var ret = await _db.Updateable<Vmodel>().SetColumns(a => a.deleted, 1).Where(a => ids.Contains(a.id)).ExecuteCommandAsync();
foreach (var item in ids)
{
await _cache.DelAsync(_dataAccess.GetVmodelCacheKey(item));
}
return ret;
}
@@ -242,4 +341,5 @@ public class VmodelAppService : VengineAppService<Vmodel, VmodelGetInput, Vmodel
return code;
}
}
}