diff --git a/Hcs.Client/Client/Api/BillsApi.cs b/Hcs.Client/Client/Api/BillsApi.cs index 3adaf0b..e43d587 100644 --- a/Hcs.Client/Client/Api/BillsApi.cs +++ b/Hcs.Client/Client/Api/BillsApi.cs @@ -1,5 +1,7 @@ using Hcs.Client.Api.Payload.Bills; using Hcs.Client.Api.Request.Bills; +using Hcs.Service.Async.Bills; +using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -8,6 +10,21 @@ namespace Hcs.Client.Api // http://open-gkh.ru/BillsServiceAsync/ public class BillsApi(ClientBase client) : ApiBase(client) { + /// + /// Экспорт платежных документов + /// + /// Год + /// Месяц + /// Глобальный уникальный идентификатор дома по ФИАС + /// Идентификатор ЛС в ГИС ЖКХ + /// Токен отмены + /// Платежные документы + public async Task> ExportPaymentDocumentDataAsync(short year, int month, string fiasHouseGuid, string accountGUID, CancellationToken token = default) + { + var request = new ExportPaymentDocumentDataRequest(client); + return await request.ExecuteAsync(year, month, fiasHouseGuid, accountGUID, token); + } + /// /// Импорт сведений о платежных документах /// diff --git a/Hcs.Client/Client/Api/Request/Bills/BillsRequestBase.cs b/Hcs.Client/Client/Api/Request/Bills/BillsRequestBase.cs index 3021a34..7a2b349 100644 --- a/Hcs.Client/Client/Api/Request/Bills/BillsRequestBase.cs +++ b/Hcs.Client/Client/Api/Request/Bills/BillsRequestBase.cs @@ -46,9 +46,9 @@ namespace Hcs.Client.Api.Request.Bills { protected override EndPoint EndPoint => EndPoint.BillsAsync; - protected override bool EnableMinimalResponseWaitDelay => true; + protected override bool EnableMinimalResponseWaitDelay => false; - protected override bool CanBeRestarted => true; + protected override bool CanBeRestarted => false; protected override int RestartTimeoutMinutes => 20; } diff --git a/Hcs.Client/Client/Api/Request/Bills/ExportPaymentDocumentDataRequest.cs b/Hcs.Client/Client/Api/Request/Bills/ExportPaymentDocumentDataRequest.cs new file mode 100644 index 0000000..451354c --- /dev/null +++ b/Hcs.Client/Client/Api/Request/Bills/ExportPaymentDocumentDataRequest.cs @@ -0,0 +1,33 @@ +using Hcs.Client.Internal; +using Hcs.Service.Async.Bills; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +namespace Hcs.Client.Api.Request.Bills +{ + internal class ExportPaymentDocumentDataRequest(ClientBase client) : BillsRequestBase(client) + { + protected override bool CanBeRestarted => true; + + internal async Task> ExecuteAsync(short year, int month, string fiasHouseGuid, string accountGUID, CancellationToken token) + { + var request = new exportPaymentDocumentRequest() + { + Id = Constants.SIGNED_XML_ELEMENT_ID, + version = "13.1.0.1", + Items = [year, month, fiasHouseGuid, accountGUID], + ItemsElementName = [ItemsChoiceType7.Year, ItemsChoiceType7.Month, ItemsChoiceType7.FIASHouseGuid, ItemsChoiceType7.AccountGUID] + }; + + var result = await SendAndWaitResultAsync(request, async asyncClient => + { + var response = await asyncClient.exportPaymentDocumentDataAsync(CreateRequestHeader(), request); + return response.AckRequest.Ack; + }, token); + + return result.Items.OfType(); + } + } +} diff --git a/Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentDataRequest.cs b/Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentDataRequest.cs index ae49c46..c86dec5 100644 --- a/Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentDataRequest.cs +++ b/Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentDataRequest.cs @@ -13,8 +13,6 @@ namespace Hcs.Client.Api.Request.Bills { internal class ImportPaymentDocumentDataRequest(ClientBase client) : BillsRequestBase(client) { - protected override bool CanBeRestarted => false; - internal async Task ExecuteAsync(ImportPaymentDocumentDataPayload payload, CancellationToken token) { // TODO: Добавить проверку пейлоада diff --git a/Hcs.Client/Hcs.Client.csproj b/Hcs.Client/Hcs.Client.csproj index 76234c2..7ec3b99 100644 --- a/Hcs.Client/Hcs.Client.csproj +++ b/Hcs.Client/Hcs.Client.csproj @@ -98,6 +98,7 @@ + diff --git a/Hcs.TestApp/TestApp/Program.cs b/Hcs.TestApp/TestApp/Program.cs index 726d845..3097cf1 100644 --- a/Hcs.TestApp/TestApp/Program.cs +++ b/Hcs.TestApp/TestApp/Program.cs @@ -45,6 +45,7 @@ namespace Hcs.TestApp var paymentsScenario = new PaymentsScenario(client); try { + //billsScenario.ExportPaymentDocumentData(); //billsScenario.ImportPaymentDocumentData(); //deviceMeteringScenario.ExportMeteringDeviceHistory(); diff --git a/Hcs.TestApp/TestApp/Scenario/BillsScenario.cs b/Hcs.TestApp/TestApp/Scenario/BillsScenario.cs index 1ca4994..ea8b808 100644 --- a/Hcs.TestApp/TestApp/Scenario/BillsScenario.cs +++ b/Hcs.TestApp/TestApp/Scenario/BillsScenario.cs @@ -2,8 +2,8 @@ using Hcs.Client.Api.Payload.Bills; using Hcs.Client.Api.Registry; using Hcs.Client.Api.Type; -using Hcs.Service.Async.Bills; using System; +using System.Linq; namespace Hcs.TestApp.Scenario { @@ -11,6 +11,12 @@ namespace Hcs.TestApp.Scenario { private readonly UniClient client = client; + internal void ExportPaymentDocumentData() + { + var result = client.Bills.ExportPaymentDocumentDataAsync(2025, 8, "c48e5025-f77a-494f-8aab-f773da623a25", "019917a8-6eb6-74cc-99b7-58350127ac50").Result; + Console.WriteLine("Scenario execution " + (result != null && result.Count() > 0 ? "succeeded" : "failed")); + } + internal void ImportPaymentDocumentData() { var paymentInformation = new ImportPaymentDocumentDataPayload.PaymentInformation()