Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

lixiaojun

2023-04-10 2e0b2085526c866fcf983dff722b4e6c7e7cfbf0

Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

# Conflicts:
#	Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs

 Application/IStation.Application.OpenApi/shys/dispatch/dto/DispatchAnaSchemeItemOutput.cs

@@ -65,6 +65,18 @@
        /// 转速 r/min
        /// </summary>
        public double Speed { get; set; }


        /// <summary>
        /// 频率 hz
        /// </summary>
        public double CurrentFrequency { get; set; }

        /// <summary>
        /// 转速 r/min
        /// </summary>
        public double CurrentSpeed { get; set; }
 
    }



 Application/IStation.Application.OpenApi/shys/dispatch/dto/DispatchAnaSchemeOutput.cs

@@ -1,4 +1,6 @@
using System;
using Microsoft.AspNetCore.Components.Forms;
using Org.BouncyCastle.Bcpg.OpenPgp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -51,5 +53,61 @@
        /// </summary>
        public List<DispatchAnaSchemeItemOutput> Pumps { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public DispatchAnaCurrentOutput Scheme { get; set; }



    }

    /// <summary>
    /// 
    /// </summary>
    public class DispatchAnaCurrentOutput 
    {
        /// <summary>
        /// 
        /// </summary> 
        public List<PipeParaOutput> Pipes { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public int  MiddleValveStatus { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public class PipeParaOutput
        {
            /// <summary>
            /// 
            /// </summary>
            public string Name { get; set; }

            /// <summary>
            /// 流量 m³/h (三高给的数据)
            /// </summary>
            public double TargetFlow { get; set; }

            /// <summary>
            /// 压力 MPa (三高给的数据)
            /// </summary>
            public double TargetPressure { get; set; }

            /// <summary>
            /// 流量 m³/h (实时)
            /// </summary>
            public double CurrentFlow { get; set; }

            /// <summary>
            /// 压力 MPa(实时)
            /// </summary>
            public double CurrentPressure { get; set; }
        }


    }
    
}