diff --git a/AsbCloudApp/Services/ILimitingParameterService.cs b/AsbCloudApp/Services/ILimitingParameterService.cs
index 3e82eba1..5f752a62 100644
--- a/AsbCloudApp/Services/ILimitingParameterService.cs
+++ b/AsbCloudApp/Services/ILimitingParameterService.cs
@@ -19,6 +19,12 @@ namespace AsbCloudApp.Services
///
///
Task> GetStatAsync(LimitingParameterRequest request, CancellationToken token);
+
+ ///
+ /// Получение списка ограничений
+ ///
+ ///
+ Dictionary GetLimitingParameteraNames();
}
#nullable disable
}
diff --git a/AsbCloudInfrastructure/Services/LimitingParameterService.cs b/AsbCloudInfrastructure/Services/LimitingParameterService.cs
index c50729f8..0a609507 100644
--- a/AsbCloudInfrastructure/Services/LimitingParameterService.cs
+++ b/AsbCloudInfrastructure/Services/LimitingParameterService.cs
@@ -15,7 +15,7 @@ namespace AsbCloudInfrastructure.Services
{
private readonly ILimitingParameterRepository limitingParameterRepository;
private readonly IWellService wellService;
- private readonly Dictionary feedRegulatorData = new Dictionary()
+ private readonly Dictionary feedRegulatorData = new ()
{
{ 0, "Нет ограничения" },
{ 1, "МСП" },
@@ -63,6 +63,11 @@ namespace AsbCloudInfrastructure.Services
return result;
}
+ public Dictionary GetLimitingParameteraNames() //TODO: Перенести получение ограничений в репозиторий
+ {
+ return feedRegulatorData;
+ }
+
private IEnumerable TrimLimitingParameters(IEnumerable data, LimitingParameterRequest request)
{
var result = data.Select((x) =>
diff --git a/AsbCloudWebApi/Controllers/LimitingParameterController.cs b/AsbCloudWebApi/Controllers/LimitingParameterController.cs
index 1df008e8..9bd5784d 100644
--- a/AsbCloudWebApi/Controllers/LimitingParameterController.cs
+++ b/AsbCloudWebApi/Controllers/LimitingParameterController.cs
@@ -40,6 +40,18 @@ namespace AsbCloudWebApi.Controllers
return Ok(subsystemResult);
}
+ ///
+ /// Получение словаря названий ограничений
+ ///
+ ///
+ [HttpGet("names")]
+ [ProducesResponseType(typeof(Dictionary), (int)System.Net.HttpStatusCode.OK)]
+ public IActionResult GetLimitingParameteraNames()
+ {
+ var feedRegulatorData = limitingParameterService.GetLimitingParameteraNames();
+ return Ok(feedRegulatorData);
+ }
+
protected async Task UserHasAccesToWellAsync(int idWell, CancellationToken token)
{
var idCompany = User.GetCompanyId();
diff --git a/AsbCloudWebApi/Controllers/Subsystems/SubsystemOperationTimeController.cs b/AsbCloudWebApi/Controllers/Subsystems/SubsystemOperationTimeController.cs
index e2b1a945..65f503ea 100644
--- a/AsbCloudWebApi/Controllers/Subsystems/SubsystemOperationTimeController.cs
+++ b/AsbCloudWebApi/Controllers/Subsystems/SubsystemOperationTimeController.cs
@@ -3,7 +3,6 @@ using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudApp.Services.Subsystems;
using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
using System.Threading;
@@ -25,6 +24,14 @@ namespace AsbCloudWebApi.Controllers.Subsystems
private readonly ISubsystemOperationTimeService subsystemOperationTimeService;
private readonly IWellService wellService;
private readonly ISubsystemService subsystemService;
+
+ private readonly Dictionary subsystemNames = new()
+ {
+ { 1, "SAUB" },
+ { 65537, "Torque Master" },
+ { 65536, "Spin Master" }
+ };
+
public SubsystemOperationTimeController(ISubsystemOperationTimeService subsystemOperationTimeService, IWellService wellService, ISubsystemService subsystemService)
{
this.subsystemOperationTimeService = subsystemOperationTimeService;
@@ -131,6 +138,17 @@ namespace AsbCloudWebApi.Controllers.Subsystems
return Ok(result);
}
+ ///
+ /// Получение словаря названий подсистем
+ ///
+ ///
+ [HttpGet("names")]
+ [ProducesResponseType(typeof(Dictionary), (int)System.Net.HttpStatusCode.OK)]
+ public IActionResult GetSubsystemsNames()
+ {
+ return Ok(subsystemNames);
+ }
+
protected async Task UserHasAccesToWellAsync(int idWell, CancellationToken token)
{
var idCompany = User.GetCompanyId();