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

Merge branch 'dev' into feature/gtr-last-data-by-record

Browse Source
This commit is contained in:
on.nemtina 2023-05-18 15:40:47 +05:00
commit 7f5af356e6
19 changed files with 235 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
AsbCloudApp/Data/TrajectoryDto.cs Normal file
View File

@ -0,0 +1,13 @@
namespace AsbCloudApp.Data
{
/// <summary>
/// Формирование визуализации траектории 3D
/// </summary>
/// <param name="WellboreDepth">Глубина ствола</param>
/// <param name="ZenithAngle">Зенитный угол</param>
/// <param name="AzimuthGeo">Азимут географиеский</param>
public record TrajectoryDto(
double WellboreDepth,
double ZenithAngle,
double AzimuthGeo);
}

17
AsbCloudApp/Repositories/IActualTrajectoryRepository.cs Normal file
View File

@ -0,0 +1,17 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.WITS;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
namespace AsbCloudApp.Repositories
{
/// <summary>
/// CRUD для работы с фактической траекторией из клиента
/// </summary>
/// <returns></returns>
public interface IActualTrajectoryRepository : ITrajectoryRepository
{
}
}

2
AsbCloudApp/Repositories/IPlannedTrajectoryRepository.cs
View File

@ -9,7 +9,7 @@ namespace AsbCloudApp.Repositories
/// CRUD для работы с плановой траекторией из клиента
/// </summary>
/// <returns></returns>
public interface IPlannedTrajectoryRepository
public interface IPlannedTrajectoryRepository : ITrajectoryRepository
{
/// <summary>
/// Получить все добавленные по скважине координаты плановой траектории

24
AsbCloudApp/Repositories/ITrajectoryRepository.cs Normal file
View File

@ -0,0 +1,24 @@
using AsbCloudApp.Data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace AsbCloudApp.Repositories
{
/// <summary>
/// Репозиторий по работе с траекторией
/// </summary>
public interface ITrajectoryRepository
{
/// <summary>
/// Получение траектории для 3D-визуализации
/// </summary>
/// <param name="idWell">ключ скважины</param>
/// <param name="token"></param>
/// <returns></returns>
Task<IEnumerable<TrajectoryDto>> GetTrajectoryAsync(int idWell, CancellationToken token);
}
}

6
AsbCloudApp/Services/ITrajectoryVisualizationService.cs
View File

@ -11,11 +11,11 @@ namespace AsbCloudApp.Services
public interface ITrajectoryVisualizationService
{
/// <summary>
/// Получение траектории по скважине
/// Получение плановой и фактической траектории по скважине
/// </summary>
/// <param name="idWell"></param>
/// <param name="idWell">ключ скважины</param>
/// <param name="token"></param>
/// <returns></returns>
Task<IEnumerable<TrajectoryVisualizationDto>> GetTrajectoryAsync(int idWell, CancellationToken token);
Task<PlanFactBase<IEnumerable<TrajectoryVisualizationDto>>> GetTrajectoryAsync(int idWell, CancellationToken token);
}
}

2
AsbCloudApp/Services/IUserSettingsRepository.cs
View File

@ -25,7 +25,7 @@ namespace AsbCloudApp.Services
/// <param name="key"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<System.Text.Json.JsonDocument> GetOrDefaultAsync(int userId, string key, CancellationToken token);
Task<System.Text.Json.JsonDocument?> GetOrDefaultAsync(int userId, string key, CancellationToken token);
/// <summary>
/// Добавить или изменить настройки с ключем для пользователя

3
AsbCloudDb/Model/WITS/Record7.cs
View File

@ -12,6 +12,7 @@ namespace AsbCloudDb.Model.WITS
{
/// <summary>
/// длина ствола
/// RecordId = 7,
/// ItemId = 8,
/// LongMnemonic = "DEPTSVYM",
@ -87,6 +88,7 @@ namespace AsbCloudDb.Model.WITS
public string? Svytype { get; set; }
/// <summary>
/// зенитный угол
/// RecordId = 7,
/// ItemId = 13,
/// LongMnemonic = "SVYINC",
@ -117,6 +119,7 @@ namespace AsbCloudDb.Model.WITS
public float? Svyazu { get; set; }
/// <summary>
/// азимут географический
/// RecordId = 7,
/// ItemId = 15,
/// LongMnemonic = "SVYAZC",

1
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -180,6 +180,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<ITelemetryWirelineRunOutRepository, TelemetryWirelineRunOutRepository>();
services.AddTransient<IWellFinalDocumentsRepository, WellFinalDocumentsRepository>();
services.AddTransient<IPlannedTrajectoryRepository, PlannedTrajectoryRepository>();
services.AddTransient<IActualTrajectoryRepository, ActualTrajectoryRepository>();
services.AddTransient<IFaqRepository, FaqRepository>();
// Subsystem service

46
AsbCloudInfrastructure/Repository/ActualTrajectoryRepository.cs Normal file
View File

@ -0,0 +1,46 @@
using AsbCloudApp.Data;
using AsbCloudApp.Exceptions;
using AsbCloudApp.Repositories;
using AsbCloudApp.Services;
using AsbCloudDb.Model;
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Repository
{
internal class ActualTrajectoryRepository : IActualTrajectoryRepository
{
private readonly IAsbCloudDbContext db;
private readonly IWellService wellService;
public ActualTrajectoryRepository(IAsbCloudDbContext db, IWellService wellService)
{
this.db = db;
this.wellService = wellService;
}
public async Task<IEnumerable<TrajectoryDto>> GetTrajectoryAsync(int idWell, CancellationToken token)
{
var well = wellService.GetOrDefault(idWell);
if (well is null || well.Timezone is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(idWell));
var entities = await db.Record7
.AsNoTracking()
.Where(x => x.IdTelemetry == well.IdTelemetry)
.Where(coord => coord.Deptsvym != null && coord.Svyinc != null && coord.Svyazc != null)
.OrderBy(e => e.Deptsvym)
.Select(x => new { x.Deptsvym, x.Svyinc, x.Svyazc })
.ToArrayAsync(token);
var result = entities
.Select(coord => new TrajectoryDto(coord.Deptsvym!.Value, coord.Svyinc!.Value, coord.Svyazc!.Value))
.ToArray();
return result;
}
}
}

18
AsbCloudInfrastructure/Repository/PlannedTrajectoryRepository.cs
View File

@ -86,7 +86,7 @@ namespace AsbCloudInfrastructure.Repository
.Where(x => x.IdWell == idWell);
var entities = await query
.OrderBy(e => e.WellboreDepth)
.ToListAsync(token);
.ToArrayAsync(token);
var result = entities
.Select(r => Convert(r, offsetHours));
return result;
@ -115,6 +115,22 @@ namespace AsbCloudInfrastructure.Repository
entity.UpdateDate = DateTime.Now.ToUtcDateTimeOffset(offsetHours);
return entity;
}
public async Task<IEnumerable<TrajectoryDto>> GetTrajectoryAsync(int idWell, CancellationToken token)
{
var well = wellService.GetOrDefault(idWell);
if (well is null || well.Timezone is null)
throw new ArgumentInvalidException("idWell doesn`t exist", nameof(idWell));
var query = db.PlannedTrajectories
.AsNoTracking()
.Where(x => x.IdWell == idWell);
return await query
.Select(coord => new TrajectoryDto(coord.WellboreDepth, coord.ZenithAngle, coord.AzimuthGeo))
.ToArrayAsync()
.ConfigureAwait(false);
}
}
}

2
AsbCloudInfrastructure/Repository/UserSettingsRepository.cs
View File

@ -16,7 +16,7 @@ namespace AsbCloudInfrastructure.Repository
this.context = context;
}
public Task<System.Text.Json.JsonDocument> GetOrDefaultAsync(int userId, string key, CancellationToken token)
public Task<System.Text.Json.JsonDocument?> GetOrDefaultAsync(int userId, string key, CancellationToken token)
=> context.Set<UserSetting>()
.Where(s => s.IdUser == userId && s.Key == key)
.Select(s => s.Value)

53
AsbCloudInfrastructure/Services/Trajectory/TrajectoryVisualizationService.cs
View File

@ -12,28 +12,53 @@ namespace AsbCloudInfrastructure.Services.Trajectory
public class TrajectoryVisualizationService : ITrajectoryVisualizationService
{
private readonly IPlannedTrajectoryRepository repository;
private readonly IPlannedTrajectoryRepository plannedRepository;
private readonly IActualTrajectoryRepository factualRepository;
public TrajectoryVisualizationService(IPlannedTrajectoryRepository repository)
public TrajectoryVisualizationService(IPlannedTrajectoryRepository plannedRepository, IActualTrajectoryRepository factualRepository)
{
this.repository = repository;
this.plannedRepository = plannedRepository;
this.factualRepository = factualRepository;
}
public async Task<IEnumerable<TrajectoryVisualizationDto>> GetTrajectoryAsync(int idWell, CancellationToken token)
/// <summary>
/// Получение плановой и фактической траектории по скважине
/// </summary>
/// <param name="idWell">ключ скважины</param>
/// <param name="token"></param>
/// <returns></returns>
public async Task<PlanFactBase<IEnumerable<TrajectoryVisualizationDto>>> GetTrajectoryAsync(int idWell, CancellationToken token)
{
var geoCoordinates = (await repository.GetAsync(idWell, token)).ToArray();
var result = new PlanFactBase<IEnumerable<TrajectoryVisualizationDto>>();
if (geoCoordinates.Length < 2)
return Enumerable.Empty<TrajectoryVisualizationDto>();
var geoPlanCoordinates = await plannedRepository.GetTrajectoryAsync(idWell, token);
var geoFactCoordinates = await factualRepository.GetTrajectoryAsync(idWell, token);
var cartesianCoordinates = new List<TrajectoryVisualizationDto>(geoCoordinates.Length) {
new (),
};
result.Plan = GetTrajectoryVisualisation(geoPlanCoordinates);
result.Fact = GetTrajectoryVisualisation(geoFactCoordinates);
for (var i = 1; i < geoCoordinates.Length; i++)
return result;
}
/// <summary>
/// Формирует список координат для визуализации трактории 3D
/// </summary>
/// <param name="geoCoordinates"></param>
/// <returns></returns>
private IEnumerable<TrajectoryVisualizationDto> GetTrajectoryVisualisation(IEnumerable<TrajectoryDto> geoCoordinates)
{
var geoCoordinatesLength = geoCoordinates.Count();
if (geoCoordinatesLength < 2)
return new TrajectoryVisualizationDto[0];
var cartesianCoordinates = new TrajectoryVisualizationDto[geoCoordinatesLength];
cartesianCoordinates[0] = new();
var geoCoordinatesArray = geoCoordinates.OrderBy(c => c.WellboreDepth).ToArray();
for (var i = 1; i < geoCoordinatesLength; i++)
{
var intervalGeoParams = geoCoordinates[i - 1];
var deltaWellLength = geoCoordinates[i].WellboreDepth - intervalGeoParams.WellboreDepth;
var intervalGeoParams = geoCoordinatesArray[i - 1];
var deltaWellLength = geoCoordinatesArray[i].WellboreDepth - intervalGeoParams.WellboreDepth;
var projectionLengthToXYSurface = deltaWellLength * Math.Sin(intervalGeoParams.ZenithAngle * Math.PI / 180);
var dz = deltaWellLength * Math.Cos(intervalGeoParams.ZenithAngle * Math.PI / 180);
@ -48,7 +73,7 @@ namespace AsbCloudInfrastructure.Services.Trajectory
Y = preCoordinates.Y + dy,
};
cartesianCoordinates.Add(coordinates);
cartesianCoordinates[i] = coordinates;
}
return cartesianCoordinates;

101
AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs
View File

@ -1,9 +1,8 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.WITS;
using AsbCloudApp.Repositories;
using AsbCloudInfrastructure.Services;
using AsbCloudInfrastructure.Services.Trajectory;
using Moq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
@ -14,11 +13,12 @@ namespace AsbCloudWebApi.Tests.ServicesTests
{
public class TrajectoryVisualizationServiceTest
{
private Mock<IPlannedTrajectoryRepository> MakePlannedTrajectoryRepositoryMock(IEnumerable<PlannedTrajectoryDto> dateForGetMethod)
private Mock<T> MakeTrajectoryRepositoryMock<T>(IEnumerable<TrajectoryDto> dateForGetMethod)
where T : class, ITrajectoryRepository
{
var mock = new Mock<IPlannedTrajectoryRepository>();
var mock = new Mock<T>();
mock.Setup(r => r.GetAsync(It.IsAny<int>(), It.IsAny<CancellationToken>()))
mock.Setup(r => r.GetTrajectoryAsync(It.IsAny<int>(), It.IsAny<CancellationToken>()))
.Returns(Task.FromResult(dateForGetMethod));
return mock;
@ -27,65 +27,86 @@ namespace AsbCloudWebApi.Tests.ServicesTests
[Fact]
public async Task GetTrajectoryAsync_SameCounts()
{
var plannedTrajectory = new PlannedTrajectoryDto[]
var plannedTrajectory = new TrajectoryDto[]
{
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 0d},
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 10d},
new() { AzimuthGeo = 0d, ZenithAngle = 30d, WellboreDepth = 20d},
new() { AzimuthGeo = 30d, ZenithAngle = 0d, WellboreDepth = 30d},
new() { AzimuthGeo = 30d, ZenithAngle = 90d, WellboreDepth = 40d},
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 50d},
new(0d, 0d, 0d),
new(0d, 0d, 10d),
new(0d, 30d, 20d),
new(30d, 0d, 30d),
new(30d, 90d, 40d),
new(0d, 0d, 50d),
};
var mock = MakePlannedTrajectoryRepositoryMock(plannedTrajectory);
var service = new TrajectoryVisualizationService(mock.Object);
var result = await service.GetTrajectoryAsync(1, CancellationToken.None);
var actualTrajectory = new TrajectoryDto[]
{
new(0, 0, 0),
new(30,30,10),
new(0, 0, 20),
};
Assert.Equal(plannedTrajectory.Length, result.Count());
var mockPlan = MakeTrajectoryRepositoryMock<IPlannedTrajectoryRepository>(plannedTrajectory);
var mockFact = MakeTrajectoryRepositoryMock<IActualTrajectoryRepository>(actualTrajectory);
var service = new TrajectoryVisualizationService(mockPlan.Object, mockFact.Object);
var result = await service.GetTrajectoryAsync(1, CancellationToken.None);
Assert.Equal(plannedTrajectory.Length, result.Plan?.Count());
Assert.Equal(actualTrajectory.Length, result.Fact?.Count());
}
[Fact]
public async Task GetTrajectoryAsync_StraigthBore()
{
var plannedTrajectory = new PlannedTrajectoryDto[]
var trajectory = new TrajectoryDto[]
{
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 0d},
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 0d},
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 20d},
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 20d},
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 30d},
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 50d},
new(0, 0, 0),
new(0, 0, 0),
new(20, 0, 0),
new(20, 0, 0),
new(30, 0, 0),
new(50, 0, 0),
};
var mock = MakePlannedTrajectoryRepositoryMock(plannedTrajectory);
var service = new TrajectoryVisualizationService(mock.Object);
var mockPlan = MakeTrajectoryRepositoryMock<IPlannedTrajectoryRepository>(trajectory);
var mockFact = MakeTrajectoryRepositoryMock<IActualTrajectoryRepository>(trajectory);
var service = new TrajectoryVisualizationService(mockPlan.Object, mockFact.Object);
var result = await service.GetTrajectoryAsync(1, CancellationToken.None);
var lastPoint = result.Last();
var lastPointPlan = result.Plan!.Last();
var lastPointFact = result.Fact!.Last();
Assert.Equal(0d, lastPoint.X, 0.1d);
Assert.Equal(0d, lastPoint.Y, 0.1d);
Assert.Equal(50d, lastPoint.Z, 0.1d);
Assert.Equal(0d, lastPointPlan.X, 0.1d);
Assert.Equal(0d, lastPointPlan.Y, 0.1d);
Assert.Equal(50d, lastPointPlan.Z, 0.1d);
Assert.Equal(0d, lastPointFact.X, 0.1d);
Assert.Equal(0d, lastPointFact.Y, 0.1d);
Assert.Equal(50d, lastPointFact.Z, 0.1d);
}
[Fact]
public async Task GetTrajectoryAsync_Match()
{
var plannedTrajectory = new PlannedTrajectoryDto[]
var trajectory = new TrajectoryDto[]
{
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 0d},
new() { AzimuthGeo = 30d, ZenithAngle = 30d, WellboreDepth = 10d},
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 20d},
new(0, 0, 0),
new(10, 30, 30),
new(20, 0, 0),
};
var mock = MakePlannedTrajectoryRepositoryMock(plannedTrajectory);
var service = new TrajectoryVisualizationService(mock.Object);
var mockPlanned = MakeTrajectoryRepositoryMock<IPlannedTrajectoryRepository>(trajectory);
var mockFactual = MakeTrajectoryRepositoryMock<IActualTrajectoryRepository>(trajectory);
var service = new TrajectoryVisualizationService(mockPlanned.Object, mockFactual.Object);
var result = await service.GetTrajectoryAsync(1, CancellationToken.None);
var lastPoint = result.Last();
var tolerance = 0.001d;
var lastPointPlan = result.Plan!.Last();
var lastPointFact = result.Fact!.Last();
var tolerancePlan = 0.001d;
var toleranceFact = 0.001d;
Assert.InRange(lastPoint.Z, 10 + tolerance, 20 - tolerance);
Assert.InRange(lastPoint.Y, 0 + tolerance, 10 - tolerance);
Assert.InRange(lastPoint.X, 0 + tolerance, 10 - tolerance);
Assert.InRange(lastPointPlan.Z, 10 + tolerancePlan, 20 - tolerancePlan);
Assert.InRange(lastPointPlan.Y, 0 + tolerancePlan, 10 - tolerancePlan);
Assert.InRange(lastPointPlan.X, 0 + tolerancePlan, 10 - tolerancePlan);
Assert.InRange(lastPointFact.Z, 10 + toleranceFact, 20 - toleranceFact);
Assert.InRange(lastPointFact.Y, 0 + toleranceFact, 10 - toleranceFact);
Assert.InRange(lastPointFact.X, 0 + toleranceFact, 10 - toleranceFact);
}
}
}

1
AsbCloudWebApi/AsbCloudWebApi.csproj
View File

@ -6,6 +6,7 @@
<ServerGarbageCollection>true</ServerGarbageCollection>
<NoWarn>$(NoWarn);1591</NoWarn>
<UserSecretsId>80899ceb-210f-4f19-ac56-aa90a5d666d4</UserSecretsId>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>

6
AsbCloudWebApi/Controllers/PlannedTrajectoryController.cs
View File

@ -225,14 +225,14 @@ namespace AsbCloudWebApi.Controllers
}
/// <summary>
/// Получение координат для визуализации траектории
/// Получение координат для визуализации траектории (плановой и фактической)
/// </summary>
/// <param name="idWell"></param>
/// <param name="token"></param>
/// <returns></returns>
[HttpGet]
[ProducesResponseType(typeof(IEnumerable<TrajectoryVisualizationDto>), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetTrajectoryAsync(int idWell, CancellationToken token)
[ProducesResponseType(typeof(PlanFactBase<IEnumerable<TrajectoryVisualizationDto>>), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetPlanFactTrajectoryAsync(int idWell, CancellationToken token)
{
if (!await CanUserAccessToWellAsync(idWell,
token).ConfigureAwait(false))

2
AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs
View File

@ -145,7 +145,7 @@ namespace AsbCloudWebApi.Controllers.SAUB
else
{
if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
(int)idWell, token).ConfigureAwait(false))
idWell!.Value, token).ConfigureAwait(false))
return Forbid();
idsWells = new List<int> { (int)idWell };
}

2
AsbCloudWebApi/Middlewares/SimplifyExceptionsMiddleware.cs
View File

@ -19,7 +19,7 @@ namespace AsbCloudWebApi.Middlewares
{
try
{
await next?.Invoke(context);
await next.Invoke(context);
}
catch (ArgumentInvalidException ex)
{

3
AsbCloudWebApi/PermissionAttribute.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
namespace AsbCloudWebApi
{
@ -8,7 +9,7 @@ namespace AsbCloudWebApi
{
public static SortedSet<string> Registered { get; } = new SortedSet<string>();
public string Name { get; set; }
public string Name { get; set; } = null!;
/// <summary>
/// Проверка наличия у пользователя разрешения с именем "{ControllerName}.{http_method}".

27
AsbCloudWebApi/TraceListenerView.cs
View File

@ -1,27 +0,0 @@
using System.Diagnostics;
namespace AsbCloudWebApi
{
public class TraceListenerView : TraceListener
{
public TraceListenerView()
{
Trace.Listeners.Add(this);
}
public override void Write(object o)
{
base.Write(o);
}
public override void Write(string message)
{
//throw new NotImplementedException();
}
public override void WriteLine(string message)
{
//throw new NotImplementedException();
}
}
}