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

nit fixes

Browse Source
This commit is contained in:
ngfrolov 2023-05-19 16:48:00 +05:00
parent 41663eabcb
commit 8eaad67496
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsbCloudApp/Repositories/IGtrRepository.cs
View File

@ -4,10 +4,8 @@ using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace AsbCloudApp.Repositories namespace AsbCloudApp.Repositories
{ {
#nullable enable
/// <summary> /// <summary>
/// данные ГТИ /// данные ГТИ
/// </summary> /// </summary>
@ -44,5 +42,4 @@ namespace AsbCloudApp.Repositories
/// <returns></returns> /// <returns></returns>
Task<IEnumerable<WitsItemRecordDto>> GetLastDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token = default); Task<IEnumerable<WitsItemRecordDto>> GetLastDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token = default);
} }
#nullable disable
} }

9
AsbCloudInfrastructure/Repository/GtrWitsRepository.cs
View File

@ -12,7 +12,6 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Repository namespace AsbCloudInfrastructure.Repository
{ {
public class GtrWitsRepository : IGtrRepository public class GtrWitsRepository : IGtrRepository
{ {
private readonly IAsbCloudDbContext db; private readonly IAsbCloudDbContext db;
@ -64,7 +63,7 @@ namespace AsbCloudInfrastructure.Repository
Items = g.Select(r => new Items = g.Select(r => new
{ {
Key = r.IdItem, Key = r.IdItem,
Value = r.Value r.Value
}).ToDictionary(x => x.Key, x => x.Value) }).ToDictionary(x => x.Key, x => x.Value)
}); });
return dtos; return dtos;
@ -89,7 +88,7 @@ namespace AsbCloudInfrastructure.Repository
var recordAllFloat = await GetGroupedItemsOrDefaultAsync<WitsItemFloat, float>(witsRequest, token); var recordAllFloat = await GetGroupedItemsOrDefaultAsync<WitsItemFloat, float>(witsRequest, token);
var recordAllString = await GetGroupedItemsOrDefaultAsync<WitsItemString, string>(witsRequest, token); var recordAllString = await GetGroupedItemsOrDefaultAsync<WitsItemString, string>(witsRequest, token);
var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString).ToArray(); var dtos = recordAllFloat.Union(recordAllInt).Union(recordAllString);
return dtos; return dtos;
} }
@ -116,7 +115,7 @@ namespace AsbCloudInfrastructure.Repository
.ToArrayAsync(token) .ToArrayAsync(token)
.ConfigureAwait(false); .ConfigureAwait(false);
var entities = groupedEntities var dtos = groupedEntities
.Select(e => new WitsItemRecordDto() .Select(e => new WitsItemRecordDto()
{ {
IdRecord = e.IdRecord, IdRecord = e.IdRecord,
@ -125,7 +124,7 @@ namespace AsbCloudInfrastructure.Repository
Value = new JsonValue(e.Data!.Value) Value = new JsonValue(e.Data!.Value)
}); });
return entities; return dtos;
} }
private async Task<IEnumerable<WitsItemRecordDto>> GetItemsOrDefaultAsync<TEntity, TValue>( private async Task<IEnumerable<WitsItemRecordDto>> GetItemsOrDefaultAsync<TEntity, TValue>(