Add supply contracts export executor

This commit is contained in:
2025-11-24 11:17:03 +09:00
parent f798c0c80f
commit 46ff771dd6
8 changed files with 181 additions and 2 deletions

View File

@ -1,5 +1,6 @@
using Hcs.Broker.Api; using Hcs.Broker.Api;
using Hcs.Broker.Api.Payload.HouseManagement; using Hcs.Broker.Api.Payload.HouseManagement;
using Hcs.Broker.Api.Request;
using Hcs.Service.Async.HouseManagement; using Hcs.Service.Async.HouseManagement;
namespace Hcs.Broker.Mock.Api namespace Hcs.Broker.Mock.Api
@ -31,6 +32,25 @@ namespace Hcs.Broker.Mock.Api
return []; return [];
} }
/// <inheritdoc cref="IHouseManagementApi"/>
public async Task<string> RequestExportSupplyResourceContractDataAsync(string? exportGuid = null, CancellationToken token = default)
{
await Task.Delay(3000, token);
return Guid.NewGuid().ToString();
}
/// <inheritdoc cref="IHouseManagementApi"/>
public async Task<RequestMultipleResult<exportSupplyResourceContractResultType>> GetExportSupplyResourceContractDataResultAsync(string messageGuid)
{
await Task.Delay(3000);
return new RequestMultipleResult<exportSupplyResourceContractResultType>()
{
Ready = false
};
}
/// <inheritdoc cref="IHouseManagementApi"/> /// <inheritdoc cref="IHouseManagementApi"/>
public async Task<exportSupplyResourceContractResultType> ExportSupplyResourceContractDataAsync(Guid contractRootGuid, CancellationToken token = default) public async Task<exportSupplyResourceContractResultType> ExportSupplyResourceContractDataAsync(Guid contractRootGuid, CancellationToken token = default)
{ {

View File

@ -1,4 +1,5 @@
using Hcs.Broker.Api.Payload.HouseManagement; using Hcs.Broker.Api.Payload.HouseManagement;
using Hcs.Broker.Api.Request;
using Hcs.Broker.Api.Request.HouseManagement; using Hcs.Broker.Api.Request.HouseManagement;
using Hcs.Service.Async.HouseManagement; using Hcs.Service.Async.HouseManagement;
@ -28,6 +29,20 @@ namespace Hcs.Broker.Api
return await request.ExecuteAsync(token); return await request.ExecuteAsync(token);
} }
/// <inheritdoc cref="IHouseManagementApi"/>
public async Task<string> RequestExportSupplyResourceContractDataAsync(string? exportGuid = null, CancellationToken token = default)
{
var request = new ExportSupplyResourceContractDataRequest(client);
return await request.SendAsync(exportGuid, token);
}
/// <inheritdoc cref="IHouseManagementApi"/>
public async Task<RequestMultipleResult<exportSupplyResourceContractResultType>> GetExportSupplyResourceContractDataResultAsync(string messageGuid)
{
var request = new ExportSupplyResourceContractDataRequest(client);
return await request.GetResultAsync(messageGuid);
}
/// <inheritdoc cref="IHouseManagementApi"/> /// <inheritdoc cref="IHouseManagementApi"/>
public async Task<exportSupplyResourceContractResultType> ExportSupplyResourceContractDataAsync(Guid contractRootGuid, CancellationToken token = default) public async Task<exportSupplyResourceContractResultType> ExportSupplyResourceContractDataAsync(Guid contractRootGuid, CancellationToken token = default)
{ {

View File

@ -1,4 +1,5 @@
using Hcs.Broker.Api.Payload.HouseManagement; using Hcs.Broker.Api.Payload.HouseManagement;
using Hcs.Broker.Api.Request;
using Hcs.Service.Async.HouseManagement; using Hcs.Service.Async.HouseManagement;
namespace Hcs.Broker.Api namespace Hcs.Broker.Api
@ -29,6 +30,21 @@ namespace Hcs.Broker.Api
/// <returns>Договора ресурсоснабжения</returns> /// <returns>Договора ресурсоснабжения</returns>
Task<IEnumerable<exportSupplyResourceContractResultType>> ExportSupplyResourceContractDataAsync(CancellationToken token = default); Task<IEnumerable<exportSupplyResourceContractResultType>> ExportSupplyResourceContractDataAsync(CancellationToken token = default);
/// <summary>
/// Запрашивает экспорт договоров ресурсоснабжения
/// </summary>
/// <param name="exportGuid">Идентификатор экспорта, не заполняется при первичном экспорте</param>
/// <param name="token">Токен отмены</param>
/// <returns>Идентификатор сообщения операции экспорта</returns>
Task<string> RequestExportSupplyResourceContractDataAsync(string? exportGuid = null, CancellationToken token = default);
/// <summary>
/// Возвращает результат экспорта договоров ресурсоснабжения
/// </summary>
/// <param name="messageGuid">Идентификатор сообщения операции экспорта</param>
/// <returns>Результат запроса</returns>
Task<RequestMultipleResult<exportSupplyResourceContractResultType>> GetExportSupplyResourceContractDataResultAsync(string messageGuid);
/// <summary> /// <summary>
/// Возвращает договор ресурсоснабжения по его идентификатору в ГИС ЖКХ /// Возвращает договор ресурсоснабжения по его идентификатору в ГИС ЖКХ
/// </summary> /// </summary>

View File

@ -40,6 +40,59 @@ namespace Hcs.Broker.Api.Request.HouseManagement
return result; return result;
} }
internal async Task<string> SendAsync(string? exportGuid = null, CancellationToken token = default)
{
var itemsElementName = new List<ItemsChoiceType32>();
var items = new List<object>();
if (!string.IsNullOrEmpty(exportGuid))
{
itemsElementName.Add(ItemsChoiceType32.ExportContractRootGUID);
items.Add(exportGuid);
}
// http://open-gkh.ru/HouseManagement/exportSupplyResourceContractRequest.html
var request = new exportSupplyResourceContractRequest
{
Id = Constants.SIGNED_XML_ELEMENT_ID,
version = "13.1.1.1",
ItemsElementName = [.. itemsElementName],
Items = [.. items]
};
return await SendAsync(request, async asyncClient =>
{
var response = await asyncClient.exportSupplyResourceContractDataAsync(CreateRequestHeader(), request);
return response.AckRequest.Ack;
}, token);
}
internal async Task<RequestMultipleResult<exportSupplyResourceContractResultType>> GetResultAsync(string messageGuid)
{
try
{
var result = await ExecuteGetResultAsync(messageGuid);
if (result == null)
{
return RequestMultipleResult<exportSupplyResourceContractResultType>.CreateNotReady();
}
var contractResult = result.Items.OfType<getStateResultExportSupplyResourceContractResult>().First();
var paginationData = new PaginationData(contractResult.Item);
return RequestMultipleResult<exportSupplyResourceContractResultType>
.CreateSuccessful(contractResult.Contract)
.SetNextResultsGuid(paginationData.IsLastPage ? null : paginationData.NextGuid.ToString());
}
catch (NoResultsRemoteException)
{
return RequestMultipleResult<exportSupplyResourceContractResultType>.CreateSuccessful([]);
}
catch
{
throw;
}
}
internal async Task<exportSupplyResourceContractResultType> ExecuteAsync(Guid contractRootGuid, CancellationToken token) internal async Task<exportSupplyResourceContractResultType> ExecuteAsync(Guid contractRootGuid, CancellationToken token)
{ {
exportSupplyResourceContractResultType result = null; exportSupplyResourceContractResultType result = null;

View File

@ -0,0 +1,52 @@
using Hcs.Broker.Api.Request.Adapter;
namespace Hcs.Broker.Api.Request
{
public class RequestMultipleResult<T>
{
public bool Ready { get; set; }
public bool Success { get; set; }
public IEnumerable<T?>? Results { get; set; }
public string? NextResultsGuid { get; set; }
public IErrorMessage? ErrorMessage { get; set; }
public static RequestMultipleResult<T> CreateNotReady()
{
return new RequestMultipleResult<T>
{
Ready = false
};
}
public static RequestMultipleResult<T> CreateSuccessful(IEnumerable<T?>? results)
{
return new RequestMultipleResult<T>
{
Ready = true,
Success = true,
Results = results
};
}
public static RequestMultipleResult<T> CreateFailed(IErrorMessage? errorMessage)
{
return new RequestMultipleResult<T>
{
Ready = true,
Success = false,
ErrorMessage = errorMessage
};
}
public RequestMultipleResult<T> SetNextResultsGuid(string? nextResultsGuid)
{
NextResultsGuid = nextResultsGuid;
return this;
}
}
}

View File

@ -1,4 +1,5 @@
using Hcs.Broker; using Hcs.Broker;
using Hcs.WebApp.BackgroundServices.OperationExecutors.HouseManagement;
using Hcs.WebApp.BackgroundServices.OperationExecutors.Nsi; using Hcs.WebApp.BackgroundServices.OperationExecutors.Nsi;
using Hcs.WebApp.BackgroundServices.OperationExecutors.NsiCommon; using Hcs.WebApp.BackgroundServices.OperationExecutors.NsiCommon;
using Hcs.WebApp.Data.Hcs; using Hcs.WebApp.Data.Hcs;
@ -13,6 +14,7 @@ namespace Hcs.WebApp.BackgroundServices.OperationExecutors
{ {
Operation.OperationType.Nsi_ExportNsiItem_15_7_0_1 => new ExportDataProviderNsiItemExecutor_15_7_0_1(client, scope, operation), Operation.OperationType.Nsi_ExportNsiItem_15_7_0_1 => new ExportDataProviderNsiItemExecutor_15_7_0_1(client, scope, operation),
Operation.OperationType.NsiCommon_ExportNsiItem_15_7_0_1 => new ExportNsiItemExecutor_15_7_0_1(client, scope, operation), Operation.OperationType.NsiCommon_ExportNsiItem_15_7_0_1 => new ExportNsiItemExecutor_15_7_0_1(client, scope, operation),
Operation.OperationType.HouseManagement_ExportSupplyResourceContractData_15_7_0_1 => new ExportSupplyResourceContractDataExecutor_15_7_0_1(client, scope, operation),
Operation.OperationType.ParseHousesData_15_7_0_1 => throw new ArgumentException($"Нельзя использовать операцию с типом {operation.Type} для обращения к ГИС ЖКХ") Operation.OperationType.ParseHousesData_15_7_0_1 => throw new ArgumentException($"Нельзя использовать операцию с типом {operation.Type} для обращения к ГИС ЖКХ")
}; };

View File

@ -0,0 +1,13 @@
using Hcs.Broker;
using Hcs.WebApp.Data.Hcs;
namespace Hcs.WebApp.BackgroundServices.OperationExecutors.HouseManagement
{
public class ExportSupplyResourceContractDataExecutor_15_7_0_1(IClient client, IServiceScope scope, Operation operation) : ExecutorBase(client, scope, operation)
{
public override async Task<string> ExecuteAsync(CancellationToken cancellationToken)
{
return await client.HouseManagement.RequestExportSupplyResourceContractDataAsync(operation.ExportGuid, cancellationToken);
}
}
}

View File

@ -14,7 +14,10 @@ namespace Hcs.WebApp.Data.Hcs
Nsi_ExportNsiItem_15_7_0_1, Nsi_ExportNsiItem_15_7_0_1,
[Display(Description = "Парсинг данных домов")] [Display(Description = "Парсинг данных домов")]
ParseHousesData_15_7_0_1 ParseHousesData_15_7_0_1,
[Display(Description = "Экспорт договоров ресурсоснабжения")]
HouseManagement_ExportSupplyResourceContractData_15_7_0_1,
} }
public enum OperationKind public enum OperationKind
@ -39,6 +42,8 @@ namespace Hcs.WebApp.Data.Hcs
public string? MessageGuid { get; set; } public string? MessageGuid { get; set; }
public string? ExportGuid { get; set; }
public string? FailureReason { get; set; } public string? FailureReason { get; set; }
public virtual ICollection<Registry> Registries { get; set; } = []; public virtual ICollection<Registry> Registries { get; set; } = [];
@ -47,6 +52,8 @@ namespace Hcs.WebApp.Data.Hcs
public virtual ICollection<FileToParse> FilesToParse { get; set; } = []; public virtual ICollection<FileToParse> FilesToParse { get; set; } = [];
public virtual ICollection<SupplyContract> SupplyContracts { get; set; } = [];
[NotMapped] [NotMapped]
public bool Completed => EndedAt.HasValue; public bool Completed => EndedAt.HasValue;
@ -54,7 +61,8 @@ namespace Hcs.WebApp.Data.Hcs
public OperationKind Kind => Type switch public OperationKind Kind => Type switch
{ {
OperationType.NsiCommon_ExportNsiItem_15_7_0_1 or OperationType.NsiCommon_ExportNsiItem_15_7_0_1 or
OperationType.Nsi_ExportNsiItem_15_7_0_1 => OperationKind.Remote, OperationType.Nsi_ExportNsiItem_15_7_0_1 or
OperationType.HouseManagement_ExportSupplyResourceContractData_15_7_0_1 => OperationKind.Remote,
OperationType.ParseHousesData_15_7_0_1 => OperationKind.Parse OperationType.ParseHousesData_15_7_0_1 => OperationKind.Parse
}; };