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

1
Tnb.Server.sln
View File

@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决
dotnet.ruleset = dotnet.ruleset
global.json = global.json
nuget.config = nuget.config
request.http = request.http
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.Message", "message\Tnb.Message\Tnb.Message.csproj", "{134DB335-444D-47CE-94EE-3AF062F26883}"

17
apihost/Tnb.API.Entry/wwwroot/Template/VengineSqlSugar/EntityDto.cshtml
View File

@@ -17,10 +17,15 @@ namespace @(context.NsPrefix + "." + vm.areaCode + ".AppService");
/// <summary>
/// @(vm.vmCode)Dto对象
/// </summary>
public partial class @(vm.vmCode)Dto
{
@foreach (var col in vm.dbProps.OrderBy(a => a.ordinal)){
@://public @(col.required ? col.csType : (col.csType + "?")) @col.code { get; set; }@(col.GetDefaultValueString())
}
}
public record @(vm.vmCode)Dto(@vm.GetPropStr(true, true));
public class @(vm.vmCode)CreateInput : VmEditInput
{
public new @(vm.vmCode)CreateData? data { get; set; }
public override VmEditInput ToEditInput()
{
VmEditInput input = this;
input.data = DObject.FromObject(data);
return input;
}
}

17
apihost/Tnb.API.Entry/wwwroot/Template/VengineSqlSugar/EntityDtoAcmen.cshtml
View File

@@ -12,20 +12,15 @@
@using Tnb.Vengine;
@using Tnb.Vengine.Domain;
@{
AcmenVmodelContext context = Model;
Vmodel vm = context.Vm;
AcmenVmodelContext context = Model;
Vmodel vm = context.Vm;
}
using Tnb.Core;
namespace @(context.NsPrefix + "." + vm.areaCode + ".AppService");
/// <summary>
/// @(vm.vmCode)Dto对象
/// </summary>
public partial class @(vm.vmCode)Dto
{
@foreach (var col in vm.dbProps.OrderBy(a => a.ordinal)){
@://public @(col.required ? col.csType : (col.csType + "?")) @col.code { get; set; }@(col.GetDefaultValueString())
}
}
public record @(vm.vmCode)CreateData(@vm.GetPropStr(false, false));
public record @(vm.vmCode)UpdateData(@vm.GetPropStr(true, false));

70
request.http
View File

@@ -12,20 +12,54 @@ origin=password&code=&account=admin&login_type=&jnpf_ticket=&socialsOptions.IsCu
@token=Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVc2VySWQiOiIyNDc1NTMxNzY0OTQyOSIsIkFjY291bnQiOiJhZG1pbiIsIlVzZXJOYW1lIjoi6LaF57qn566h55CG5ZGYIiwiT3JnSWQiOiIyNDc1NTQ2OTg5ODAwNSIsIkFkbWluaXN0cmF0b3IiOjEsIlRlbmFudElkIjoiZGVmYXVsdCIsIkNvbm5lY3Rpb25Db25maWciOnsiQ29uZmlnSWQiOiJkZWZhdWx0IiwiSXNDdXN0b20iOmZhbHNlLCJJc01hc3RlclNsYXZlU2VwYXJhdGlvbiI6ZmFsc2UsIkNvbmZpZ0xpc3QiOlt7IklzTWFzdGVyIjp0cnVlLCJTZXJ2aWNlTmFtZSI6InRpYW55aV9iYXMiLCJkYlR5cGUiOjQsImNvbm5lY3Rpb25TdHIiOiJCQUYyMzBERkVGNzhEQjJEMEY2REY1Njg1REU1NjZGRUE5RjQ4NUU1OEFCQjE2RjIwMDIyMDk0QTExMTU4QjdDMDg2NzU0ODM0MjU1NzI4M0Q2RjE0NTRGRjVDM0NDRkI2QjYzMjYyM0E4QTYyMUI2QUY4ODkzNUMwOTcwNzAxOEYxQkNBOENBMTE5RkY0NUY2N0Q0MzdGMEQyMERFRTlEOTFEQzQ1ODk0OTg0NDQyNUVFQUY3QUZENTZGQUM1OTkifV19LCJTaW5nbGVMb2dpbiI6MiwiT25saW5lVGlja2V0IjpudWxsLCJMb2dpblR5cGUiOm51bGwsImlhdCI6MTcwMDAxOTA1NiwibmJmIjoxNzAwMDE5MDU2LCJleHAiOjE3MDc3OTUwNTYsImlzcyI6InR1b3RvbmciLCJhdWQiOiJ0dW90b25nIn0.8BgT-K1uWoADsmIvqGXp_6e3Fb31-X1euodhn3uqXg0
/////////////////////////////////////////////////////////////////////////
// 动态模型接口
// 动态模型接口 通过vmid访问
/////////////////////////////////////////////////////////////////////////
@vmid=29974114038805
@vmid=30060151588373
### 获取一条数据
GET {{host}}/api/vengine/{{vmid}}/get?id=3
GET {{host}}/api/tnb/vengine/{{vmid}}/get?whcode=007
Authorization: {{token}}
### 获取多条数据
GET {{host}}/api/vengine/{{vmid}}/get-list?pnum=1&psize=10
GET {{host}}/api/tnb/vengine/{{vmid}}/get-list?pnum=1&psize=10&whcode=>>002&sort=whcode
Authorization: {{token}}
### 新增
POST {{host}}/api/tnb/vengine/{{vmid}}/create
Content-Type: application/json
Authorization: {{token}}
{
}
### 修改
PUT {{host}}/api/tnb/vengine/{{vmid}}/update
Content-Type: application/json
Authorization: {{token}}
{
}
### 删除
DELETE {{host}}/api/tnb/vengine/{{vmid}}/delete?id=
Authorization: {{token}}
/////////////////////////////////////////////////////////////////////////
// 动态模型接口 通过areaCode/vmCode访问
/////////////////////////////////////////////////////////////////////////
### 获取一条数据
GET {{host}}/api/wms/distask-h/get?id=30068699288343
Authorization: {{token}}
### 获取多条数据
POST {{host}}/api/wms/distask/list
GET {{host}}/api/wms/distask-h/get-list?pnum=1&psize=10&billCode=%%WTR20231114
Authorization: {{token}}
### 获取多条数据
POST {{host}}/api/wms/distask-h/list
Content-Type: application/json
Authorization: {{token}}
@@ -35,36 +69,16 @@ Authorization: {{token}}
"sort": "",
"k": "",
"q": {
"equip.code": "Elevator4",
"bindDevice.code": "Elevator4",
//"equip.equipType.code": "004",
//"isSign": ["in", 0, 1]
},
"o": "billCode,taskType,equip.name,equip.code"
//"o": "billCode,taskType,equip.name,equip.code,equip.equipType.code,equip.equipType.name"
"o": "billCode,taskType,bindDevice.name,bindDevice.code"
//"o": "billCode,taskType,equip.name,bindDevice.code,bindDevice.equipType.code,equip.equipType.name"
//"o": "*, equip.*, equip.equipType.*"
}
### 新增
POST {{host}}/api/vengine/{{vmid}}/create
Content-Type: application/json
Authorization: {{token}}
{
}
### 修改
PUT {{host}}/api/vengine/{{vmid}}/update
Content-Type: application/json
Authorization: {{token}}
{
}
### 删除
DELETE {{host}}/api/vengine/{{vmid}}/delete?id=
Authorization: {{token}}
### 获取模型信息
GET {{host}}/api/tnb/vmodel/get?id=27075467238421

6
visualdev/Tnb.Vengine/AppService/BaseAppService.cs
View File

@@ -3,8 +3,10 @@
// https://git.tuotong-tech.com/tnb/tnb.server //
/////////////////////////////////////////////////////////////////////////////////
using JNPF;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using Microsoft.AspNetCore.Http;
using Tnb.Vengine.DataAccess;
using Tnb.Vengine.Domain;
@@ -30,7 +32,7 @@ public class BaseAppService : IDynamicApiController, ITransient
{
if (!_models.ContainsKey(id))
{
_models[id] = await _dataAccess.GetVmodelAsync(id, false);
_models[id] = await _dataAccess.GetVmodelAsync(id);
}
return _models[id];
}
@@ -42,7 +44,7 @@ public class BaseAppService : IDynamicApiController, ITransient
var key = areaCode + "/" + vmCode;
if (!_models.ContainsKey(key))
{
_models[key] = await _dataAccess.GetVmodelAsync(areaCode, vmCode, false);
_models[key] = await _dataAccess.GetVmodelAsync(areaCode, vmCode);
}
return _models[key];
}

23
visualdev/Tnb.Vengine/AppService/VengineAppService.cs
View File

@@ -3,6 +3,7 @@
// https://git.tuotong-tech.com/tnb/tnb-server //
/////////////////////////////////////////////////////////////////////////////////
using JNPF;
using JNPF.Common.Security;
using Mapster;
using Microsoft.AspNetCore.Authorization;
@@ -40,10 +41,10 @@ public class VengineAppService : BaseAppService, IVengineAppService
public async Task<dynamic?> GetAsync(string vmid, [FromQuery] VmGetInput input)
{
var vm = await GetVmodelAsync(vmid);
var arg = input.Adapt<VmQueryInput>();
arg.AddQueryParaIf(!string.IsNullOrEmpty(input.id), vm.GetPrimary().code, input.id!);
if (!string.IsNullOrEmpty(input.id)) input.q.Add(vm.GetPrimary().code, input.id);
input.LoadFromHttpContext(App.HttpContext);
var ls = await ListAsync(vmid, arg);
var ls = await ListAsync(vmid, input.Adapt<VmQueryInput>());
return ls.items.FirstOrDefault();
}
@@ -51,9 +52,10 @@ public class VengineAppService : BaseAppService, IVengineAppService
/// 获取多条 数据列表
/// </summary>
[HttpGet("api/[area]/[controller]/{vmid}/get-list")]
public async Task<VmPagedOutput> GetListAsync(string vmid, [FromQuery] VmGetListInput input)
public async Task<VmPagedOutput> GetListAsync(string vmid, [FromQuery] VmQueryInput input)
{
return await ListAsync(vmid, input.Adapt<VmQueryInput>());
input.LoadFromHttpContext(App.HttpContext);
return await ListAsync(vmid, input);
}
/// <summary>
@@ -110,10 +112,10 @@ public class VengineAppService : BaseAppService, IVengineAppService
public async Task<dynamic?> GetAsync(string areaCode, string vmCode, [FromQuery] VmGetInput input)
{
var vm = await GetVmodelAsync(areaCode, vmCode);
var arg = input.Adapt<VmQueryInput>();
arg.AddQueryParaIf(!string.IsNullOrEmpty(input.id), vm.GetPrimary().code, input.id!);
if (!string.IsNullOrEmpty(input.id)) input.q.Add(vm.GetPrimary().code, input.id);
input.LoadFromHttpContext(App.HttpContext);
var ls = await ListAsync(areaCode, vmCode, arg);
var ls = await ListAsync(areaCode, vmCode, input.Adapt<VmQueryInput>());
return ls.items.FirstOrDefault();
}
@@ -121,9 +123,10 @@ public class VengineAppService : BaseAppService, IVengineAppService
/// 获取多条 数据列表
/// </summary>
[HttpGet("api/{areaCode}/{vmCode}/get-list")]
public async Task<VmPagedOutput> GetListAsync(string areaCode, string vmCode, [FromQuery] VmGetListInput input)
public async Task<VmPagedOutput> GetListAsync(string areaCode, string vmCode, [FromQuery] VmQueryInput input)
{
return await ListAsync(areaCode, vmCode, input.Adapt<VmQueryInput>());
input.LoadFromHttpContext(App.HttpContext);
return await ListAsync(areaCode, vmCode, input);
}
/// <summary>

53
visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs
View File

@@ -27,11 +27,10 @@ namespace Tnb.Vengine.AppService;
[Authorize]
//[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)]
[Route("api/[area]/[controller]/[action]")]
public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGetListInput, TGetListOutput, TCreateInput, TUpdateInput> : BaseAppService
public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TQueryOutput, TCreateInput, TUpdateInput> : BaseAppService
where TEntity : Entity
where TGetInput : VmGetInput
where TQueryInput : VmQueryInput
where TGetListInput : VmGetListInput
where TCreateInput : VmEditInput
where TUpdateInput : VmEditInput
{
@@ -93,10 +92,10 @@ public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGet
public virtual async Task<TGetOutput> GetAsync([FromQuery] TGetInput input)
{
var vm = await GetVmodelAsync();
TQueryInput arg = input.Adapt<TQueryInput>();
arg.AddQueryParaIf(!string.IsNullOrEmpty(input.id), vm.GetPrimary().code, input.id!);
if (!string.IsNullOrEmpty(input.id)) input.q.Add(vm.GetPrimary().code, input.id);
input.LoadFromHttpContext(App.HttpContext);
var data = (await ListAsync(arg)).items.FirstOrDefault();
var data = (await ListAsync(input.Adapt<TQueryInput>())).items.FirstOrDefault();
return data == null ? default! : data.Adapt<TGetOutput>();
}
@@ -104,20 +103,21 @@ public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGet
/// 获取多条 数据列表
/// </summary>
[HttpGet]
public virtual async Task<PagedOutput<TGetListOutput>> GetListAsync([FromQuery] TGetListInput input)
public virtual async Task<PagedOutput<TQueryOutput>> GetListAsync([FromQuery] TQueryInput input)
{
return await ListAsync(input.Adapt<TQueryInput>());
input.LoadFromHttpContext(App.HttpContext);
return await ListAsync(input);
}
/// <summary>
/// 获取多条 数据列表
/// </summary>
[HttpPost]
public virtual async Task<PagedOutput<TGetListOutput>> ListAsync([FromBody] TQueryInput input)
public virtual async Task<PagedOutput<TQueryOutput>> ListAsync([FromBody] TQueryInput input)
{
var vm = await GetVmodelAsync();
var ls = await _dataAccess.QueryDataAsync(vm, input);
return ls.ToPagedOutput<TGetListOutput>();
return ls.ToPagedOutput<TQueryOutput>();
}
/// <summary>
@@ -155,22 +155,31 @@ public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGet
}
#region 泛型变种
public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGetListInput, TGetListOutput> :
VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGetListInput, TGetListOutput, VmEditInput, VmEditInput>
public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TQueryOutput, TCreateInput> :
VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TQueryOutput, TCreateInput, VmEditInput>
where TEntity : Entity
where TGetInput : VmGetInput
where TQueryInput : VmQueryInput
where TCreateInput : VmEditInput
{
public VengineAppService(IDataAccess da) : base(da)
{
}
}
public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TQueryOutput> :
VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TQueryOutput, VmEditInput, VmEditInput>
where TEntity : Entity
where TGetInput : VmGetInput
where TGetListInput : VmGetListInput
where TQueryInput : VmQueryInput
{
public VengineAppService(IDataAccess da) : base(da)
{
}
}
public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGetListInput> :
VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGetListInput, dynamic, VmEditInput, VmEditInput>
public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput> :
VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, dynamic, VmEditInput, VmEditInput>
where TEntity : Entity
where TGetInput : VmGetInput
where TGetListInput : VmGetListInput
where TQueryInput : VmQueryInput
{
public VengineAppService(IDataAccess da) : base(da)
@@ -178,7 +187,7 @@ public class VengineAppService<TEntity, TGetInput, TGetOutput, TQueryInput, TGet
}
}
public class VengineAppService<TEntity, TGetInput, TGetOutput> :
VengineAppService<TEntity, TGetInput, TGetOutput, VmQueryInput, VmGetListInput, dynamic, VmEditInput, VmEditInput>
VengineAppService<TEntity, TGetInput, TGetOutput, VmQueryInput, dynamic, VmEditInput, VmEditInput>
where TEntity : Entity
where TGetInput : VmGetInput
{
@@ -186,8 +195,18 @@ public class VengineAppService<TEntity, TGetInput, TGetOutput> :
{
}
}
public class VengineAppService<TEntity, TGetInput> :
VengineAppService<TEntity, TGetInput, dynamic, VmQueryInput, dynamic, VmEditInput, VmEditInput>
where TEntity : Entity
where TGetInput : VmGetInput
{
public VengineAppService(IDataAccess da) : base(da)
{
}
}
public class VengineAppService<TEntity> :
VengineAppService<TEntity, VmGetInput, dynamic, VmQueryInput, VmGetListInput, dynamic, VmEditInput, VmEditInput>
VengineAppService<TEntity, VmGetInput, dynamic, VmQueryInput, dynamic, VmEditInput, VmEditInput>
where TEntity : Entity
{
public VengineAppService(IDataAccess da) : base(da)

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;
}
}
}

24
visualdev/Tnb.Vengine/AppService/VmodelDto.cs
View File

@@ -13,18 +13,9 @@ namespace Tnb.Vengine.AppService;
public record VmodelCreateData(string areaCode, string vmCode, string vmName, string? dbCode, string tableName, List<VmDbProp> dbProps, List<VmNavPropCreateData> navProps, List<VmCalProp> calProps, int ordinal, short softDelete, short enabled, string? descrip);
public record VmNavPropCreateData(string code, string name, string vmid, eNavigateType navType, string refCode, string refProp, string fkProp);
public record VmodelUpdateData(string id, string areaCode, string vmCode, string vmName, string? dbCode, string tableName, List<VmDbProp> dbProps, List<VmNavPropCreateData> navProps, List<VmCalProp> calProps, int ordinal, short softDelete, short enabled, string? descrip);
public class VmodelGetInput : VmGetInput
{
/// <summary>
/// 模块code, areaCode和vmCode为一组
/// </summary>
public string? areaCode { get; set; }
/// <summary>
/// 模型code, areaCode和vmCode为一组
/// </summary>
public string? vmCode { get; set; }
/// <summary>
/// 是否钻取子模型
/// </summary>
@@ -40,10 +31,6 @@ public class VmodelCreateInput : VmEditInput
return input;
}
}
public class VmodelUpdateInput : VmEditInput
{
public new VmodelUpdateData? data { get; set; }
}
public class VmodelCreateFromTableInput
{
public string? dbCode { get; set; }
@@ -65,17 +52,6 @@ public class VmodelPageCreateInput : VmEditInput
}
}
public class VmodelPageUpdateInput : VmEditInput
{
public new VmodelPage? data { get; set; }
public override VmEditInput ToEditInput()
{
VmEditInput input = this;
input.data = DObject.FromObject(data);
return input;
}
}
public class VmodelPageCreateFromVmodelInput
{
public Guid? viewId { get; set; }

2
visualdev/Tnb.Vengine/AppService/VmodelPageAppService.cs
View File

@@ -19,7 +19,7 @@ namespace Tnb.Vengine.AppService;
/// 视图模型服务类
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1104, KeepVerb = true)]
public class VmodelPageAppService : VengineAppService<VmodelPage, VmGetInput, VmodelPage, VmQueryInput, VmGetListInput, VmodelPage, VmodelPageCreateInput, VmodelPageUpdateInput>, IVmodelPageAppService
public class VmodelPageAppService : VengineAppService<VmodelPage, VmGetInput, VmodelPage, VmQueryInput, VmodelPage, VmodelPageCreateInput>, IVmodelPageAppService
{
/// <summary>
/// 构造函数

90
visualdev/Tnb.Vengine/DataAccess/DataAccess.cs
View File

@@ -112,62 +112,47 @@ public class DataAccess : IDataAccess, ITransient, IDisposable
/// <summary>
/// 获取 Vmodel, 为空时不抛异常
/// </summary>
public async Task<Vmodel?> TryGetVmodelAsync(string id, bool loadNavigate = false)
{
Vmodel vm = await Db.Queryable<Vmodel>().FirstAsync(a => a.id == id && a.deleted == 0);
if (vm != null && loadNavigate)
{
await LoadVmodelNavigateAsync(vm);
}
return vm;
}
/// <summary>
/// 获取 Vmodel, 为空时抛异常
/// </summary>
public async Task<Vmodel> GetVmodelAsync(string id, bool loadNavigate = false)
public async Task<Vmodel?> TryGetVmodelAsync(string id)
{
var key = GetVmodelCacheKey(id);
var vm = await _cache.GetAsync<Vmodel>(key);
if (vm == null)
{
vm = await Db.Queryable<Vmodel>().FirstAsync(a => a.id == id && a.deleted == 0);
ThrowIf.IsNull(vm, $"找不到id={id}的模型");
if (loadNavigate)
if (vm != null)
{
await LoadVmodelNavigateAsync(vm);
await _cache.SetAsync(key, vm, TimeSpan.FromMinutes(10));
}
await _cache.SetAsync(key, vm, TimeSpan.FromMinutes(10));
}
return vm;
}
/// <summary>
/// 获取 Vmodel, 为空时不抛异常
/// </summary>
public async Task<Vmodel?> TryGetVmodelAsync(string areaCode, string vmCode, bool loadNavigate = false)
{
Vmodel vm = await Db.Queryable<Vmodel>().FirstAsync(a => a.areaCode == areaCode && a.vmCode == vmCode && a.deleted == 0);
if (vm != null && loadNavigate)
{
await LoadVmodelNavigateAsync(vm);
}
return vm;
}
/// <summary>
/// 获取 Vmodel, 为空时抛异常
/// </summary>
public async Task<Vmodel> GetVmodelAsync(string areaCode, string vmCode, bool loadNavigate = false)
public async Task<Vmodel> GetVmodelAsync(string id)
{
var vm = await TryGetVmodelAsync(id);
ThrowIf.IsNull(vm, $"找不到id={id}的模型");
return vm;
}
/// <summary>
/// 获取 Vmodel, 为空时不抛异常
/// </summary>
public async Task<Vmodel?> TryGetVmodelAsync(string areaCode, string vmCode)
{
Vmodel vm = await Db.Queryable<Vmodel>().FirstAsync(a => a.areaCode == areaCode && a.vmCode == vmCode && a.deleted == 0);
ThrowIf.IsNull(vm, $"找不到areaCode={areaCode}, vmCode={vmCode}的模型");
if (loadNavigate)
{
await LoadVmodelNavigateAsync(vm);
}
return vm;
}
/// <summary>
/// 获取 Vmodel, 为空时抛异常
/// </summary>
public async Task<Vmodel> GetVmodelAsync(string areaCode, string vmCode)
{
var vm = await TryGetVmodelAsync(areaCode, vmCode);
ThrowIf.IsNull(vm, $"找不到areaCode={areaCode}, vmCode={vmCode}的模型");
return vm;
}
@@ -321,8 +306,8 @@ public class DataAccess : IDataAccess, ITransient, IDisposable
/// </summary>
public async Task<dynamic> CreateDataAsync(Vmodel vm, VmEditInput input)
{
ISqlSugarClient db = GetSqlSugar(vm.dbCode);
ThrowIf.When(input.data == null && input.items == null, "新增数据时，data和items不可同时为空");
ISqlSugarClient db = GetSqlSugar(vm.dbCode);
//新增一条数据
if (input.data != null)
{
@@ -331,7 +316,7 @@ public class DataAccess : IDataAccess, ITransient, IDisposable
if (pkey.csType is "int" or "long")
{
long id = await db.Insertable(model).AS(vm.tableName).ExecuteReturnBigIdentityAsync();
if ((long)input.data[pkey.code] != id)
if (input.data[pkey.code].ParseToLong() != id)
{
input.data[pkey.code] = id;
}
@@ -339,6 +324,10 @@ public class DataAccess : IDataAccess, ITransient, IDisposable
else
{
_ = await db.Insertable(model).AS(vm.tableName).ExecuteCommandAsync();
if (input.data[pkey.code].ToString() != model[pkey.field].ToString())
{
input.data[pkey.code] = model[pkey.field];
}
}
return input.data;
}
@@ -370,6 +359,11 @@ public class DataAccess : IDataAccess, ITransient, IDisposable
else
{
_ = await db.Insertable(lst).AS(vm.tableName).ExecuteCommandAsync();
for (int i = 0; i < input.items.Count; i++)
{
input.items[i][pkey.code] = lst[i][pkey.field];
}
}
return input.items;
}
@@ -387,31 +381,35 @@ public class DataAccess : IDataAccess, ITransient, IDisposable
/// </summary>
public async Task<dynamic> UpdateDataAsync(Vmodel vm, VmEditInput input)
{
ThrowIf.When(input.data == null && input.items == null, "新增数据时，data和items不可同时为空");
ISqlSugarClient db = GetSqlSugar(vm.dbCode);
VmDbProp pk = vm.GetPrimary();
int num = 0;
//修改一条数据
if (input.data != null)
{
ThrowIf.When(!input.data.ContainsKey(pk.code) || string.IsNullOrWhiteSpace(input.data[pk.code].ToString()), $"更新数据时主键({pk.code})不可为空");
DObject model = vm.ToUpdateEntity(input.data, _user);
ThrowIf.When(!model.ContainsKey(pk.field), $"更新数据时主键({pk.code})不可为空");
num = await db.Updateable(model).AS(vm.tableName).WhereColumns(pk.field).ExecuteCommandAsync();
return num > 0 ? input.data[pk.code].ToString()! : 0;
}
//批量修改数据
else if (input.items != null)
else
{
List<DObject> lst = new();
foreach (DObject item in input.items)
List<string> ids = new();
foreach (DObject item in input.items!)
{
DObject model = vm.ToUpdateEntity(item, _user);
if (model.ContainsKey(pk.field))
if (item.ContainsKey(pk.code) && !string.IsNullOrWhiteSpace(item[pk.code].ToString()))
{
DObject model = vm.ToUpdateEntity(item, _user);
lst.Add(model);
ids.Add(item[pk.code].ToString()!);
}
}
num = await db.Updateable(lst).AS(vm.tableName).WhereColumns(pk.field).ExecuteCommandAsync();
return num > 0 ? ids : 0;
}
return num;
}
/// <summary>

16
visualdev/Tnb.Vengine/DataAccess/IDataAccess.cs
View File

@@ -23,30 +23,30 @@ public interface IDataAccess : ITransient
/// <returns></returns>
VmodelLink GetVmodelLink(string dbCode);
/// <summary>
/// 获取 Vmodel, 为空时不抛异常
/// </summary>
Task<Vmodel?> TryGetVmodelAsync(string id, bool loadNavigate = false);
/// <summary>
/// 获取 Vmodel 的缓存键
/// </summary>
string GetVmodelCacheKey(string id);
/// <summary>
/// 获取 Vmodel, 为空时不抛异常
/// </summary>
Task<Vmodel?> TryGetVmodelAsync(string id);
/// <summary>
/// 获取 Vmodel, 为空时抛异常
/// </summary>
Task<Vmodel> GetVmodelAsync(string id, bool loadNavigate = false);
Task<Vmodel> GetVmodelAsync(string id);
/// <summary>
/// 获取 Vmodel, 为空时不抛异常
/// </summary>
Task<Vmodel?> TryGetVmodelAsync(string area, string vmCode, bool loadNavigate = false);
Task<Vmodel?> TryGetVmodelAsync(string area, string vmCode);
/// <summary>
/// 获取 Vmodel, 为空时抛异常
/// </summary>
Task<Vmodel> GetVmodelAsync(string area, string vmCode, bool loadNavigate = false);
Task<Vmodel> GetVmodelAsync(string area, string vmCode);
//Task<VmPagedOutput> QueryDataAsync(VmBaseInput input);

79
visualdev/Tnb.Vengine/Domain/VengineDto.cs
View File

@@ -5,6 +5,7 @@
using JNPF.Common.Security;
using Mapster;
using Microsoft.AspNetCore.Http;
using Tnb.Core;
namespace Tnb.Vengine.Domain;
@@ -17,6 +18,9 @@ public class VmBaseInput
public object? extra { get; set; }
}
/// <summary>
/// 查询单条数据的输入参数
/// </summary>
public class VmGetInput : VmBaseInput
{
/// <summary>
@@ -27,16 +31,38 @@ public class VmGetInput : VmBaseInput
/// <summary>
/// 过滤条件
/// </summary>
public string? q { get; set; }
public DObject q { get; set; } = new DObject();
/// <summary>
/// 输出字段
/// </summary>
public string o { get; set; } = "*";
/// <summary>
/// 从HttpContext中加载查询参数
/// </summary>
/// <param name="context"></param>
public void LoadFromHttpContext(HttpContext? context)
{
if (context == null) return;
string[] filter = new string[] { "id", "q", "o" };
foreach (var item in context.Request.Query.Where(a => !filter.Contains(a.Key)))
{
if (item.Value.Count > 1)
{
q.Add(item.Key, item.Value.ToArray());
}
else
{
q.Add(item.Key, item.Value.ToString());
}
}
}
}
public class VmGetListInput : VmBaseInput
/// <summary>
/// 查询列表数据的输入参数
/// </summary>
public class VmQueryInput : VmBaseInput
{
/// <summary>
/// 当前页数
@@ -61,48 +87,37 @@ public class VmGetListInput : VmBaseInput
/// <summary>
/// 过滤条件
/// </summary>
public string? q { get; set; }
public DObject q { get; set; } = new DObject();
/// <summary>
/// 输出字段
/// </summary>
public string o { get; set; } = "*";
}
/// <summary>
/// 获取多条数据输入参数
/// </summary>
public class VmQueryInput : VmGetListInput
{
/// <summary>
/// 查询条件
/// </summary>
public new DObject? q { get; set; }
/// <summary>
/// 添加一个查询条件
/// 从HttpContext中加载查询参数
/// </summary>
/// <param name="key"></param>
/// <param name="value"></param>
public void AddQueryPara(string key, object value)
/// <param name="context"></param>
public void LoadFromHttpContext(HttpContext? context)
{
if (q == null) q = new DObject();
q.Add(key, value);
}
/// <summary>
/// 添加一个查询条件
/// </summary>
/// <param name="key"></param>
/// <param name="value"></param>
public void AddQueryParaIf(bool condition, string key, object value)
{
if(condition) AddQueryPara(key, value);
if (context == null) return;
string[] filter = new string[] { "pnum", "psize", "sort", "k", "q", "o" };
foreach (var item in context.Request.Query.Where(a => !filter.Contains(a.Key)))
{
if (item.Value.Count > 1)
{
q.Add(item.Key, item.Value.ToArray());
}
else
{
q.Add(item.Key, item.Value.ToString());
}
}
}
}
/// <summary>
/// 新增数据输入参数
/// 新增或修改数据输入参数
/// </summary>
public class VmEditInput : VmBaseInput
{

10
visualdev/Tnb.Vengine/Domain/VmDbProp.cs
View File

@@ -5,6 +5,7 @@
using JNPF.Common.Extension;
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions;
using Yitter.IdGenerator;
namespace Tnb.Vengine.Domain;
@@ -74,6 +75,15 @@ public class VmDbProp : VmBaseProp
#endregion Properties
/// <summary>
/// 获取可空类型的字符串名称
/// </summary>
/// <returns></returns>
public string GetCsType()
{
return required ? csType : csType + "?";
}
/// <summary>
/// 获取默认值
/// </summary>

7
visualdev/Tnb.Vengine/Domain/VmQueryParser.cs
View File

@@ -88,13 +88,8 @@ internal class VmQueryParser
/// <summary>
/// 解析查询参数
/// </summary>
private void ParseQueryPara(DObject? query)
private void ParseQueryPara(DObject query)
{
if (query == null)
{
return;
}
foreach (KeyValuePair<string, object> item in query)
{
string[] codes = item.Key.Split(NAVI_SEPERATE);

26
visualdev/Tnb.Vengine/Domain/Vmodel.cs
View File

@@ -24,6 +24,7 @@ namespace Tnb.Vengine.Domain;
public partial class Vmodel : Entity
{
private static string[] SOFT_DELETED = new string[] { "deleted", "isDeleted", "softDeleted" };
private static string[] AUTO_FILL_PROP = new string[] { "createTime", "createId", "updateTime", "modifyTime", "updateId", "modifyId" };
#region Properties
@@ -195,7 +196,7 @@ public partial class Vmodel : Entity
/// <returns></returns>
public VmDbProp GetPrimary()
{
var key = dbProps.FirstOrDefault(a => a.pkey);
var key = dbProps.FirstOrDefault(a => a.pkey);
ThrowIf.IsNull(key, $"模型({fullCode})没有定义主键属性");
return key;
}
@@ -238,7 +239,7 @@ public partial class Vmodel : Entity
/// <returns></returns>
public DObject GetDefaultDObject()
{
DObject obj = new ();
DObject obj = new();
foreach (VmDbProp p in dbProps)
{
obj.Add(p.code, p.GetDefaultValue()!);
@@ -246,13 +247,30 @@ public partial class Vmodel : Entity
return obj;
}
/// <summary>
/// 获取属性字符串
/// </summary>
/// <param name="isCreate"></param>
/// <returns></returns>
public string GetPropStr(bool includePkey, bool includeAutoProp)
{
var strs = new List<string>();
foreach (var col in dbProps.OrderBy(a => a.ordinal))
{
if (!includeAutoProp && AUTO_FILL_PROP.Contains(col.code)) continue;
if (!includePkey && col.pkey) continue;
strs.Add(col.GetCsType() + " " + col.code);
}
return string.Join(", ", strs);
}
/// <summary>
/// 转换为待新增的实体对象
/// </summary>
/// <returns></returns>
public DObject ToCreateEntity(DObject input, IUserManager user)
{
DObject obj = new ();
DObject obj = new();
foreach (VmDbProp p in dbProps)
{
if (input.ContainsKey(p.code))
@@ -286,7 +304,7 @@ public partial class Vmodel : Entity
/// <returns></returns>
public DObject ToUpdateEntity(DObject input, IUserManager user)
{
DObject obj = new ();
DObject obj = new();
foreach (VmDbProp p in dbProps)
{
if (input.ContainsKey(p.code))

6
visualdev/Tnb.Vengine/Mapper/VmodelMapper.cs
View File

@@ -17,10 +17,8 @@ public class VmodelMapper : IRegister
{
config.ForType<VmGetInput, VmQueryInput>()
.Map(dest => dest.psize, src => 1)
.Map(dest => dest.pnum, src => 0)
.Map(dest => dest.q, src => string.IsNullOrEmpty(src.q) ? null : src.q.ToObject<DObject>());
config.ForType<VmGetListInput, VmQueryInput>()
.Map(dest => dest.q, src => string.IsNullOrEmpty(src.q) ? null : src.q.ToObject<DObject>());
.Map(dest => dest.pnum, src => 0);
//.Map(dest => dest.q, src => string.IsNullOrEmpty(src.q) ? null : src.q.ToObject<DObject>());
config.ForType<DbColumnInfo, VmDbProp>()
.Map(dest => dest.code, src => src.DbColumnName.ToCamel())
.Map(dest => dest.name, src => src.ColumnDescription)