修改 eta能效计算条件

ningshuxia

2022-11-10 299ed2097f2b0644380c1593f3be187b97614738

修改 eta能效计算条件

 Calculation/IStation.EtaCalculation4Custom/base/station/EtaAnalyCalculatorBase4Station.cs

@@ -184,7 +184,7 @@
                if (result_pump.IsHaveAnaTag(IStation.Model.EtaBasicRealRecord.InfoTag_RU))
                {
                    allPumpPowerOk = false;
                    allPumpHeadOk = false;
                   // allPumpHeadOk = false;
                    allFlowMonitorOk = false;
                }

@@ -1090,7 +1090,7 @@
                ana_result.Ea = eta;

                // æ£€æŸ¥æ•ˆçŽ‡
                if (eta > 95 || eta < 40)
                if (eta > 95 || eta < 10)
                {//有时, å¤§æµé‡æ›²çº¿éƒ¨åˆ†,是曲线不精确, é€ æˆQ H曲线不符合实际, é€ æˆæ•ˆçŽ‡è®¡ç®—出问题 
                    ana_result.PutAnalyInfo(IStation.Model.EtaSingleRealRecordPure.InfoTag_Ea, eta.ToString());
                    ana_result.AnalyStatus = IStation.Model.Eta.eAnalyStatus.Abnormal;
@@ -1313,7 +1313,7 @@
                ana_result.Ea = eta;

                // æ£€æŸ¥æ•ˆçŽ‡
                if (eta > 95 || eta < 40)
                if (eta > 95 || eta < 10)
                {//有时, å¤§æµé‡æ›²çº¿éƒ¨åˆ†,是曲线不精确, é€ æˆQ H曲线不符合实际, é€ æˆæ•ˆçŽ‡è®¡ç®—出问题 
                    ana_result.PutAnalyInfo(IStation.Model.EtaSingleRealRecordPure.InfoTag_Ea, eta.ToString());
                    ana_result.AnalyStatus = IStation.Model.Eta.eAnalyStatus.Abnormal;
@@ -1493,7 +1493,7 @@
                ana_result.Ea = eta;

                // æ£€æŸ¥æ•ˆçŽ‡
                if (eta > 95 || eta < 40)
                if (eta > 95 || eta < 10)
                {//有时, å¤§æµé‡æ›²çº¿éƒ¨åˆ†,是曲线不精确, é€ æˆQ H曲线不符合实际, é€ æˆæ•ˆçŽ‡è®¡ç®—出问题 
                    ana_result.PutAnalyInfo(IStation.Model.EtaSingleRealRecordPure.InfoTag_Ea, eta.ToString());
                    ana_result.AnalyStatus = IStation.Model.Eta.eAnalyStatus.Abnormal;
@@ -1704,7 +1704,7 @@
                ana_result.Ea = eta;

                // æ£€æŸ¥æ•ˆçŽ‡
                if (eta > 95 || eta < 40)
                if (eta > 95 || eta < 10)
                {//有时, å¤§æµé‡æ›²çº¿éƒ¨åˆ†,是曲线不精确, é€ æˆQ H曲线不符合实际, é€ æˆæ•ˆçŽ‡è®¡ç®—出问题 
                    ana_result.PutAnalyInfo(IStation.Model.EtaSingleRealRecordPure.InfoTag_Ea, eta.ToString());
                    ana_result.AnalyStatus = IStation.Model.Eta.eAnalyStatus.Abnormal;
@@ -1908,14 +1908,14 @@
            pump.Ana_eta_ok = false;

            if (total_power > 1 && pump.Ana_flow_ok && pump.Ana_head_ok && pump.Ana_power_ok)
            { 
            {

                //计算效率
                double eta = Math.Round(Model.EtaSingleRealRecordPure.Calc_Eta(averge_flow, total_head, total_power, WaterDensity, g), 1);
                ana_result.Ea = eta;

                // æ£€æŸ¥æ•ˆçŽ‡
                if (eta > 95 || eta < 40)
                if (eta > 95 || eta < 10)
                {//有时, å¤§æµé‡æ›²çº¿éƒ¨åˆ†,是曲线不精确, é€ æˆQ H曲线不符合实际, é€ æˆæ•ˆçŽ‡è®¡ç®—出问题 
                    ana_result.PutAnalyInfo(IStation.Model.EtaSingleRealRecordPure.InfoTag_Ea, eta.ToString());
                    ana_result.AnalyStatus = IStation.Model.Eta.eAnalyStatus.Abnormal;
@@ -2013,7 +2013,7 @@
                        ana_result.Ea = eta;

                        // æ£€æŸ¥æ•ˆçŽ‡
                        if (eta > 95 || eta < 40)
                        if (eta > 95 || eta < 10)
                        {//有时, å¤§æµé‡æ›²çº¿éƒ¨åˆ†,是曲线不精确, é€ æˆQ H曲线不符合实际, é€ æˆæ•ˆçŽ‡è®¡ç®—出问题 
                            ana_result.PutAnalyInfo(IStation.Model.EtaSingleRealRecordPure.InfoTag_Ea, eta.ToString());
                            ana_result.AnalyStatus = IStation.Model.Eta.eAnalyStatus.Abnormal;

 Calculation/IStation.EtaCalculation4Custom/base/station/EtaAnalyCalculator±ÃÕ¾4¶¼ÊǶÀÁ¢Á÷Á¿¼Æ_ÓÐÔËÐÐ״̬.cs

@@ -210,7 +210,7 @@

                if (result_pump.IsHaveAnaTag(IStation.Model.EtaMultiRealRecordPure.InfoTag_RU))
                {
                    allHeadMonitorOk = false;
                    //allHeadMonitorOk = false;
                    allPumpFlowStatus = Model.Eta.eAnalyStatus.Abnormal; 
                }


 Entry/IStation.WebApi.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\WorkData\IStation\IStationV4.1\Core\Service.V4.1\Entry\IStation.WebApi.Entry\bin\Release\net6.0\publish\</_PublishTargetUrl>
    <History>True|2022-11-09T13:11:04.3739799Z;True|2022-11-09T21:06:00.4538306+08:00;True|2022-11-09T20:55:34.2803958+08:00;True|2022-11-09T20:17:02.9468337+08:00;True|2022-11-09T18:07:35.3930811+08:00;True|2022-11-09T18:05:51.4828275+08:00;True|2022-11-09T16:17:12.1733545+08:00;True|2022-11-09T11:43:22.1152393+08:00;True|2022-11-04T11:18:49.1736708+08:00;False|2022-11-04T11:16:30.1928291+08:00;False|2022-11-04T11:15:20.2275455+08:00;False|2022-11-04T11:14:39.1289337+08:00;True|2022-11-04T11:04:37.8317148+08:00;True|2022-11-03T14:34:55.1009241+08:00;True|2022-11-03T14:16:29.1563357+08:00;True|2022-11-03T13:46:10.8366547+08:00;True|2022-11-03T11:48:24.5399936+08:00;True|2022-10-31T14:36:59.4971398+08:00;True|2022-10-28T13:58:42.2473049+08:00;True|2022-10-28T13:42:58.7180735+08:00;True|2022-10-28T12:56:06.9517417+08:00;True|2022-10-28T09:37:04.8336241+08:00;True|2022-10-27T16:13:52.0290129+08:00;True|2022-10-27T14:51:12.0416021+08:00;True|2022-10-27T14:46:01.8195700+08:00;True|2022-10-27T14:38:00.5077582+08:00;True|2022-10-27T14:28:16.2348825+08:00;False|2022-10-27T14:27:49.2720060+08:00;False|2022-10-27T14:27:25.1445739+08:00;True|2022-10-26T11:27:54.4483138+08:00;True|2022-10-26T11:19:37.6322046+08:00;True|2022-10-26T11:10:05.4129456+08:00;True|2022-10-25T16:33:32.7872520+08:00;True|2022-10-24T16:12:49.4291001+08:00;True|2022-10-24T16:10:25.3757944+08:00;True|2022-10-24T14:04:51.7783988+08:00;True|2022-10-21T18:51:32.0221235+08:00;True|2022-10-21T18:35:12.1463858+08:00;True|2022-10-21T09:54:19.2138550+08:00;True|2022-10-21T09:38:21.1672347+08:00;True|2022-10-19T12:04:59.9103579+08:00;True|2022-10-19T11:57:45.1000513+08:00;True|2022-10-19T11:49:03.6494799+08:00;True|2022-10-19T11:06:22.4198711+08:00;True|2022-10-18T11:17:20.1435537+08:00;True|2022-10-18T09:08:58.6802639+08:00;True|2022-10-17T16:33:12.8912333+08:00;True|2022-10-17T14:23:10.0264671+08:00;True|2022-10-17T14:16:07.3590282+08:00;True|2022-10-17T11:53:21.9425089+08:00;True|2022-10-17T11:45:51.9336429+08:00;True|2022-10-14T14:37:15.6323508+08:00;True|2022-10-11T09:01:44.5831439+08:00;True|2022-10-09T14:03:43.6568874+08:00;True|2022-10-09T11:15:56.2934983+08:00;True|2022-10-09T09:39:28.1074512+08:00;True|2022-10-08T18:45:23.9581502+08:00;True|2022-10-08T18:35:18.5574217+08:00;True|2022-10-08T16:12:04.2903137+08:00;True|2022-10-08T15:59:54.5588351+08:00;True|2022-10-08T15:55:01.2711550+08:00;True|2022-10-08T15:19:08.5487617+08:00;True|2022-10-08T15:11:55.8626990+08:00;False|2022-10-08T15:02:33.5639703+08:00;True|2022-10-08T09:23:21.6592006+08:00;True|2022-10-07T15:35:37.7532304+08:00;True|2022-10-07T15:04:51.9161653+08:00;False|2022-10-07T14:58:32.8816319+08:00;False|2022-10-07T14:54:55.4175944+08:00;False|2022-10-07T14:52:46.7215376+08:00;False|2022-10-07T14:51:14.0508027+08:00;False|2022-10-07T14:49:57.6007572+08:00;False|2022-10-07T14:48:56.6085134+08:00;False|2022-10-07T14:47:54.7931315+08:00;True|2022-09-22T13:35:52.6495568+08:00;True|2022-09-22T13:19:28.3609130+08:00;True|2022-09-22T09:45:29.7312648+08:00;True|2022-09-21T17:11:30.6881814+08:00;True|2022-09-15T16:32:44.8582766+08:00;True|2022-09-04T14:21:59.9156800+08:00;True|2022-09-03T18:27:37.0001278+08:00;True|2022-08-29T10:26:27.0532192+08:00;True|2022-08-24T13:40:25.0333335+08:00;True|2022-08-23T10:20:23.3347504+08:00;True|2022-08-19T15:24:53.5488496+08:00;False|2022-08-19T15:24:15.4430294+08:00;True|2022-08-19T11:51:17.0556654+08:00;True|2022-08-19T11:45:03.9834334+08:00;True|2022-08-19T10:56:27.1184994+08:00;True|2022-08-18T16:31:26.4673400+08:00;True|2022-08-18T10:37:50.8776926+08:00;True|2022-08-17T17:10:09.3527873+08:00;True|2022-08-17T16:04:30.4487827+08:00;True|2022-08-15T13:35:48.4976973+08:00;True|2022-08-15T13:35:34.4046702+08:00;True|2022-08-15T13:31:44.3380038+08:00;True|2022-08-15T13:07:03.2183172+08:00;True|2022-07-25T15:14:36.3659352+08:00;True|2022-07-25T15:10:01.3426246+08:00;True|2022-07-25T13:20:08.1574461+08:00;</History>
    <History>True|2022-11-09T14:12:02.6483295Z;True|2022-11-09T21:11:04.3739799+08:00;True|2022-11-09T21:06:00.4538306+08:00;True|2022-11-09T20:55:34.2803958+08:00;True|2022-11-09T20:17:02.9468337+08:00;True|2022-11-09T18:07:35.3930811+08:00;True|2022-11-09T18:05:51.4828275+08:00;True|2022-11-09T16:17:12.1733545+08:00;True|2022-11-09T11:43:22.1152393+08:00;True|2022-11-04T11:18:49.1736708+08:00;False|2022-11-04T11:16:30.1928291+08:00;False|2022-11-04T11:15:20.2275455+08:00;False|2022-11-04T11:14:39.1289337+08:00;True|2022-11-04T11:04:37.8317148+08:00;True|2022-11-03T14:34:55.1009241+08:00;True|2022-11-03T14:16:29.1563357+08:00;True|2022-11-03T13:46:10.8366547+08:00;True|2022-11-03T11:48:24.5399936+08:00;True|2022-10-31T14:36:59.4971398+08:00;True|2022-10-28T13:58:42.2473049+08:00;True|2022-10-28T13:42:58.7180735+08:00;True|2022-10-28T12:56:06.9517417+08:00;True|2022-10-28T09:37:04.8336241+08:00;True|2022-10-27T16:13:52.0290129+08:00;True|2022-10-27T14:51:12.0416021+08:00;True|2022-10-27T14:46:01.8195700+08:00;True|2022-10-27T14:38:00.5077582+08:00;True|2022-10-27T14:28:16.2348825+08:00;False|2022-10-27T14:27:49.2720060+08:00;False|2022-10-27T14:27:25.1445739+08:00;True|2022-10-26T11:27:54.4483138+08:00;True|2022-10-26T11:19:37.6322046+08:00;True|2022-10-26T11:10:05.4129456+08:00;True|2022-10-25T16:33:32.7872520+08:00;True|2022-10-24T16:12:49.4291001+08:00;True|2022-10-24T16:10:25.3757944+08:00;True|2022-10-24T14:04:51.7783988+08:00;True|2022-10-21T18:51:32.0221235+08:00;True|2022-10-21T18:35:12.1463858+08:00;True|2022-10-21T09:54:19.2138550+08:00;True|2022-10-21T09:38:21.1672347+08:00;True|2022-10-19T12:04:59.9103579+08:00;True|2022-10-19T11:57:45.1000513+08:00;True|2022-10-19T11:49:03.6494799+08:00;True|2022-10-19T11:06:22.4198711+08:00;True|2022-10-18T11:17:20.1435537+08:00;True|2022-10-18T09:08:58.6802639+08:00;True|2022-10-17T16:33:12.8912333+08:00;True|2022-10-17T14:23:10.0264671+08:00;True|2022-10-17T14:16:07.3590282+08:00;True|2022-10-17T11:53:21.9425089+08:00;True|2022-10-17T11:45:51.9336429+08:00;True|2022-10-14T14:37:15.6323508+08:00;True|2022-10-11T09:01:44.5831439+08:00;True|2022-10-09T14:03:43.6568874+08:00;True|2022-10-09T11:15:56.2934983+08:00;True|2022-10-09T09:39:28.1074512+08:00;True|2022-10-08T18:45:23.9581502+08:00;True|2022-10-08T18:35:18.5574217+08:00;True|2022-10-08T16:12:04.2903137+08:00;True|2022-10-08T15:59:54.5588351+08:00;True|2022-10-08T15:55:01.2711550+08:00;True|2022-10-08T15:19:08.5487617+08:00;True|2022-10-08T15:11:55.8626990+08:00;False|2022-10-08T15:02:33.5639703+08:00;True|2022-10-08T09:23:21.6592006+08:00;True|2022-10-07T15:35:37.7532304+08:00;True|2022-10-07T15:04:51.9161653+08:00;False|2022-10-07T14:58:32.8816319+08:00;False|2022-10-07T14:54:55.4175944+08:00;False|2022-10-07T14:52:46.7215376+08:00;False|2022-10-07T14:51:14.0508027+08:00;False|2022-10-07T14:49:57.6007572+08:00;False|2022-10-07T14:48:56.6085134+08:00;False|2022-10-07T14:47:54.7931315+08:00;True|2022-09-22T13:35:52.6495568+08:00;True|2022-09-22T13:19:28.3609130+08:00;True|2022-09-22T09:45:29.7312648+08:00;True|2022-09-21T17:11:30.6881814+08:00;True|2022-09-15T16:32:44.8582766+08:00;True|2022-09-04T14:21:59.9156800+08:00;True|2022-09-03T18:27:37.0001278+08:00;True|2022-08-29T10:26:27.0532192+08:00;True|2022-08-24T13:40:25.0333335+08:00;True|2022-08-23T10:20:23.3347504+08:00;True|2022-08-19T15:24:53.5488496+08:00;False|2022-08-19T15:24:15.4430294+08:00;True|2022-08-19T11:51:17.0556654+08:00;True|2022-08-19T11:45:03.9834334+08:00;True|2022-08-19T10:56:27.1184994+08:00;True|2022-08-18T16:31:26.4673400+08:00;True|2022-08-18T10:37:50.8776926+08:00;True|2022-08-17T17:10:09.3527873+08:00;True|2022-08-17T16:04:30.4487827+08:00;True|2022-08-15T13:35:48.4976973+08:00;True|2022-08-15T13:35:34.4046702+08:00;True|2022-08-15T13:31:44.3380038+08:00;True|2022-08-15T13:07:03.2183172+08:00;True|2022-07-25T15:14:36.3659352+08:00;True|2022-07-25T15:10:01.3426246+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

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

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2022-11-09T10:11:19.2987148Z;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-10T09:11:34.6215190Z;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>