diff --git a/visualdev/Tnb.Vengine/AppService/BaseAppService.cs b/visualdev/Tnb.Vengine/AppService/BaseAppService.cs
index 9aa3ac9f..96f5268e 100644
--- a/visualdev/Tnb.Vengine/AppService/BaseAppService.cs
+++ b/visualdev/Tnb.Vengine/AppService/BaseAppService.cs
@@ -3,8 +3,13 @@
// https://git.tuotong-tech.com/tnb/tnb.server //
/////////////////////////////////////////////////////////////////////////////////
+using Aspose.Cells.Drawing;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Tnb.Core;
+using Tnb.Vengine.Domain;
namespace Tnb.Vengine.AppService;
@@ -13,4 +18,17 @@ namespace Tnb.Vengine.AppService;
///
public class BaseAppService : IDynamicApiController, ITransient
{
-}
\ No newline at end of file
+}
+
+//[ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 100)]
+//public class VTestAppService : BaseAppService
+//{
+// ///
+// /// 获取多条 数据列表
+// ///
+// public async Task ListAsync(string vmid, [FromQuery] VmGetListInput input)
+// {
+// return new List();
+// }
+
+//}
\ No newline at end of file
diff --git a/visualdev/Tnb.Vengine/AppService/VengineAppService.cs b/visualdev/Tnb.Vengine/AppService/VengineAppService.cs
index 59fd359a..26b70109 100644
--- a/visualdev/Tnb.Vengine/AppService/VengineAppService.cs
+++ b/visualdev/Tnb.Vengine/AppService/VengineAppService.cs
@@ -43,7 +43,7 @@ public class VengineAppService : BaseAppService, IVengineAppService
public async Task GetAsync(string vmid, [FromQuery]VmGetInput input)
{
var vm = await _dataAccess.GetVmodelAsync(vmid, true);
- VmQueryInput arg = input.Adapt();
+ VmListInput arg = input.Adapt();
if (input.id != null)
{
if (arg.q == null) arg.q = new DObject();
@@ -60,7 +60,7 @@ public class VengineAppService : BaseAppService, IVengineAppService
public async Task GetListAsync(string vmid, [FromQuery] VmGetListInput input)
{
var vm = await _dataAccess.GetVmodelAsync(vmid, true);
- VmQueryInput arg = input.Adapt();
+ VmListInput arg = input.Adapt();
if (!string.IsNullOrEmpty(input.q))
{
arg.q = input.q.ToObject();
@@ -72,8 +72,8 @@ public class VengineAppService : BaseAppService, IVengineAppService
///
/// 获取多条 数据列表
///
- [HttpPost("api/[area]/[controller]/{vmid}/query")]
- public async Task QueryAsync(string vmid, [FromBody] VmQueryInput input)
+ [HttpPost("api/[area]/[controller]/{vmid}/list")]
+ public async Task ListAsync(string vmid, [FromBody] VmListInput input)
{
var vm = await _dataAccess.GetVmodelAsync(vmid, true);
var ls = await _dataAccess.QueryDataAsync(vm, input);
@@ -130,7 +130,7 @@ public class VengineAppService : BaseAppService, IVengineAppService
public async Task GetAsync(string areaCode, string vmCode, [FromQuery] VmGetInput input)
{
var vm = await GetVmodelAsync(areaCode, vmCode);
- VmQueryInput arg = input.Adapt();
+ VmListInput arg = input.Adapt();
if (input.id != null)
{
if (arg.q == null) arg.q = new DObject();
@@ -147,7 +147,7 @@ public class VengineAppService : BaseAppService, IVengineAppService
public async Task GetListAsync(string areaCode, string vmCode, [FromQuery] VmGetListInput input)
{
var vm = await GetVmodelAsync(areaCode, vmCode);
- VmQueryInput arg = input.Adapt();
+ VmListInput arg = input.Adapt();
if (!string.IsNullOrEmpty(input.q))
{
arg.q = input.q.ToObject();
@@ -159,8 +159,8 @@ public class VengineAppService : BaseAppService, IVengineAppService
///
/// 获取多条 数据列表
///
- [HttpPost("api/{areaCode}/{vmCode}/query")]
- public async Task QueryAsync(string areaCode, string vmCode, [FromBody] VmQueryInput input)
+ [HttpPost("api/{areaCode}/{vmCode}/list")]
+ public async Task ListAsync(string areaCode, string vmCode, [FromBody] VmListInput input)
{
var vm = await GetVmodelAsync(areaCode, vmCode);
var ls = await _dataAccess.QueryDataAsync(vm, input);
diff --git a/visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs b/visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs
index 223db491..bf3abee6 100644
--- a/visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs
+++ b/visualdev/Tnb.Vengine/AppService/VengineAppServiceT.cs
@@ -66,7 +66,7 @@ public class VengineAppService : BaseAppService where TEntity : Entity
public virtual async Task GetAsync([FromQuery] VmGetInput input)
{
var vm = await GetVmodelAsync();
- VmQueryInput arg = input.Adapt();
+ VmListInput arg = input.Adapt();
if (input.id != null)
{
if (arg.q == null) arg.q = new DObject();
@@ -83,12 +83,7 @@ public class VengineAppService : BaseAppService where TEntity : Entity
public virtual async Task GetListAsync([FromQuery] VmGetListInput input)
{
var vm = await GetVmodelAsync();
- VmQueryInput arg = input.Adapt();
- if (!string.IsNullOrEmpty(input.q))
- {
- arg.q = input.q.ToObject();
- }
- var ls = await _dataAccess.QueryDataAsync(vm, arg);
+ var ls = await _dataAccess.QueryDataAsync(vm, input.ToListInput());
return ls;
}
@@ -96,7 +91,7 @@ public class VengineAppService : BaseAppService where TEntity : Entity
/// 获取多条 数据列表
///
[HttpPost]
- public virtual async Task QueryAsync([FromBody] VmQueryInput input)
+ public virtual async Task ListAsync([FromBody] VmListInput input)
{
var vm = await GetVmodelAsync();
var ls = await _dataAccess.QueryDataAsync(vm, input);
diff --git a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
index 01523379..7ded486e 100644
--- a/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
+++ b/visualdev/Tnb.Vengine/AppService/VmodelAppService.cs
@@ -71,9 +71,9 @@ public class VmodelAppService : VengineAppService, IVmodelAppService
}
[NonAction]
- public override Task QueryAsync(VmQueryInput input)
+ public override Task ListAsync(VmListInput input)
{
- return base.QueryAsync(input);
+ return base.ListAsync(input);
}
///
diff --git a/visualdev/Tnb.Vengine/DataAccess/DataAccess.cs b/visualdev/Tnb.Vengine/DataAccess/DataAccess.cs
index c45a70d1..79b070ca 100644
--- a/visualdev/Tnb.Vengine/DataAccess/DataAccess.cs
+++ b/visualdev/Tnb.Vengine/DataAccess/DataAccess.cs
@@ -184,7 +184,7 @@ public class DataAccess : IDataAccess, ITransient, IDisposable
///
/// 查询数据 默认方法
///
- public async Task QueryDataAsync(Vmodel vm, VmQueryInput input)
+ public async Task QueryDataAsync(Vmodel vm, VmListInput input)
{
ISqlSugarClient db = GetSqlSugar(vm.dbCode);
var query = db.Queryable