Выставление

AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanTFOrientation.cs

@@ -8,75 +8,75 @@ namespace AsbCloudDb.Model.ProcessMaps;
 [Table("t_process_map_plan_tf_orientation"), Comment("Выставление")]
 public class ProcessMapPlanTFOrientation : ProcessMapPlanBase
 {
-    [Column("plan_tf"), Comment("План TF, град")]
+    [Column("tf_setpoint"), Comment("Задание TF, град.")]
     [Range(0.0, 360.0)]
     [Required]
-    public double planTF { get; set; }
+    public double TFSetpoint { get; set; }
 
-    [Column("spring"), Comment("Пружина, град ")]
+    [Column("spring"), Comment("Пружина, град.")]
     [Range(0.0, 10000.0)]
     [Required]
     public double Spring { get; set; }
 
-    [Column("max_pressure"), Comment("Максимальное давление, атм")]
+    [Column("pressure_max"), Comment("Максимальное давление, атм.")]
     [Range(0.0, 400.0)]
     [Required]
-    public double MaxPressure { get; set; }
+    public double PressureMax { get; set; }
 
     [Column("differential_pressure"), Comment("Перепад давления, атм.")]
     [Range(0.0, 60.0)]
     [Required]
     public double DifferentialPressure { get; set; }
 
-    [Column("setpoints_tight"), Comment("Уставки, т., затяжка")]
+    [Column("tight"), Comment("Затяжка, т.")]
     [Range(0.0, 20.0)]
     [Required]
-    public double SetpointsTight { get; set; }
+    public double Tight { get; set; }
 
-    [Column("setpoints_slacking_off"), Comment("Уставки, т., посадка")]
+    [Column("slacking_off"), Comment("Посадка, т.")]
     [Range(0.0, 20.0)]
     [Required]
-    public double SetpointsSlackingOff { get; set; }
+    public double SlackingOff { get; set; }
 
-    [Column("max_torque"), Comment("Максимально допустимый момент, кН*м.")]
+    [Column("torque_max"), Comment("Максимально допустимый момент, кН*м.")]
     [Range(0.0, 35.0)]
     [Required]
-    public double MaxTorque { get; set; }
+    public double TorqueMax { get; set; }
 
-    [Column("reaming1_number_of_repetitions"), Comment("Проработка 1, Количество расхаживаний, шт")]
+    [Column("repetitions_count"), Comment("Количество расхаживаний, шт.")]
     [Range(0.0, 99.0)]
     [Required]
-    public double Reaming1NumberOfRepetitions { get; set; }
+    public int RepetitionsCount { get; set; }
 
-    [Column("reaming1_rop_up"), Comment("Проработка 1, Скорость, м/ч., Вверх")]
+    [Column("rop_up"), Comment("Скорость вверх, м/ч.")]
     [Range(0.0, 999.0)]
     [Required]
-    public double Reaming1ROPUp { get; set; }
+    public double RopUp { get; set; }
 
-    [Column("reaming1_rop_down"), Comment("Проработка 1, Скорость, м/ч., Вниз")]
+    [Column("rop_down"), Comment("Скорость вниз, м/ч.")]
     [Range(0.0, 999.0)]
     [Required]
-    public double Reaming1ROPDown { get; set; }
+    public double RopDown { get; set; }
 
-    [Column("reaming1_flow_rate_up"), Comment("Проработка 1, Расход, л/с., Вверх")]
+    [Column("flow_rate_up"), Comment("Расход вверх, л/с.")]
     [Range(0.0, 100.0)]
     [Required]
-    public double Reaming1FlowRateUp { get; set; }
+    public double FlowRateUp { get; set; }
 
-    [Column("reaming1_flow_rate_down"), Comment("Проработка 1, Расход, л/с., Вниз")]
+    [Column("flow_rate_down"), Comment("Расход вниз, л/с.")]
     [Range(0.0, 100.0)]
     [Required]
-    public double Reaming1FlowRateDown { get; set; }
+    public double FlowRateDown { get; set; }
 
-    [Column("reaming1_interval"), Comment("Проработка 1, Интервал расхаживания, м.")]
+    [Column("interval"), Comment("Интервал расхаживания, м.")]
     [Range(0.0, 30.0)]
     [Required]
-    public double Reaming1Interval { get; set; }
+    public double Interval { get; set; }
 
-    [Column("reaming1_stop_point_off_bottom"), Comment("Остановка над забоем, м.")]
+    [Column("stop_point_off_bottom"), Comment("Остановка над забоем, м.")]
     [Range(0.0, 10.0)]
     [Required]
-    public double Reaming1StopPointOffBottom { get; set; }
+    public double StopPointOffBottom { get; set; }
 
     [ForeignKey(nameof(IdPrevious))]
     public virtual ProcessMapPlanTFOrientation? Previous { get; set; }

AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanTFOrientationControllerTest.cs

@@ -29,18 +29,6 @@ public class ProcessMapPlanTFOrientationControllerTest :
         Id = 0,
         IdWellSectionType = 1,
         DifferentialPressure = 1,
-        Reaming1NumberOfRepetitions = 1,
-        Reaming1StopPointOffBottom = 1,
-        Reaming1ROPUp = 1,
-        Reaming1ROPDown = 1,
-        Reaming1Interval = 1,
-        Reaming1FlowRateUp = 1,
-        Reaming1FlowRateDown = 1,
-        SetpointsSlackingOff = 1,
-        MaxPressure = 1,
-        MaxTorque = 1,
-        planTF = 1,
-        SetpointsTight = 1,
         Spring = 1
     };
 
@@ -55,18 +43,6 @@ public class ProcessMapPlanTFOrientationControllerTest :
         IdEditor = 1,
         Creation = DateTimeOffset.UtcNow,
         DifferentialPressure = 1,
-        Reaming1NumberOfRepetitions = 1,
-        Reaming1StopPointOffBottom = 1,
-        Reaming1ROPUp = 1,
-        Reaming1ROPDown = 1,
-        Reaming1Interval = 1,
-        Reaming1FlowRateUp = 1,
-        Reaming1FlowRateDown = 1,
-        SetpointsSlackingOff = 1,
-        MaxPressure = 1,
-        MaxTorque = 1,
-        planTF = 1,
-        SetpointsTight = 1,
         Spring = 1
     };