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

Merge branch 'feature/#30435481-unification-date/time' into feature/refactoring_well_operation

Browse Source 
# Conflicts:
#	AsbCloudInfrastructure/Repository/WellOperationRepository.cs
This commit is contained in:
Степанов Дмитрий 2024-03-29 07:34:50 +03:00
commit 0fb65c7e83
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudInfrastructure/Repository/TrajectoryEditableRepository.cs
View File

@ -112,7 +112,7 @@ namespace AsbCloudInfrastructure.Repository
private static TEntity Convert(Tdto dto) private static TEntity Convert(Tdto dto)
{ {
var entity = dto.Adapt<TEntity>(); var entity = dto.Adapt<TEntity>();
entity.UpdateDate = DateTimeOffset.Now; entity.UpdateDate = DateTimeOffset.UtcNow;
return entity; return entity;
} }
} }

3
AsbCloudInfrastructure/Services/SAUB/MessageService.cs
View File

@ -68,8 +68,6 @@ namespace AsbCloudInfrastructure.Services.SAUB
query = query.OrderByDescending(m => m.DateTime); query = query.OrderByDescending(m => m.DateTime);
var timezone = telemetryService.GetTimezone(telemetry.Id);
if (request.Begin is not null) if (request.Begin is not null)
{ {
var beginUtc = request.Begin.Value.ToUniversalTime(); var beginUtc = request.Begin.Value.ToUniversalTime();
@ -102,6 +100,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
var usersDict = users.ToDictionary(x => x.IdUser, x => x); var usersDict = users.ToDictionary(x => x.IdUser, x => x);
var messagesDtoList = new List<MessageDto>(); var messagesDtoList = new List<MessageDto>();
var timezone = telemetryService.GetTimezone(telemetry.Id);
foreach (var message in messagesList) foreach (var message in messagesList)
{ {

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

@ -41,7 +41,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
public async Task<int> InsertAsync(SetpointsRequestDto setpointsRequest, CancellationToken token) public async Task<int> InsertAsync(SetpointsRequestDto setpointsRequest, CancellationToken token)
{ {
setpointsRequest.IdState = 1; setpointsRequest.IdState = 1;
setpointsRequest.UploadDate = DateTime.UtcNow; setpointsRequest.UploadDate = DateTimeOffset.UtcNow;
var result = await setpointsRepository.InsertAsync(setpointsRequest, token); var result = await setpointsRepository.InsertAsync(setpointsRequest, token);
return result; return result;
} }

5
AsbCloudWebApi/Converters/DateOnlyTypeConverter.cs
View File

@ -22,7 +22,10 @@ namespace AsbCloudWebApi.Converters
{ {
if (value is string str) if (value is string str)
{ {
return DateOnly.Parse(str); if (DateTimeOffset.TryParse(str, out DateTimeOffset dateTime))
return DateOnly.FromDateTime(dateTime.Date);
if (DateTime.TryParse(str, out DateTime date))
return DateOnly.FromDateTime(date);
} }
return base.ConvertFrom(context, culture, value); return base.ConvertFrom(context, culture, value);
} }