From cdfd8353ec05a28a8cec17491519680c6bd13a6b Mon Sep 17 00:00:00 2001 From: Magomed Date: Fri, 17 Jul 2026 12:56:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B9=D1=81:=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20=D0=B2=D1=81=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BF=D1=80=D0=B0=D0=B9=D1=81=D0=B0=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=BD=D0=BE=20(limit?= =?UTF-8?q?/offset=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=BB=D0=BA=D0=B0=205000)=20=E2=80=94=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=85=D0=BE=D0=B4=D0=B8=D1=82=20=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ElectronicPharmacy/Classes/ApiClient.cs | 14 ++++- .../HelpForms/HF_DownloadDataFromServer.cs | 54 ++++++++++++++----- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/src/ElectronicPharmacy/Classes/ApiClient.cs b/src/ElectronicPharmacy/Classes/ApiClient.cs index ef228c6..ca8864e 100644 --- a/src/ElectronicPharmacy/Classes/ApiClient.cs +++ b/src/ElectronicPharmacy/Classes/ApiClient.cs @@ -97,7 +97,7 @@ namespace Электронная_Фармация.Classes public bool IsAuthenticated => !string.IsNullOrEmpty(_token); - public async Task GetPriceSummaryAsync(string supplierId = null, string regionId = null) + public async Task GetPriceSummaryAsync(string supplierId = null, string regionId = null, string q = null, int? limit = null, int? offset = null) { EnsureAuthenticated(); @@ -110,6 +110,18 @@ namespace Электронная_Фармация.Classes { queryParams.Add($"region_id={Uri.EscapeDataString(regionId)}"); } + if (!string.IsNullOrWhiteSpace(q)) + { + queryParams.Add($"q={Uri.EscapeDataString(q)}"); + } + if (limit.HasValue) + { + queryParams.Add($"limit={limit.Value}"); + } + if (offset.HasValue) + { + queryParams.Add($"offset={offset.Value}"); + } var path = "/api/supplier-prices/summary"; if (queryParams.Count > 0) diff --git a/src/ElectronicPharmacy/HelpForms/HF_DownloadDataFromServer.cs b/src/ElectronicPharmacy/HelpForms/HF_DownloadDataFromServer.cs index f837110..02e233b 100644 --- a/src/ElectronicPharmacy/HelpForms/HF_DownloadDataFromServer.cs +++ b/src/ElectronicPharmacy/HelpForms/HF_DownloadDataFromServer.cs @@ -38,8 +38,8 @@ namespace Электронная_Фармация.HelpForms { await EnsureAuthenticatedAsync(client); - AppendStatus("Загружаю сводный прайс для всех поставщиков..."); - var allSuppliersSummary = await GetPriceSummaryWithRetryAsync(client); + AppendStatus("Загружаю сводный прайс (постранично, весь)..."); + var allSuppliersSummary = await GetFullPriceSummaryPagedAsync(client); AppendStatus($"Получено {allSuppliersSummary.Summary?.Count ?? 0} позиций"); var tablePrice = BuildPriceTable(allSuppliersSummary); @@ -98,25 +98,51 @@ namespace Электронная_Фармация.HelpForms AppendStatus("Авторизация успешно пройдена"); } - private async Task GetPriceSummaryWithRetryAsync(ApiClient client) + // Тянем весь прайс постранично: сервер отдаёт максимум 5000 за запрос, + // поэтому идём offset'ом, пока страница не окажется неполной. + private async Task GetFullPriceSummaryPagedAsync(ApiClient client) { var regionId = string.IsNullOrWhiteSpace(Settings.Default.RegionId) ? null : Settings.Default.RegionId; - try + const int pageSize = 5000; + const int maxPages = 100; // страховка от бесконечного цикла (до 500k позиций) + + var combined = new PriceSummaryResponse { Summary = new List() }; + + for (int page = 0; page < maxPages; page++) { - return await client.GetPriceSummaryAsync(supplierId: null, regionId: regionId); - } - catch (UnauthorizedAccessException) - { - AppendStatus("Токен недействителен, повторная авторизация..."); - Settings.Default.stringToken = string.Empty; - Settings.Default.Save(); - client.SetToken(null); - await LoginAndSaveTokenAsync(client); - return await client.GetPriceSummaryAsync(supplierId: null, regionId: regionId); + int offset = page * pageSize; + PriceSummaryResponse chunk; + try + { + chunk = await client.GetPriceSummaryAsync(supplierId: null, regionId: regionId, limit: pageSize, offset: offset); + } + catch (UnauthorizedAccessException) + { + AppendStatus("Токен недействителен, повторная авторизация..."); + Settings.Default.stringToken = string.Empty; + Settings.Default.Save(); + client.SetToken(null); + await LoginAndSaveTokenAsync(client); + chunk = await client.GetPriceSummaryAsync(supplierId: null, regionId: regionId, limit: pageSize, offset: offset); + } + + int got = chunk?.Summary?.Count ?? 0; + if (got > 0) + { + combined.Summary.AddRange(chunk.Summary); + AppendStatus($"Загружено {combined.Summary.Count} позиций..."); + } + + if (got < pageSize) + { + break; // последняя (неполная) страница — дальше данных нет + } } + + return combined; } private static DataTable BuildPriceTable(PriceSummaryResponse allSuppliersSummary)