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

Remove obsolete dataService; remove db mdel dependendency from webApi

Browse Source
This commit is contained in:
Фролов 2021-10-12 11:03:05 +05:00
parent e05c291b2b
commit 91c85c8fdc
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
AsbCloudWebApi/Controllers/TelemetryController.cs
View File

@ -18,7 +18,6 @@ namespace AsbCloudWebApi.Controllers
[ApiController] [ApiController]
public class TelemetryController : ControllerBase public class TelemetryController : ControllerBase
{ {
private readonly IDataService DataService;
private readonly ITelemetryService telemetryService; private readonly ITelemetryService telemetryService;
private readonly IMessageService messageService; private readonly IMessageService messageService;
private readonly IEventService eventService; private readonly IEventService eventService;
@ -28,14 +27,12 @@ namespace AsbCloudWebApi.Controllers
public TelemetryController( public TelemetryController(
ITelemetryService telemetryService, ITelemetryService telemetryService,
IDataService DataService,
IMessageService messageService, IMessageService messageService,
IEventService eventService, IEventService eventService,
ITelemetryUserService telemetryUserService, ITelemetryUserService telemetryUserService,
IHubContext<TelemetryHub> telemetryHubContext, IHubContext<TelemetryHub> telemetryHubContext,
ITelemetryTracker telemetryTracker) ITelemetryTracker telemetryTracker)
{ {
this.DataService = DataService;
this.telemetryService = telemetryService; this.telemetryService = telemetryService;
this.messageService = messageService; this.messageService = messageService;
this.eventService = eventService; this.eventService = eventService;
@ -59,31 +56,6 @@ namespace AsbCloudWebApi.Controllers
return Ok(); return Ok();
} }
//TODO: remove when panels update will be done.
/// <summary>
/// Принимает данные от разных систем по скважине
/// </summary>
/// <param name="uid">Уникальный идентификатор отправителя</param>
/// <param name="dtos">Данные</param>
/// <param name="token">Токен для отмены задачи</param>
/// <returns></returns>
[HttpPost]
[Obsolete]
[Route("{uid}/data")]
public async Task<IActionResult> PostDataAsync(string uid, [FromBody] IEnumerable<TelemetryDataSaubDto> dtos,
CancellationToken token = default)
{
var idWell = telemetryService.GetidWellByTelemetryUid(uid);
await DataService.UpdateDataAsync(uid, dtos, token).ConfigureAwait(false);
if (idWell != null && dtos.Any())
await Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}")
.SendAsync("ReceiveDataSaub", dtos), token).ConfigureAwait(false);
telemetryTracker.SaveRequestDate(uid);
return Ok();
}
/// <summary> /// <summary>
/// Принимает список новых сообщений от телеметрии /// Принимает список новых сообщений от телеметрии
/// </summary> /// </summary>

6
AsbCloudWebApi/Extensions.cs
View File

@ -1,4 +1,4 @@
using AsbCloudDb.Model; using AsbCloudApp.Data;
using System.Security.Claims; using System.Security.Claims;
namespace AsbCloudWebApi namespace AsbCloudWebApi
@ -7,7 +7,7 @@ namespace AsbCloudWebApi
{ {
public static int? GetCompanyId(this ClaimsPrincipal user) public static int? GetCompanyId(this ClaimsPrincipal user)
{ {
var claimIdCompany = user.FindFirst(nameof(User.IdCompany)); var claimIdCompany = user.FindFirst(nameof(UserDto.IdCompany));
if (claimIdCompany is null) if (claimIdCompany is null)
return null; return null;
@ -18,7 +18,7 @@ namespace AsbCloudWebApi
public static int? GetUserId(this ClaimsPrincipal user) public static int? GetUserId(this ClaimsPrincipal user)
{ {
var userId = user.FindFirst(nameof(User.Id)); var userId = user.FindFirst(nameof(UserDto.Id));
if (userId is null) if (userId is null)
return null; return null;