diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll b/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll index 7afa6411..19620af6 100644 Binary files a/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll and b/AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll differ diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll index 5c4a9da1..1e5c8d32 100644 Binary files a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll and b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll differ diff --git a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll index e72238f5..5c23bfdd 100644 Binary files a/AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll and b/AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll differ diff --git a/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Bold.ttf b/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Bold.ttf deleted file mode 100644 index aaf374d2..00000000 Binary files a/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Bold.ttf and /dev/null differ diff --git a/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Light.ttf b/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Light.ttf deleted file mode 100644 index 664e1b2f..00000000 Binary files a/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Light.ttf and /dev/null differ diff --git a/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Thin.ttf b/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Thin.ttf deleted file mode 100644 index d262d144..00000000 Binary files a/AsbCloudInfrastructure/CommonLibs/Resources/Roboto-Thin.ttf and /dev/null differ diff --git a/AsbCloudInfrastructure/CommonLibs/Resources/logo.jpg b/AsbCloudInfrastructure/CommonLibs/Resources/logo.jpg deleted file mode 100644 index 46f36bdb..00000000 Binary files a/AsbCloudInfrastructure/CommonLibs/Resources/logo.jpg and /dev/null differ diff --git a/AsbCloudInfrastructure/CommonLibs/ref/AsbSaubReportLas.dll b/AsbCloudInfrastructure/CommonLibs/ref/AsbSaubReportLas.dll new file mode 100644 index 00000000..f1c38b78 Binary files /dev/null and b/AsbCloudInfrastructure/CommonLibs/ref/AsbSaubReportLas.dll differ diff --git a/AsbCloudInfrastructure/CommonLibs/ref/AsbSaubReportPdf.dll b/AsbCloudInfrastructure/CommonLibs/ref/AsbSaubReportPdf.dll index e369f3e5..2f6b1677 100644 Binary files a/AsbCloudInfrastructure/CommonLibs/ref/AsbSaubReportPdf.dll and b/AsbCloudInfrastructure/CommonLibs/ref/AsbSaubReportPdf.dll differ diff --git a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs index ecb4285f..446dec51 100644 --- a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs +++ b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs @@ -59,26 +59,23 @@ namespace AsbSaubReport public AnalyzeResult Analyze() { - var messagesQuery = from item in context.TelemetryMessages + var messagesStat = (from item in context.TelemetryMessages where item.IdTelemetry == idTelemetry - select item; + group item.Date by item.IdTelemetry into g + select new { min = g.Min(), max = g.Max(), count = g.Count()}) + .FirstOrDefault(); - var messagesCount = messagesQuery.Count(); - var messagesMinDate = messagesQuery.Min(e => e.Date); - var messagesMaxDate = messagesQuery.Max(e => e.Date); - - var dataQuery = from item in context.TelemetryDataSaub - where item.IdTelemetry == idTelemetry - select item; - - var dataMinDate = dataQuery.Min(e => e.Date); - var dataMaxDate = dataQuery.Max(e => e.Date); + var dataStat = (from item in context.TelemetryDataSaub + where item.IdTelemetry == idTelemetry + group item.Date by item.IdTelemetry into g + select new { min = g.Min(), max = g.Max(), count = g.Count() }) + .FirstOrDefault(); var result = new AnalyzeResult { - MaxDate = dataMinDate < messagesMinDate ? dataMinDate : messagesMinDate, - MinDate = dataMaxDate > messagesMaxDate ? dataMaxDate : messagesMaxDate, - MessagesCount = messagesCount, + MinDate = dataStat?.max ?? messagesStat?.min ?? default, + MaxDate = dataStat?.max ?? messagesStat?.min ?? default, + MessagesCount = messagesStat?.count ?? 0, }; return result; diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs index bb62d1cf..4f3f8875 100644 --- a/AsbCloudInfrastructure/Services/ReportService.cs +++ b/AsbCloudInfrastructure/Services/ReportService.cs @@ -50,10 +50,13 @@ namespace AsbCloudInfrastructure.Services { var generator = GetReportGenerator(idWell, begin, end, stepSeconds, format, context); generator.OnProgress += (s, e) => progressHandler.Invoke(e.progress, e.operation, id); - var newReportName = generator.Make(); - if (newReportName is not null) + + var reportFileName = GetReportFileName(context, idWell); + + generator.Make(reportFileName); + if (reportFileName is not null) { - var shorReportName = Path.GetFileName(newReportName); + var shorReportName = Path.GetFileName(reportFileName); reportNameHandler.Invoke(shorReportName, id); var newReportFile = new AsbCloudDb.Model.FileInfo @@ -61,12 +64,11 @@ namespace AsbCloudInfrastructure.Services IdWell = idWell, IdAuthor = idUser, IdCategory = ReportCategoryId, - Name = newReportName, + Name = reportFileName, UploadDate = DateTime.Now, }; context.Files.Add(newReportFile); - context.SaveChanges(); var newReportProperties = new ReportProperty { @@ -85,6 +87,13 @@ namespace AsbCloudInfrastructure.Services return newReportId; } + private string GetReportFileName(AsbCloudDbContext context, int idWell) + { + var well = context.Wells.Include(w => w.Cluster).FirstOrDefault(w => w.Id == idWell); + var fileName = Path.Combine(fileService.RootPath, $"{idWell}", $"{ReportCategoryId}", $"Рапорт куст{well?.Cluster?.Caption} скв{well.Caption}.pdf") ; + return fileName; + } + public int GetReportPagesCount(int idWell, DateTime begin, DateTime end, int stepSeconds, int format) { var generator = GetReportGenerator(idWell, begin, end, stepSeconds, format, (AsbCloudDbContext)db); @@ -180,7 +189,6 @@ namespace AsbCloudInfrastructure.Services break; } - generator.ReportDirectory = Path.Combine(fileService.RootPath, $"{idWell}", $"{ReportCategoryId}"); generator.Begin = begin; generator.End = end; generator.Step = TimeSpan.FromSeconds(stepSeconds); diff --git a/AsbCloudWebApi/appsettings.json b/AsbCloudWebApi/appsettings.json index cf1db760..f360d3d2 100644 --- a/AsbCloudWebApi/appsettings.json +++ b/AsbCloudWebApi/appsettings.json @@ -7,7 +7,7 @@ } }, "ConnectionStrings": { - "DefaultConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True", + "DefaultConnection": "Host=192.168.1.70;Database=postgres;Username=postgres;Password=q;Persist Security Info=True", "ServerConnection": "Host=192.168.1.70;Database=postgres;Username=postgres;Password=q;Persist Security Info=True", "LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True" },