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

before merge

Browse Source
This commit is contained in:
eugeniy_ivanov 2022-08-08 16:53:01 +05:00
parent 1e694216a9
commit ca261f1eb7
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
View File

@ -9,12 +9,14 @@ using System.Threading.Tasks;
namespace AsbCloudApp.Services.Subsystems namespace AsbCloudApp.Services.Subsystems
{ {
#nullable enable
public interface ISubsystemOperationTimeService public interface ISubsystemOperationTimeService
{ {
Task<IEnumerable<SubsystemDto>> GetSubsystemAsync(int? idWell, CancellationToken token); Task<IEnumerable<SubsystemDto>?> GetSubsystemAsync(int? idWell, CancellationToken token);
Task<IEnumerable<SubsystemStatDto>> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task<IEnumerable<SubsystemStatDto>?> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token);
Task<int> DeleteAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task<int> DeleteAsync(SubsystemOperationTimeRequest request, CancellationToken token);
Task<IEnumerable<SubsystemOperationTimeDto>> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task<IEnumerable<SubsystemOperationTimeDto>?> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token);
} }
#nullable disable
} }

6
AsbCloudDb/Model/Subsystems/Subsystem.cs
View File

@ -16,14 +16,12 @@ namespace AsbCloudDb.Model.Subsystems
[Column("name")] [Column("name")]
[StringLength(255)] [StringLength(255)]
public string? Name { get; set; } public string Name { get; set; } = null!;
[Column("description")] [Column("description")]
[StringLength(255)] [StringLength(255)]
public string? Description { get; set; } public string? Description { get; set; }
[InverseProperty(nameof(SubsystemOperationTime.Subsystem))]
public virtual ICollection<SubsystemOperationTime> SubsystemOperationTimes { get; set; }
} }
} }

16
AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeBackgroundService.cs
View File

@ -88,18 +88,18 @@ namespace AsbCloudInfrastructure.Services.Subsystems
{ {
var stopwatch = Stopwatch.StartNew(); var stopwatch = Stopwatch.StartNew();
var newOperationsSaub = await OperationTimeSaubAsync(item.IdTelemetry, item.LastDate ?? DateTimeOffset.MinValue, db, token); 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(); stopwatch.Stop();
if (newOperationsSaub.Any()) if (newOperationsSaub.Any())
{ {
db.SubsystemOperationTimes.AddRange(newOperationsSaub); db.SubsystemOperationTimes.AddRange(newOperationsSaub);
affected += await db.SaveChangesAsync(token); affected += await db.SaveChangesAsync(token);
} }
if (newOperationsSpin.Any()) //if (newOperationsSpin.Any())
{ //{
db.SubsystemOperationTimes.AddRange(newOperationsSpin); // db.SubsystemOperationTimes.AddRange(newOperationsSpin);
affected += await db.SaveChangesAsync(token); // affected += await db.SaveChangesAsync(token);
} //}
} }
return affected; return affected;
} }
@ -109,7 +109,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
var query = db.TelemetryDataSaub var query = db.TelemetryDataSaub
.AsNoTracking() .AsNoTracking()
.Where(d => d.IdTelemetry == idTelemetry) .Where(d => d.IdTelemetry == idTelemetry)
.Select(d => new OperationTimeData .Select(d => new
{ {
DateTime = d.DateTime, DateTime = d.DateTime,
Mode = d.Mode, Mode = d.Mode,
@ -162,7 +162,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
var query = db.TelemetryDataSpin var query = db.TelemetryDataSpin
.AsNoTracking() .AsNoTracking()
.Where(d => d.IdTelemetry == idTelemetry) .Where(d => d.IdTelemetry == idTelemetry)
.Select(d => new OperationTimeData .Select(d => new
{ {
DateTime = d.DateTime, DateTime = d.DateTime,
Mode = d.Mode, Mode = d.Mode,

2
AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
View File

@ -33,7 +33,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
this.subsystemService = subsystemService; this.subsystemService = subsystemService;
} }
private async Task<IEnumerable<SubsystemDto>> GetSubsystemAsync(int idWell, CancellationToken token) private async Task<IEnumerable<SubsystemDto>> GetSubsystemByIdWellAsync(int idWell, CancellationToken token)
{ {
var well = await wellService.GetOrDefaultAsync(idWell, token); var well = await wellService.GetOrDefaultAsync(idWell, token);
if (well?.IdTelemetry is null || well.Timezone is null) if (well?.IdTelemetry is null || well.Timezone is null)