删除复制文件

ningshuxia

2025-04-01 f2feed624a3186e020bc0283b41e36eb89164a6c

 01-api/Service/IStation.Service/07-helper/01-analysis/AnalysisHelper.cs

@@ -11,7 +11,7 @@
        private readonly decimal _frequency_def = 50m;
        private readonly decimal _frequency_min = 25m;
        private readonly decimal _frequency_max = 50m;
        private readonly decimal _frequency_space = 0.1m;//频率间隔  
        private readonly decimal _frequency_space = 0.2m;//频率间隔  
        private readonly decimal _head_space = 0.1m;//扬程间隔

        private readonly DAL.SQLite.AnalysisPump _dal_analysis_pump = new();
@@ -25,7 +25,7 @@
        /// <param name="pumps"></param>
        /// <param name="analysis_factor_list"></param>
        /// <exception cref="Exception"></exception>
        public void AnalysisPump(List<Model.Pump> pumps, List<Model.AnalysisFactor> analysis_factor_list=null)
        public void AnalysisPump(List<Model.Pump> pumps, List<Model.AnalysisFactor> analysis_factor_list = null)
        {
            InsertLog("开始分析泵组合");
            if (pumps == null || pumps.Count < 1)
@@ -49,7 +49,7 @@
                }
                else
                {
                    var hz_head_dev_dict = analysis_factor_list?.Where(x=>x.Flag==pump.Flag)?.ToDictionary(x => x.Hz, y => y.HeadDeviation);
                    var hz_head_dev_dict = analysis_factor_list?.Where(x => x.Flag == pump.Flag)?.ToDictionary(x => x.Hz, y => y.HeadDeviation);
                    ana_pump_fre_item_list = GetAnaPumpFreItems(_frequency_def, _frequency_min, _frequency_max, _frequency_space, pump, hz_head_dev_dict);
                }

@@ -112,7 +112,7 @@
             decimal fre_max,
             decimal fre_space,
            Model.Pump pump,
            Dictionary<double,double?> hz_head_dev_dict=null)
            Dictionary<double, double?> hz_head_dev_dict = null)
        {
            if (pump == null)
            {
@@ -127,10 +127,10 @@
            var list = new List<AnaPumpFreItem>();
            for (decimal fre = fre_max; fre >= fre_min; fre -= fre_space)
            {
                var hz= (double)Math.Round(fre, 1); 
                var hz0=Math.Round(hz, 0); 
        
                Curve.CurveExpress qh = pump.CurveQH, qp= pump.CurveQP;
                var hz = (double)Math.Round(fre, 1);
                var hz0 = Math.Round(hz, 0);

                Curve.CurveExpress qh = pump.CurveQH, qp = pump.CurveQP;
                if (exist_dict)
                {
                    if (hz_head_dev_dict.ContainsKey(hz0))