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

lixiaojun

2023-03-21 b9eeada22b47fe28383052810e795619b8c1f7f9

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

 Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs

@@ -380,9 +380,19 @@
                        }
                        else
                        {//原水反馈 , 用曲线计算, 频率偏低, 人为增加0.5HZ
                            open_pump.Frequency = open_pump.Frequency + 0.5;
                            if (open_pump.Frequency < 49.5)
                            {
                                open_pump.Speed = Math.Round
                                    (open_pump.Speed * (open_pump.Frequency + 0.5) / (open_pump.Frequency),0);
                                open_pump.Frequency = open_pump.Frequency + 0.5;
                            }

                            if (open_pump.Frequency > 50)
                            {
                                open_pump.Frequency = 50;
                               
                            }
                                
                        }
                    }
                }
@@ -393,7 +403,12 @@
                {//原水反馈 , 用曲线计算, 频率偏低, 人为增加0.5HZ
                    if (x.Frequency > 10)
                    {
                        x.Frequency = x.Frequency + 0.5;//
                        if (x.Frequency < 49.5)
                        {
                            x.Speed = Math.Round
                                (x.Speed * (x.Frequency + 0.5) / (x.Frequency), 0);
                            x.Frequency = x.Frequency + 0.5;
                        } 
                    }
                    if (x.Frequency > 50)
                        x.Frequency = 50;

 Application/IStation.Application.OpenApi/test/report/helper/XmlHelper.cs

@@ -83,7 +83,7 @@
        /// <summary>
        /// 保存对象到xml文件中
        /// </summary>
        /// <typeparam name="T">FX</typeparam>
        /// <typeparam name="T"></typeparam>
        /// <param name="fileName"></param>
        /// <param name="t"></param>
        public static void SaveObjectXmlFile<T>(string fileName, T t) where T : class