diff --git a/AsbCloudApp/Services/IReportService.cs b/AsbCloudApp/Services/IReportService.cs index 7de24ed1..258195d5 100644 --- a/AsbCloudApp/Services/IReportService.cs +++ b/AsbCloudApp/Services/IReportService.cs @@ -14,9 +14,6 @@ namespace AsbCloudApp.Services Action handleReportProgress); int GetReportPagesCount(int idWell, DateTime begin, DateTime end, int stepSeconds, int format); - Task> GetSuitableReportsAsync(int idWell, - DateTime begin, DateTime end, int stepSeconds, int format, - CancellationToken token); Task GetReportsDatesRangeAsync(int idWell, bool isUtc, CancellationToken token = default); Task> GetAllReportsByWellAsync(int idWell, CancellationToken token); diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs index 180d9287..2a5b3ddd 100644 --- a/AsbCloudInfrastructure/Services/ReportService.cs +++ b/AsbCloudInfrastructure/Services/ReportService.cs @@ -136,38 +136,6 @@ namespace AsbCloudInfrastructure.Services return result; } - public Task> GetSuitableReportsAsync(int idWell, DateTime begin, DateTime end, int stepSeconds, int format, CancellationToken token) => - (from r in db.ReportProperties.Include(r => r.File) - where r.IdWell == idWell - && r.Begin >= begin - && r.End <= end - && r.Step <= stepSeconds - && r.Format == format - select new ReportPropertiesDto - { - Id = r.Id, - Name = r.File.Name, - File = new FileInfoDto{ - Id = r.File.Id, - Author = null, - IdAuthor = r.File.IdAuthor??0, - IdCategory = r.File.IdCategory, - IdWell = r.File.IdWell, - Name = r.File.Name, - Size = r.File.Size, - UploadDate = r.File.UploadDate, - }, - IdWell = r.IdWell, - Date = r.File.UploadDate, - Begin = r.Begin, - End = r.End, - Step = r.Step, - Format = r.Format == 0 ? ".pdf" : ".las" - }) - .OrderBy(o => o.Date) - .AsNoTracking() - .Take(512).ToListAsync(token); - public Task> GetAllReportsByWellAsync(int idWell, CancellationToken token) => (from r in db.ReportProperties.Include(r => r.File) where r.IdWell == idWell diff --git a/AsbCloudWebApi/Controllers/ReportController.cs b/AsbCloudWebApi/Controllers/ReportController.cs index 5777ce4f..fcd0c9e7 100644 --- a/AsbCloudWebApi/Controllers/ReportController.cs +++ b/AsbCloudWebApi/Controllers/ReportController.cs @@ -62,9 +62,10 @@ namespace AsbCloudWebApi.Controllers { reportsHubContext.Clients.Group($"Report_{id}").SendAsync( nameof(IReportHubClient.GetReportProgress), - progress + progress, + token ).ConfigureAwait(false); - }); + }, token); var id = reportService.CreateReport(idWell, (int)idUser, stepSeconds, format, begin, end, HandleReportProgressAsync); @@ -96,40 +97,6 @@ namespace AsbCloudWebApi.Controllers return Ok(reports); } - /// - /// Возвращает имена отчетов, хранящихся на диске, - /// которые подходят под указанные параметры - /// - /// id скважины - /// шаг интервала - /// формат отчета (0-PDF, 1-LAS) - /// дата начала интервала - /// дата окончания интервала - /// Токен для отмены задачи - /// Список имен существующих отчетов (отчетов) - [Obsolete] - [HttpGet] - [Route("suitableReports")] - [ProducesResponseType(typeof(IEnumerable), (int)System.Net.HttpStatusCode.OK)] - public async Task GetSuitableReportsNamesAsync(int idWell, int stepSeconds, int format, - DateTime begin = default, DateTime end = default, - CancellationToken token = default) - { - int? idCompany = User.GetCompanyId(); - - if (idCompany is null) - return Forbid(); - - if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, - idWell, token).ConfigureAwait(false)) - return Forbid(); - - var suitableReportsNames = await reportService.GetSuitableReportsAsync(idWell, - begin, end, stepSeconds, format, token).ConfigureAwait(false); - - return Ok(suitableReportsNames); - } - /// /// Возвращает прогнозируемое количество страниц будущего отчета ///