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

remove useless argument TelemetryService.GetTransmittingTelemetriesAsync()

Browse Source
This commit is contained in:
Фролов 2021-12-07 15:55:11 +05:00
parent 9a7d2b4140
commit 1e9078079a
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
AsbCloudApp/Services/ITelemetryService.cs
View File

@ -11,20 +11,22 @@ namespace AsbCloudApp.Services
ITimeZoneService TimeZoneService { get; } ITimeZoneService TimeZoneService { get; }
ITelemetryTracker TelemetryTracker { get; } ITelemetryTracker TelemetryTracker { get; }
int? GetidWellByTelemetryUid(string uid); int? GetIdWellByTelemetryUid(string uid);
int GetOrCreateTemetryIdByUid(string uid); int GetOrCreateTelemetryIdByUid(string uid);
double GetTimezoneOffsetByTelemetryId(int idTelemetry); double GetTimezoneOffsetByTelemetryId(int idTelemetry);
Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token); Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token);
Task<double?> GetTelemetryTimeZoneOffsetAsync(int idTelemetry, CancellationToken token); Task<double?> GetTelemetryTimeZoneOffsetAsync(int idTelemetry, CancellationToken token);
Task<DatesRangeDto> FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result, Task<DatesRangeDto> FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result,
CancellationToken token); CancellationToken token);
Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token); Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token);
int? GetIdTelemetryByIdWell(int idWell); int? GetIdTelemetryByIdWell(int idWell);
int Merge(IEnumerable<int> telemetryIds); int Merge(IEnumerable<int> telemetryIds);
IEnumerable<(string Key, int[] Ids)> GetRedundentRemoteUids(); IEnumerable<(string Key, int[] Ids)> GetRedundantRemoteUids();
IEnumerable<TelemetryDto> GetTransmittingTelemetriesAsync(int idCompany); IEnumerable<TelemetryDto> GetTransmittingTelemetries();
DateTime GetLastTelemetryDate(string telemetryUid); DateTime GetLastTelemetryDate(string telemetryUid);
DateTime GetLastTelemetryDate(int telemetryId); DateTime GetLastTelemetryDate(int telemetryId);
void SaveRequestDate(string uid, DateTime remoteDate); void SaveRequestDate(string uid, DateTime remoteDate);
} }
} }

8
AsbCloudInfrastructure/Services/TelemetryService.cs
View File

@ -40,7 +40,7 @@ namespace AsbCloudInfrastructure.Services
this.timeZoneService = timeZoneService; this.timeZoneService = timeZoneService;
} }
public IEnumerable<TelemetryDto> GetTransmittingTelemetriesAsync(int idCompany) public IEnumerable<TelemetryDto> GetTransmittingTelemetries()
{ {
var telemetryDtos = new List<TelemetryDto>(); var telemetryDtos = new List<TelemetryDto>();
IEnumerable<string> activeTelemetriesUids = telemetryTracker.GetTransmittingTelemetriesUids(); IEnumerable<string> activeTelemetriesUids = telemetryTracker.GetTransmittingTelemetriesUids();
@ -74,10 +74,10 @@ namespace AsbCloudInfrastructure.Services
return lastTelemetryDate; return lastTelemetryDate;
} }
public int GetOrCreateTemetryIdByUid(string uid) public int GetOrCreateTelemetryIdByUid(string uid)
=> GetOrCreateTelemetryByUid(uid).Id; => GetOrCreateTelemetryByUid(uid).Id;
public int? GetidWellByTelemetryUid(string uid) public int? GetIdWellByTelemetryUid(string uid)
=> GetWellByTelemetryUid(uid)?.Id; => GetWellByTelemetryUid(uid)?.Id;
public double GetTimezoneOffsetByTelemetryId(int idTelemetry) => public double GetTimezoneOffsetByTelemetryId(int idTelemetry) =>
@ -219,7 +219,7 @@ namespace AsbCloudInfrastructure.Services
private Telemetry GetOrCreateTelemetryByUid(string uid) private Telemetry GetOrCreateTelemetryByUid(string uid)
=> cacheTelemetry.GetOrCreate(t => t.RemoteUid == uid, () => new Telemetry { RemoteUid = uid }); => cacheTelemetry.GetOrCreate(t => t.RemoteUid == uid, () => new Telemetry { RemoteUid = uid });
public IEnumerable<(string Key, int[] Ids)> GetRedundentRemoteUids() public IEnumerable<(string Key, int[] Ids)> GetRedundantRemoteUids()
{ {
return db.Telemetries return db.Telemetries
.ToList() .ToList()

2
AsbCloudInfrastructure/Services/WellService.cs
View File

@ -41,7 +41,7 @@ namespace AsbCloudInfrastructure.Services
public async Task<IEnumerable<WellDto>> GetTransmittingWellsAsync(int idCompany, public async Task<IEnumerable<WellDto>> GetTransmittingWellsAsync(int idCompany,
CancellationToken token) CancellationToken token)
{ {
var activeTelemetryIds = telemetryService.GetTransmittingTelemetriesAsync(idCompany) var activeTelemetryIds = telemetryService.GetTransmittingTelemetries()
.Select(t => t.Id); .Select(t => t.Id);
var wells = await (from w in db.GetWellsForCompany(idCompany) var wells = await (from w in db.GetWellsForCompany(idCompany)