forked from ddrilling/AsbCloudServer
#11342611 Обновить библиотеки формирования рапортов
This commit is contained in:
parent
f40cd0acff
commit
e5a563f6e6
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,6 +1,7 @@
|
|||||||
using AsbCloudApp.Exceptions;
|
using AsbCloudApp.Exceptions;
|
||||||
using AsbCloudDb.Model;
|
using AsbCloudDb.Model;
|
||||||
using AsbSaubReport.Model;
|
using AsbSaubReport.Model;
|
||||||
|
using iText.Forms.Xfdf;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@ -129,6 +130,26 @@ namespace AsbCloudInfrastructure
|
|||||||
return query;
|
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)
|
public IQueryable<MessageReport> GetMessages(DateTime begin, DateTime end)
|
||||||
{
|
{
|
||||||
var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
|
var beginUtc = begin.ToUtcDateTimeOffset(timezoneOffset);
|
||||||
|
Loading…
Reference in New Issue
Block a user