feat(esppApi): метод FindOrdersAsync поиска нарядов в АСУ ЕСПП по свойствам
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
using Microsoft.Extensions.Logging;
|
||||
using PARR.EsppApi.Models;
|
||||
using PARR.EsppApi.Models.Query;
|
||||
using PARR.EsppApi.Services;
|
||||
using PARR.EsppApi.Settings;
|
||||
|
||||
namespace PARR.EsppApi
|
||||
@@ -10,26 +9,37 @@ namespace PARR.EsppApi
|
||||
{
|
||||
private readonly ILogger<EsppApiService> logger;
|
||||
private readonly EsppOrderSettings esppOrderSettings;
|
||||
private readonly Espp espp;
|
||||
private readonly EsppHttpService esppHttpService;
|
||||
|
||||
public EsppApiService(ILogger<EsppApiService> logger, EsppOrderSettings esppOrderSettings, Espp espp)
|
||||
public EsppApiService(ILogger<EsppApiService> logger, EsppOrderSettings esppOrderSettings, EsppHttpService esppHttpService)
|
||||
{
|
||||
this.logger = logger;
|
||||
this.esppOrderSettings = esppOrderSettings;
|
||||
this.espp = espp;
|
||||
this.esppHttpService = esppHttpService;
|
||||
}
|
||||
|
||||
public async Task<EsppResultBase<IEnumerable<EsppOrder>>> FindOrdersAsync(FindOrdersQuery query)
|
||||
{
|
||||
logger.LogInformation("Привет!");
|
||||
var conditions = new List<string>();
|
||||
|
||||
// var url = esppOrderSettings.Url;
|
||||
var aaa = await espp.Get();
|
||||
logger.LogInformation($"asdasd: {aaa}");
|
||||
if (!string.IsNullOrEmpty(query.ShortDescriptionContains))
|
||||
conditions.Add($"title like \"*{query.ShortDescriptionContains}*\"");
|
||||
if (!string.IsNullOrEmpty(query.TemplateNameContains))
|
||||
conditions.Add($"templateName like \"*{query.TemplateNameContains}*\"");
|
||||
if (query.DateOpen.HasValue)
|
||||
conditions.Add($"open.time>='{query.DateOpen.Value.Day}/{query.DateOpen.Value.Month}/{query.DateOpen.Value.Year} 00:00:00'");
|
||||
if (query.DateEnd.HasValue)
|
||||
conditions.Add($"expirationDat<='{query.DateEnd.Value.Day}/{query.DateEnd.Value.Month}/{query.DateEnd.Value.Year} 00:00:00'");
|
||||
|
||||
var esppOrders = new List<EsppOrder>();
|
||||
if (conditions.Count < 1)
|
||||
{
|
||||
logger.LogDebug("Пришёл пустой запрос в EsppHttpService.FindOrdersAsync");
|
||||
return new EsppResultBase<IEnumerable<EsppOrder>>(null, false);
|
||||
}
|
||||
|
||||
return new EsppResultBase<IEnumerable<EsppOrder>>(esppOrders, true);
|
||||
var result = await esppHttpService.SendAsync<IEnumerable<EsppOrder>>($"<ROOT operation=\"GetTaskList\" returnFormat=\"json\">{{\"VIEW_QUERY\":\"{string.Join(" and ", conditions)}\"}}</ROOT>");
|
||||
|
||||
return result;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user