diff --git a/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs b/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs index 86b685e6..c5f75fc7 100644 --- a/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs +++ b/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs @@ -9,12 +9,14 @@ using System.Threading.Tasks; namespace AsbCloudApp.Services.Subsystems { +#nullable enable public interface ISubsystemOperationTimeService { - Task> GetSubsystemAsync(int? idWell, CancellationToken token); - Task> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token); + Task?> GetSubsystemAsync(int? idWell, CancellationToken token); + Task?> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task DeleteAsync(SubsystemOperationTimeRequest request, CancellationToken token); - Task> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token); + Task?> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token); } +#nullable disable } diff --git a/AsbCloudDb/Model/Subsystems/Subsystem.cs b/AsbCloudDb/Model/Subsystems/Subsystem.cs index 5fc7938c..70160f6e 100644 --- a/AsbCloudDb/Model/Subsystems/Subsystem.cs +++ b/AsbCloudDb/Model/Subsystems/Subsystem.cs @@ -16,14 +16,12 @@ namespace AsbCloudDb.Model.Subsystems [Column("name")] [StringLength(255)] - public string? Name { get; set; } + public string Name { get; set; } = null!; [Column("description")] [StringLength(255)] public string? Description { get; set; } - - [InverseProperty(nameof(SubsystemOperationTime.Subsystem))] - public virtual ICollection SubsystemOperationTimes { get; set; } + } } diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeBackgroundService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeBackgroundService.cs index 4eb973d3..ca25f361 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeBackgroundService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeBackgroundService.cs @@ -88,18 +88,18 @@ namespace AsbCloudInfrastructure.Services.Subsystems { var stopwatch = Stopwatch.StartNew(); var newOperationsSaub = await OperationTimeSaubAsync(item.IdTelemetry, item.LastDate ?? DateTimeOffset.MinValue, db, token); - var newOperationsSpin = await OperationTimeSpinAsync(item.IdTelemetry, item.LastDate ?? DateTimeOffset.MinValue, db, token); + //var newOperationsSpin = await OperationTimeSpinAsync(item.IdTelemetry, item.LastDate ?? DateTimeOffset.MinValue, db, token); stopwatch.Stop(); if (newOperationsSaub.Any()) { db.SubsystemOperationTimes.AddRange(newOperationsSaub); affected += await db.SaveChangesAsync(token); } - if (newOperationsSpin.Any()) - { - db.SubsystemOperationTimes.AddRange(newOperationsSpin); - affected += await db.SaveChangesAsync(token); - } + //if (newOperationsSpin.Any()) + //{ + // db.SubsystemOperationTimes.AddRange(newOperationsSpin); + // affected += await db.SaveChangesAsync(token); + //} } return affected; } @@ -109,7 +109,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems var query = db.TelemetryDataSaub .AsNoTracking() .Where(d => d.IdTelemetry == idTelemetry) - .Select(d => new OperationTimeData + .Select(d => new { DateTime = d.DateTime, Mode = d.Mode, @@ -162,7 +162,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems var query = db.TelemetryDataSpin .AsNoTracking() .Where(d => d.IdTelemetry == idTelemetry) - .Select(d => new OperationTimeData + .Select(d => new { DateTime = d.DateTime, Mode = d.Mode, diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs index c46a19ff..2a793d1a 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs @@ -33,7 +33,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems this.subsystemService = subsystemService; } - private async Task> GetSubsystemAsync(int idWell, CancellationToken token) + private async Task> GetSubsystemByIdWellAsync(int idWell, CancellationToken token) { var well = await wellService.GetOrDefaultAsync(idWell, token); if (well?.IdTelemetry is null || well.Timezone is null)