eta 修改业务单位能耗计算方法，用了平均权重计算

ningshuxia

2022-11-17 112f6bf8aa6c76b055d19627ccef21fb59515436

eta  修改业务单位能耗计算方法，用了平均权重计算

 Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic - ¸´ÖÆ.cs

ÎļþÒÑɾ³ý

 Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic.cs

@@ -86,6 +86,8 @@
            current_logic_ana.ChildLogicBundleList = new List<Calculation.Eta.Model.LogicAnaInfoBundle>();
            List<IStation.Model.EtaBasicRealRecord> child_ana_records = new List<Model.EtaBasicRealRecord>();//只含一级,不含下一集

            double uwpaSum = 0;
            double qSum = 0;
            IStation.Model.EtaLogicRealRecordPure current_result = new Model.EtaLogicRealRecordPure();
            foreach (var child in context_item.Children)
            {
@@ -106,6 +108,10 @@
                            current_result.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Station, station_ana.StationID.ToString());
                        }
                    }


                    uwpaSum += (station_ana.AnaResult.Qa ?? 0) * (station_ana.AnaResult.UWPa ?? 0);
                    qSum += station_ana.AnaResult.Qa ?? 0;
                }
                else
                {
@@ -113,6 +119,10 @@
                    current_logic_ana.ChildLogicBundleList.Add(child_logic_ana);
                    current_result.PutLogicAnalyInfo(child_logic_ana.AnaResult?.AnalyInfo);
                    child_ana_records.Add(child_logic_ana.AnaResult);

                    var q = GetQSumValue(child_logic_ana);
                    qSum += q;
                    uwpaSum += q * child_logic_ana.AnaResult.UWPa ?? 0;
                }
            }

@@ -163,6 +173,7 @@
                            {
                                eta += item.Ea.Value * (item.Qa.Value * item.Ha.Value / qh_total);//叠加扬程换算
                            }

                            // eta += item.Ea.Value * item.Qa.Value / qa_total; æ—§ç®—法
                        }
                    }
@@ -175,33 +186,10 @@
                            wpa += item.WPa.Value * item.Qa.Value / qa_total;
                        }
                    }

                     
                    double uwpa = 0;

                    if (current_result.Pa != null)
                    {
                        if (!child_ana_records.Exists(x => !x.Ha.HasValue))
                        {
                            var haTatol = child_ana_records.Sum(x => x.Ha.Value);
                            uwpa = current_result.Pa.Value / qa_total / haTatol * 1000;
                        }
                        else
                        {
                            current_result.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Ha, null);
                        }
                    }
                    else
                    {
                        current_result.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Pa, null);
                    }

                    /* foreach (var item in child_ana_records)
                     {
                         if (item.UWPa.HasValue && item.Qa.HasValue && item.UWPa.Value > 0 && item.Qa.Value > 10)
                         {
                             uwpa += item.UWPa.Value * item.Qa.Value / qa_total;
                         }
                     }*/
                    uwpa = uwpaSum / qSum;
                     

                    current_result.Ea = Math.Round(eta, 1);
                    current_result.WPa = Math.Round(wpa, 2);
@@ -231,5 +219,55 @@
            return _allLogicRecordList;
        }

        private double GetUwpaSumValue(Calculation.Eta.Model.LogicAnaInfoBundle eta)
        {
            double uwpaSum = 0;
            var childStationBundleList = eta.ChildStationBundleList;
            if (childStationBundleList != null && childStationBundleList.Count > 0)
            {
                foreach (var item in childStationBundleList)
                {
                    var reulst = item.AnaResult;
                    uwpaSum += (reulst.UWPa ?? 0) * (reulst.Qa ?? 0);
                }
            }

            if (eta.ChildLogicBundleList != null && eta.ChildLogicBundleList.Count > 0)
            {
                foreach (var logic in eta.ChildLogicBundleList)
                {
                    uwpaSum += GetUwpaSumValue(logic);
                }
            }

            return uwpaSum;
        }



        private double GetQSumValue(Calculation.Eta.Model.LogicAnaInfoBundle eta)
        {
            double qSum = 0;
            var childStationBundleList = eta.ChildStationBundleList;
            if (childStationBundleList != null && childStationBundleList.Count > 0)
            {
                foreach (var item in childStationBundleList)
                {
                    var reulst = item.AnaResult;
                    qSum += reulst.Qa ?? 0;
                }
            }

            if (eta.ChildLogicBundleList != null && eta.ChildLogicBundleList.Count > 0)
            {
                foreach (var logic in eta.ChildLogicBundleList)
                {
                    qSum += GetUwpaSumValue(logic);
                }
            }

            return qSum;
        }

    }
}

 Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4LogicÒ»¸ö±ÃÕ¾.cs

@@ -55,7 +55,8 @@

            var onlyStationAnaResult = allStationAnaResults.Find(x => x.ObjectID == onlyStationId);
            anaResult.Qa = onlyStationAnaResult?.Qa;
            anaResult.Ha = onlyStationAnaResult?.Ha;
            // anaResult.Ha = onlyStationAnaResult?.Ha;
            anaResult.Ha = allStationAnaResults.Where(x => x.Ha.HasValue).Sum(x => x.Ha);
            anaResult.Pa = allStationAnaResults.Where(x => x.Pa.HasValue).Sum(x => x.Pa.Value);

            var validStationAnaResults = allStationAnaResults.Where(x => x.Qa.HasValue && x.Qa > 10).ToList();
@@ -99,33 +100,12 @@
                    }
                }


                double uwpa = 0;
                var uwpaSum = validStationAnaResults.Sum(x => (x.UWPa ?? 0) * (x.Qa ?? 0));
                uwpa = uwpaSum / qaTotal;


                if (anaResult.Pa != null)
                {
                    if (!validStationAnaResults.Exists(x => !x.Ha.HasValue))
                    {
                        var haTatol = validStationAnaResults.Sum(x => x.Ha.Value);
                        uwpa = anaResult.Pa.Value / qaTotal / haTatol * 1000;
                    }
                    else
                    {
                        anaResult.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Ha, null);
                    }
                }
                else
                {
                    anaResult.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Pa, null);
                }

                /*foreach (var item in validStationAnaResults)
                {
                    if (item.UWPa.HasValue && item.UWPa.Value > 0)
                    {
                        uwpa += item.UWPa.Value * item.Qa.Value / qaTotal;
                    }
                }*/ //旧代码

                anaResult.Ea = Math.Round(eta, 1);
                anaResult.WPa = Math.Round(wpa, 2);

 Calculation/IStation.EtaCalculation4Custom/shys/logic/EtaAnalyCalculator4Logic½ðÔóϵͳ.cs

@@ -68,7 +68,8 @@

            anaResult.Qa = jzqsLogicResult.Qa;
            anaResult.Pa = jzqsLogicResult.Pa + jzqsResult.Pa;
            anaResult.Ha = jzqsLogicResult.Ha;
            //anaResult.Ha = jzqsLogicResult.Ha;
            anaResult.Ha = jzqsLogicResult.Ha??0 + jzqsResult.Ha??0;


            double qaTotal = child_ana_records.Where(x => x.Ea.HasValue && x.Ea.Value > 10).Sum(x => x.Qa.Value);
@@ -91,26 +92,17 @@
                        wpa += item.WPa.Value * item.Qa.Value / qaTotal;
                    }
                }

                 
                double uwpa = 0;

                var jzltgLogicChildResult = this.jzltgLogicAnaInfoBundle.ChildStationBundleList.Select(x => x.AnaResult);
                var uwpaSum = jzltgLogicChildResult.Sum(x => (x.UWPa ?? 0) * (x.Qa ?? 0));
                uwpaSum += (jzqsResult.UWPa ?? 0) * (jzqsResult.Qa ?? 0);

                if (anaResult.Pa != null)
                {
                    if (!child_ana_records.Exists(x => !x.Ha.HasValue))
                    {
                        var haTatol = child_ana_records.Sum(x => x.Ha.Value);
                        uwpa = anaResult.Pa.Value / qaTotal / haTatol * 1000;
                    }
                    else
                    {
                        anaResult.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Ha, null);
                    }
                }
                else
                {
                    anaResult.PutAnalyInfo(Model.EtaSingleRealRecordPure.InfoTag_Pa, null);
                }
                var qSum = jzltgLogicChildResult.Sum(x => x.Qa ?? 0);
                qSum += jzqsResult.Qa ?? 0;

                uwpa = uwpaSum / qSum;


                anaResult.Ea = Math.Round(eta, 1);

 Calculation/IStation.EtaCalculation4Custom/shys/station/EtaAnalyCalculator4³¤Ð˵ºÊäË®±Ã·¿.cs

@@ -133,7 +133,7 @@
        #endregion


 





 TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2022-11-14T13:14:00.6444145Z;True|2022-11-14T21:10:33.2903857+08:00;True|2022-11-14T20:32:31.9551302+08:00;True|2022-11-14T20:21:14.0918673+08:00;True|2022-11-14T20:13:48.5183182+08:00;True|2022-11-14T19:07:03.2176636+08:00;True|2022-11-14T18:25:20.5148072+08:00;True|2022-11-14T17:37:25.3920782+08:00;True|2022-11-14T11:28:31.8550819+08:00;True|2022-11-14T09:20:45.3632848+08:00;True|2022-11-14T09:12:57.7773033+08:00;True|2022-11-11T16:02:41.8023925+08:00;True|2022-11-11T13:11:32.1354860+08:00;False|2022-11-11T13:10:57.8984858+08:00;False|2022-11-11T13:10:35.7974529+08:00;True|2022-11-10T17:11:34.6215190+08:00;True|2022-11-09T22:14:08.4689242+08:00;True|2022-11-09T18:11:19.2987148+08:00;True|2022-11-08T14:50:42.1914017+08:00;True|2022-10-31T15:35:55.6311717+08:00;True|2022-10-31T15:32:50.5265543+08:00;True|2022-10-31T14:30:51.7199756+08:00;True|2022-10-31T13:52:26.4575268+08:00;True|2022-10-26T12:02:14.4228296+08:00;True|2022-10-25T16:32:34.6113737+08:00;True|2022-10-25T16:29:35.7980293+08:00;True|2022-10-24T14:01:39.4175627+08:00;True|2022-10-21T18:55:37.1960388+08:00;True|2022-10-21T18:37:47.3142064+08:00;True|2022-10-19T11:11:19.9748484+08:00;True|2022-10-18T14:53:08.5305852+08:00;True|2022-10-18T09:19:14.0442732+08:00;True|2022-10-17T11:35:09.6040323+08:00;True|2022-10-17T10:52:29.3004702+08:00;True|2022-10-17T10:34:49.0817739+08:00;True|2022-10-17T09:35:57.5450395+08:00;True|2022-10-17T09:19:39.4916147+08:00;True|2022-10-14T14:45:04.5959774+08:00;True|2022-10-08T13:42:45.7291582+08:00;True|2022-10-08T13:31:33.0167880+08:00;True|2022-10-08T11:09:08.8028943+08:00;True|2022-10-08T10:04:57.3573208+08:00;True|2022-09-28T16:12:17.1471133+08:00;True|2022-09-28T15:11:17.3924597+08:00;True|2022-09-28T15:07:24.1542712+08:00;True|2022-09-28T15:01:05.9450589+08:00;True|2022-09-28T13:14:26.7038834+08:00;True|2022-09-27T16:32:29.0286484+08:00;True|2022-09-27T14:15:56.0426476+08:00;True|2022-09-26T16:16:45.3404775+08:00;True|2022-09-26T15:50:09.2992619+08:00;True|2022-09-26T15:47:20.6418528+08:00;True|2022-09-25T16:30:19.2053341+08:00;True|2022-09-22T17:08:02.6481758+08:00;True|2022-09-22T10:24:35.0635421+08:00;True|2022-09-16T15:41:38.0594228+08:00;True|2022-09-16T15:23:44.1558393+08:00;True|2022-07-01T21:10:56.8914203+08:00;True|2022-07-01T15:16:47.4260591+08:00;True|2022-06-29T09:41:10.5136306+08:00;True|2022-06-08T10:45:13.3564100+08:00;True|2022-06-08T10:41:35.1533091+08:00;True|2022-06-06T14:07:28.9893476+08:00;True|2022-06-01T09:15:01.3097804+08:00;True|2022-05-29T10:18:06.7001434+08:00;</History>
    <History>True|2022-11-17T07:00:50.2292158Z;True|2022-11-14T21:14:00.6444145+08:00;True|2022-11-14T21:10:33.2903857+08:00;True|2022-11-14T20:32:31.9551302+08:00;True|2022-11-14T20:21:14.0918673+08:00;True|2022-11-14T20:13:48.5183182+08:00;True|2022-11-14T19:07:03.2176636+08:00;True|2022-11-14T18:25:20.5148072+08:00;True|2022-11-14T17:37:25.3920782+08:00;True|2022-11-14T11:28:31.8550819+08:00;True|2022-11-14T09:20:45.3632848+08:00;True|2022-11-14T09:12:57.7773033+08:00;True|2022-11-11T16:02:41.8023925+08:00;True|2022-11-11T13:11:32.1354860+08:00;False|2022-11-11T13:10:57.8984858+08:00;False|2022-11-11T13:10:35.7974529+08:00;True|2022-11-10T17:11:34.6215190+08:00;True|2022-11-09T22:14:08.4689242+08:00;True|2022-11-09T18:11:19.2987148+08:00;True|2022-11-08T14:50:42.1914017+08:00;True|2022-10-31T15:35:55.6311717+08:00;True|2022-10-31T15:32:50.5265543+08:00;True|2022-10-31T14:30:51.7199756+08:00;True|2022-10-31T13:52:26.4575268+08:00;True|2022-10-26T12:02:14.4228296+08:00;True|2022-10-25T16:32:34.6113737+08:00;True|2022-10-25T16:29:35.7980293+08:00;True|2022-10-24T14:01:39.4175627+08:00;True|2022-10-21T18:55:37.1960388+08:00;True|2022-10-21T18:37:47.3142064+08:00;True|2022-10-19T11:11:19.9748484+08:00;True|2022-10-18T14:53:08.5305852+08:00;True|2022-10-18T09:19:14.0442732+08:00;True|2022-10-17T11:35:09.6040323+08:00;True|2022-10-17T10:52:29.3004702+08:00;True|2022-10-17T10:34:49.0817739+08:00;True|2022-10-17T09:35:57.5450395+08:00;True|2022-10-17T09:19:39.4916147+08:00;True|2022-10-14T14:45:04.5959774+08:00;True|2022-10-08T13:42:45.7291582+08:00;True|2022-10-08T13:31:33.0167880+08:00;True|2022-10-08T11:09:08.8028943+08:00;True|2022-10-08T10:04:57.3573208+08:00;True|2022-09-28T16:12:17.1471133+08:00;True|2022-09-28T15:11:17.3924597+08:00;True|2022-09-28T15:07:24.1542712+08:00;True|2022-09-28T15:01:05.9450589+08:00;True|2022-09-28T13:14:26.7038834+08:00;True|2022-09-27T16:32:29.0286484+08:00;True|2022-09-27T14:15:56.0426476+08:00;True|2022-09-26T16:16:45.3404775+08:00;True|2022-09-26T15:50:09.2992619+08:00;True|2022-09-26T15:47:20.6418528+08:00;True|2022-09-25T16:30:19.2053341+08:00;True|2022-09-22T17:08:02.6481758+08:00;True|2022-09-22T10:24:35.0635421+08:00;True|2022-09-16T15:41:38.0594228+08:00;True|2022-09-16T15:23:44.1558393+08:00;True|2022-07-01T21:10:56.8914203+08:00;True|2022-07-01T15:16:47.4260591+08:00;True|2022-06-29T09:41:10.5136306+08:00;True|2022-06-08T10:45:13.3564100+08:00;True|2022-06-08T10:41:35.1533091+08:00;True|2022-06-06T14:07:28.9893476+08:00;True|2022-06-01T09:15:01.3097804+08:00;True|2022-05-29T10:18:06.7001434+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>