From 9e42729e041c0367b46c4b2fea3bf921a3aee953 Mon Sep 17 00:00:00 2001 From: "fei.pan" Date: Thu, 16 Nov 2023 15:15:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E6=96=B0=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E9=9B=86=E5=90=88=E6=96=B9=E5=BC=8F=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppService/VengineAppServiceT.cs | 4 +- .../AppService/VmodelAppService.cs | 52 +++++++++---------- visualdev/Tnb.Vengine/AppService/VmodelDto.cs | 4 +- visualdev/Tnb.Vengine/Domain/Vmodel.cs | 12 ++--- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs b/visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs index be4b17b3..778f6eef 100644 --- a/visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs +++ b/visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs @@ -169,7 +169,7 @@ public class VengineAppService : - VengineAppService + VengineAppService where TEntity : Entity where TGetInput : VmGetInput where TGetListInput : VmGetListInput @@ -180,7 +180,7 @@ public class VengineAppService : - VengineAppService + VengineAppService where TEntity : Entity where TGetInput : VmGetInput { diff --git a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs index 92cf907e..60477402 100644 --- a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs +++ b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs @@ -21,7 +21,7 @@ namespace Tnb.Vengine.AppService; /// [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, KeepVerb = true, Order = 1102)] [Route("api/[area]/[controller]/[action]")] -public class VmodelAppService : VengineAppService, IVmodelAppService +public class VmodelAppService : VengineAppService, IVmodelAppService { private readonly IViewEngine _viewEngine; private readonly ICacheManager _cache; @@ -38,34 +38,34 @@ public class VmodelAppService : VengineAppService, IVmodelAppService /// /// 获取一条 数据信息 /// - public override async Task GetAsync(VmGetInput input) + public override async Task GetAsync(VmodelGetInput input) { - VmodelGetInput para = new VmodelGetInput(); - if (!string.IsNullOrEmpty(input.q)) - { - para = input.q.ToObject(); - } - var query = _db.Queryable().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 vm; + //VmodelGetInput para = new VmodelGetInput(); + //if (!string.IsNullOrEmpty(input.q)) + //{ + // para = input.q.ToObject(); + //} + //var query = _db.Queryable().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); } - /// - /// 获取多条 数据列表 - /// - public override async Task> GetListAsync(VmGetListInput input) - { - return await ListAsync(input.ToQueryInput()); - } + ///// + ///// 获取多条 数据列表 + ///// + //public override async Task> GetListAsync(VmGetListInput input) + //{ + // return await ListAsync(input.ToQueryInput()); + //} [NonAction] public override async Task> ListAsync(VmQueryInput input) diff --git a/visualdev/Tnb.Vengine/AppService/VmodelDto.cs b/visualdev/Tnb.Vengine/AppService/VmodelDto.cs index 9c69cd3a..352d9d1b 100644 --- a/visualdev/Tnb.Vengine/AppService/VmodelDto.cs +++ b/visualdev/Tnb.Vengine/AppService/VmodelDto.cs @@ -3,6 +3,8 @@ // https://git.tuotong-tech.com/tnb/tnb.server // ///////////////////////////////////////////////////////////////////////////////// +using Tnb.Vengine.Domain; + namespace Tnb.Vengine.AppService; public class VmodelCreateFromTableInput @@ -21,7 +23,7 @@ public class CreatePageFromVmodelInput public string? vmid { get; set; } } -public class VmodelGetInput +public class VmodelGetInput : VmGetInput { public string? areaCode { get; set; } public string? vmCode { get; set; } diff --git a/visualdev/Tnb.Vengine/Domain/Vmodel.cs b/visualdev/Tnb.Vengine/Domain/Vmodel.cs index 18c3384e..737e8564 100644 --- a/visualdev/Tnb.Vengine/Domain/Vmodel.cs +++ b/visualdev/Tnb.Vengine/Domain/Vmodel.cs @@ -65,19 +65,19 @@ public partial class Vmodel : Entity /// 表字段属性 /// [SugarColumn(ColumnName = "db_props", IsNullable = false, IsJson = true)] - public List dbProps { get; set; } = []; + public List dbProps { get; set; } = new List(); /// /// 导航属性 /// [SugarColumn(ColumnName = "nav_props", IsNullable = true, IsJson = true)] - public List navProps { get; set; } = []; + public List navProps { get; set; } = new List(); /// /// 计算属性 /// [SugarColumn(ColumnName = "cal_props", IsNullable = true, IsJson = true)] - public List calProps { get; set; } = []; + public List calProps { get; set; } = new List(); /// /// 排序 @@ -225,7 +225,7 @@ public partial class Vmodel : Entity /// public DObject GetDefaultDObject() { - DObject obj = []; + DObject obj = new (); foreach (VmDbProp p in dbProps) { obj.Add(p.code, p.GetDefaultValue()!); @@ -239,7 +239,7 @@ public partial class Vmodel : Entity /// public DObject ToCreateEntity(DObject input, IUserManager user) { - DObject obj = []; + DObject obj = new (); foreach (VmDbProp p in dbProps) { if (input.ContainsKey(p.code)) @@ -273,7 +273,7 @@ public partial class Vmodel : Entity /// public DObject ToUpdateEntity(DObject input, IUserManager user) { - DObject obj = []; + DObject obj = new (); foreach (VmDbProp p in dbProps) { if (input.ContainsKey(p.code))