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

Разрешение конфликтов

Browse Source
This commit is contained in:
Olga Nemt 2024-09-18 13:12:19 +05:00
parent 9936c75fa9
commit 1ca9cd85c3
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AsbCloudApp/Services/ITelemetryService.cs
View File

@ -54,12 +54,6 @@ public interface ITelemetryService
/// <returns></returns>
TelemetryBaseDto? GetOrDefaultTelemetryByIdWell(int idWell);
/// <summary>
/// получить список телеметрии по ключам скважин
/// </summary>
/// <param name="idsWells">ключи скважин</param>
/// <returns></returns>
IEnumerable<TelemetryDto> GetOrDefaultTelemetriesByIdsWells(IEnumerable<int> idsWells);
/// <summary>
/// получить диапазон дат за которые есть данные
/// </summary>

21
AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
View File

@ -184,27 +184,6 @@ public class TelemetryService : ITelemetryService
return dto;
}
public IEnumerable<TelemetryDto> GetOrDefaultTelemetriesByIdsWells(IEnumerable<int> idsWells)
{
var entities = GetTelemetryCache()
.Where(t => t.Well != null)
.Where(t => idsWells.Contains(t.Well!.Id))
.Select(t => {
t.TimeZone = t.TimeZone.Hours != t.Well!.Timezone.Hours ? t.Well.Timezone : t.TimeZone;
return t;
});
var dtos = entities.Select(t => {
var dto = t.Adapt<TelemetryDto>();
dto.IdWell = t.Well?.Id;
return dto;
});
return dtos;
}
private Well? GetWellByTelemetryUid(string uid)
{
var telemetry = GetOrDefaultTelemetryByUid(uid);