diff --git a/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs b/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs index 5ecb4932..ed81c0ef 100644 --- a/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs +++ b/AsbCloudApp/Data/SAUB/SetpointsRequestDto.cs @@ -39,7 +39,8 @@ namespace AsbCloudApp.Data.SAUB /// время в секундах актуальности этого запроса /// [Required] - public int ObsolescenceSec { get; set; } + [Range(10 * 60, 4 * 60 * 60)] + public int ObsolescenceSec { get; set; } = 10 * 60; /// /// набор уставок: {"название переменной панели"; "рекомендуемое значение"} diff --git a/AsbCloudWebApi/Controllers/SAUB/SetpointsController.cs b/AsbCloudWebApi/Controllers/SAUB/SetpointsController.cs index 996c8298..59711fa3 100644 --- a/AsbCloudWebApi/Controllers/SAUB/SetpointsController.cs +++ b/AsbCloudWebApi/Controllers/SAUB/SetpointsController.cs @@ -18,8 +18,6 @@ namespace AsbCloudWebApi.Controllers.SAUB { private readonly ISetpointsService setpointsService; private readonly IWellService wellService; - private const int ObsolescenceSecMin = 30; - private const int ObsolescenceSecMax = 6 * 60 * 60; public SetpointsController(ISetpointsService setpointsService, IWellService wellService) { @@ -68,11 +66,6 @@ namespace AsbCloudWebApi.Controllers.SAUB setpoints.IdWell = idWell; setpoints.IdState = 1; - if (setpoints is null - || setpoints.ObsolescenceSec > ObsolescenceSecMax - || setpoints.ObsolescenceSec < ObsolescenceSecMin) - return this.ValidationBadRequest(nameof(setpoints.ObsolescenceSec), "Wrong ObsolescenceSec"); - if (!setpoints.Setpoints.Any()) return this.ValidationBadRequest(nameof(setpoints.Setpoints), "Wrong setpoints count");