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

Merge branch 'dev' into convertToPdf

Browse Source
This commit is contained in:
ngfrolov 2023-01-24 09:43:12 +05:00
commit be9168b4bf
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
8 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs
View File

@ -3,10 +3,11 @@
namespace AsbCloudApp.Data.SAUB
{
#nullable enable
/// <summary>
/// DTO телеметрии наработки талевого каната
/// DTO телеметрии наработки талевого каната от панели бурильщика
/// </summary>
public class TelemetryWirelineRunOutDto
public class TelemetryWirelineRunOutBaseDto
{
/// <summary>
/// отметка времени
@ -32,6 +33,13 @@ namespace AsbCloudApp.Data.SAUB
/// Наработка талевого каната до сигнализации о необходимости замены, т*км
/// </summary>
public float ReplaceWarnSp { get; set; }
}
/// <summary>
/// DTO телеметрии наработки талевого каната
/// </summary>
public class TelemetryWirelineRunOutDto : TelemetryWirelineRunOutBaseDto
{
/// <summary>
/// Информация по скважине

3
AsbCloudApp/Data/WellDto.cs
View File

@ -8,9 +8,6 @@ namespace AsbCloudApp.Data
/// </summary>
public class WellDto : WellInfoDto, IMapPoint, IId
{
/// <inheritdoc/>
public int Id { get; set; }
/// <inheritdoc/>
public double? Latitude { get; set; }

5
AsbCloudApp/Data/WellInfoDto.cs
View File

@ -3,8 +3,11 @@
/// <summary>
/// базовая информация о скважине
/// </summary>
public class WellInfoDto
public class WellInfoDto: IId
{
/// <inheritdoc/>
public int Id { get; set; }
/// <summary>
/// Название
/// </summary>

2
AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs
View File

@ -19,7 +19,7 @@ namespace AsbCloudApp.Repositories
/// <param name="dto"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutDto dto, CancellationToken token);
Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token);
/// <summary>
/// Выдает данные по скважине

16
AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs
View File

@ -29,20 +29,16 @@ namespace AsbCloudInfrastructure.Repository
}
/// <inheritdoc/>
public async Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutDto dto, CancellationToken token)
public async Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token)
{
var idTelemetry = telemetryService.GetOrCreateTelemetryIdByUid(uid);
var timezoneOffset = telemetryService.GetTimezone(idTelemetry).Hours;
var entity = Convert(idTelemetry, dto, timezoneOffset);
var updatingItem = context.TelemetryWirelineRunOut
.Where(x => x.IdTelemetry == idTelemetry)
.FirstOrDefault();
if (updatingItem is null)
context.TelemetryWirelineRunOut.Add(entity);
else
if (await context.TelemetryWirelineRunOut.AnyAsync(w => w.IdTelemetry == idTelemetry, token))
context.TelemetryWirelineRunOut.Update(entity);
else
context.TelemetryWirelineRunOut.Add(entity);
return await context.SaveChangesAsync(token);
}
@ -93,7 +89,7 @@ namespace AsbCloudInfrastructure.Repository
return result;
}
private static TelemetryWirelineRunOut Convert(int idTelemetry, TelemetryWirelineRunOutDto dto, double timezoneOffset)
private static TelemetryWirelineRunOut Convert(int idTelemetry, TelemetryWirelineRunOutBaseDto dto, double timezoneOffset)
{
var entity = dto.Adapt<TelemetryWirelineRunOut>();
entity.IdTelemetry = idTelemetry;

BIN
AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportTemplate.xlsx
View File

Binary file not shown.

4
AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs
View File

@ -48,12 +48,12 @@ namespace AsbCloudWebApi.Controllers.SAUB
[HttpPost]
[Route("{uid}")]
[AllowAnonymous]
public IActionResult PostData(string uid, [FromBody] TelemetryWirelineRunOutDto dto, CancellationToken token)
public async Task<IActionResult> PostDataAsync(string uid, [FromBody] TelemetryWirelineRunOutBaseDto dto, CancellationToken token)
{
if (dto is null)
return BadRequest("Dto shouldn't be null");
var data = repository.AddOrUpdateAsync(uid, dto, token);
var data = await repository.AddOrUpdateAsync(uid, dto, token);
var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
if (idWell is not null)

12
AsbCloudWebApi/ProtobufModel.cs
View File

@ -15,15 +15,15 @@ namespace AsbCloudWebApi
private static void EnshureRegisteredWirelineRunOutDto()
{
var type = typeof(TelemetryWirelineRunOutDto);
var type = typeof(TelemetryWirelineRunOutBaseDto);
if (RuntimeTypeModel.Default.IsDefined(type))
return;
RuntimeTypeModel.Default.Add(type, false)
.Add(1, nameof(TelemetryWirelineRunOutDto.DateTime))
.Add(2, nameof(TelemetryWirelineRunOutDto.Hauling))
.Add(3, nameof(TelemetryWirelineRunOutDto.HaulingWarnSp))
.Add(4, nameof(TelemetryWirelineRunOutDto.Replace))
.Add(5, nameof(TelemetryWirelineRunOutDto.ReplaceWarnSp));
.Add(1, nameof(TelemetryWirelineRunOutBaseDto.DateTime))
.Add(2, nameof(TelemetryWirelineRunOutBaseDto.Hauling))
.Add(3, nameof(TelemetryWirelineRunOutBaseDto.HaulingWarnSp))
.Add(4, nameof(TelemetryWirelineRunOutBaseDto.Replace))
.Add(5, nameof(TelemetryWirelineRunOutBaseDto.ReplaceWarnSp));
}
private static void EnshureRegisteredWITS()