on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

#11342611 Обновить библиотеки формирования рапортов

Browse Source
This commit is contained in:
ngfrolov 2023-07-27 10:47:02 +05:00
parent f40cd0acff
commit e5a563f6e6
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
AsbCloudInfrastructure/CommonLibs/AsbSaubReport.dll
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/CommonLibs/AsbSaubReportLas.dll
View File

Binary file not shown.

BIN
AsbCloudInfrastructure/CommonLibs/AsbSaubReportPdf.dll
View File

Binary file not shown.

21
AsbCloudInfrastructure/ReportDataSourcePgCloud.cs
View File

@ -1,6 +1,7 @@
using AsbCloudApp.Exceptions;
using AsbCloudDb.Model;
using AsbSaubReport.Model;
using iText.Forms.Xfdf;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
@ -129,6 +130,26 @@ namespace AsbCloudInfrastructure
return query;
}
public IQueryable<DataSpinReport> GetDataSpinItems(DateTime begin, DateTime end)
{
var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
var endUtc = end.ToUtcDateTimeOffset(timezoneOffset);
var query = context.TelemetryDataSpin
.Where(d => d.IdTelemetry == idTelemetry
&& d.DateTime >= beginUtc
&& d.DateTime <= endUtc)
.OrderBy(d => d.DateTime)
.Select(d => new DataSpinReport
{
Date = d.DateTime.DateTime.AddHours(timezoneOffset),
Mode = d.Mode,
IsWorkingSpinMaster = (d.State != 0 && d.State != 5 && d.State != 6 && d.State != 7),
IsWorkingTorqueMaster = (d.State == 7 && (d.Mode & 2) > 0),
});
return query;
}
public IQueryable<MessageReport> GetMessages(DateTime begin, DateTime end)
{
var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);