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

Смена типов дат для SetpointsRequestDto и всё, что с ним связано

Browse Source
This commit is contained in:
Olga Nemt 2024-03-25 09:29:44 +05:00
parent 9e4761f97b
commit 488b8ec674
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs
View File

@ -33,7 +33,7 @@ namespace AsbCloudApp.Data.SAUB
/// <summary> /// <summary>
/// отметка времени создания запроса /// отметка времени создания запроса
/// </summary> /// </summary>
public DateTime UploadDate { get; set; } = DateTime.Now; public DateTimeOffset UploadDate { get; set; } = DateTimeOffset.Now;
/// <summary> /// <summary>
/// время в секундах актуальности этого запроса /// время в секундах актуальности этого запроса

11
AsbCloudInfrastructure/Repository/ScheduleRepository.cs
View File

@ -24,7 +24,7 @@ namespace AsbCloudInfrastructure.Repository
this.wellService = wellService; this.wellService = wellService;
} }
public async Task<IEnumerable<ScheduleDto>> GetAsync(int idWell, DateTime workTime, CancellationToken token) public async Task<IEnumerable<ScheduleDto>> GetAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
{ {
var entities = await BuildQuery(idWell, workTime) var entities = await BuildQuery(idWell, workTime)
.AsNoTracking() .AsNoTracking()
@ -33,7 +33,7 @@ namespace AsbCloudInfrastructure.Repository
return entities.Select(Convert); return entities.Select(Convert);
} }
public async Task<DrillerDto?> GetOrDefaultDrillerAsync(int idWell, DateTime workTime, CancellationToken token) public async Task<DrillerDto?> GetOrDefaultDrillerAsync(int idWell, DateTimeOffset workTime, CancellationToken token)
{ {
var entities = await BuildQuery(idWell, workTime) var entities = await BuildQuery(idWell, workTime)
.AsNoTracking() .AsNoTracking()
@ -43,8 +43,7 @@ namespace AsbCloudInfrastructure.Repository
return null; return null;
var hoursOffset = wellService.GetTimezone(idWell).Hours; var hoursOffset = wellService.GetTimezone(idWell).Hours;
var remoteDate = workTime.ToUtcDateTimeOffset(hoursOffset).ToRemoteDateTime(hoursOffset); var time = new TimeOnly(workTime.Hour, workTime.Minute, workTime.Second);
var time = new TimeOnly(remoteDate.Hour, remoteDate.Minute, remoteDate.Second);
var entity = entities.FirstOrDefault(s => var entity = entities.FirstOrDefault(s =>
s.ShiftStart > s.ShiftEnd ^ s.ShiftStart > s.ShiftEnd ^
@ -69,11 +68,11 @@ namespace AsbCloudInfrastructure.Repository
} }
private IQueryable<Schedule> BuildQuery(int idWell, DateTime workTime) private IQueryable<Schedule> BuildQuery(int idWell, DateTimeOffset workTime)
{ {
var hoursOffset = wellService.GetTimezone(idWell).Hours; var hoursOffset = wellService.GetTimezone(idWell).Hours;
var workTimeDateTime = workTime.ToUtcDateTimeOffset(hoursOffset); var workTimeDateTime = workTime.ToUniversalTime();
return GetQuery().Where(s => s.IdWell == idWell return GetQuery().Where(s => s.IdWell == idWell
&& s.DrillStart <= workTimeDateTime && s.DrillStart <= workTimeDateTime

5
AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
View File

@ -50,15 +50,14 @@ namespace AsbCloudInfrastructure.Repository
{ {
var result = base.Convert(src); var result = base.Convert(src);
var timezoneOffsetHours = wellService.GetTimezone(src.IdWell).Hours; var timezoneOffsetHours = wellService.GetTimezone(src.IdWell).Hours;
result.UploadDate = src.UploadDate.ToRemoteDateTime(timezoneOffsetHours); result.UploadDate = src.UploadDate.ToOffset(TimeSpan.FromHours(timezoneOffsetHours));
return result; return result;
} }
protected override SetpointsRequest Convert(SetpointsRequestDto src) protected override SetpointsRequest Convert(SetpointsRequestDto src)
{ {
var result = base.Convert(src); var result = base.Convert(src);
var timezoneOffsetHours = wellService.GetTimezone(src.IdWell).Hours; result.UploadDate = src.UploadDate.ToUniversalTime();
result.UploadDate = src.UploadDate.ToUtcDateTimeOffset(timezoneOffsetHours);
return result; return result;
} }
} }

1
AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
View File

@ -72,7 +72,6 @@ namespace AsbCloudInfrastructure.Services.SAUB
foreach (var item in filtered) foreach (var item in filtered)
{ {
item.IdState = 2; item.IdState = 2;
item.UploadDate = DateTime.SpecifyKind(item.UploadDate, DateTimeKind.Utc);
} }
await setpointsRepository.UpdateRangeAsync(filtered, token); await setpointsRepository.UpdateRangeAsync(filtered, token);