From 990a641f72d8ae753d5de70de97ccf7c6f5a90ff Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期六, 08 十月 2022 15:07:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Calculation/IStation.EtaCalculation4Custom/smi/AnalyCalculatorSMI.cs | 9 ++--
Calculation/IStation.EtaCalculation4Custom/smi/station/EtaAnalyCalculator4南市水厂.cs | 84 ++++++++++++++++++++++++++++++++++++------
TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs | 22 ++--------
4 files changed, 82 insertions(+), 35 deletions(-)
diff --git a/Calculation/IStation.EtaCalculation4Custom/smi/AnalyCalculatorSMI.cs b/Calculation/IStation.EtaCalculation4Custom/smi/AnalyCalculatorSMI.cs
index f130120..200b1a6 100644
--- a/Calculation/IStation.EtaCalculation4Custom/smi/AnalyCalculatorSMI.cs
+++ b/Calculation/IStation.EtaCalculation4Custom/smi/AnalyCalculatorSMI.cs
@@ -53,6 +53,8 @@
if (calalcor == null)
continue;
+
+
string error_info = null;
if (!calalcor.Calculate(station_context, out error_info))
{
@@ -182,13 +184,10 @@
}
if (StationID == 1564533764212789248)
- {
+ {
return new IStation.EtaCalculation.SMI.Station.EtaAnalyCalculator4鍗楀競姘村巶();
}
-
-
-
-
+
return null;
}
diff --git "a/Calculation/IStation.EtaCalculation4Custom/smi/station/EtaAnalyCalculator4\345\215\227\345\270\202\346\260\264\345\216\202.cs" "b/Calculation/IStation.EtaCalculation4Custom/smi/station/EtaAnalyCalculator4\345\215\227\345\270\202\346\260\264\345\216\202.cs"
index 1a53786..45af2d9 100644
--- "a/Calculation/IStation.EtaCalculation4Custom/smi/station/EtaAnalyCalculator4\345\215\227\345\270\202\346\260\264\345\216\202.cs"
+++ "b/Calculation/IStation.EtaCalculation4Custom/smi/station/EtaAnalyCalculator4\345\215\227\345\270\202\346\260\264\345\216\202.cs"
@@ -8,7 +8,7 @@
namespace IStation.EtaCalculation.SMI.Station
{
/// <summary>
- /// 鎵�鏈夋车锛岄兘鏄彉棰戞车锛� 涓旈兘鏈夌嫭绔嬬殑娴侀噺璁� , 鏈� 鍑哄彛鍘嬪姏璁�, 鏈夊紑鏈虹姸鎬佹祴鐐� ,鏈� 鐙珛 杩涘彛鍘嬪姏
+ /// 鎵�鏈夋车 涓旈兘鏈夌嫭绔嬬殑娴侀噺璁� , 鏈� 鍑哄彛鍘嬪姏璁�, 鏈夊紑鏈虹姸鎬佹祴鐐� , 鏈夎繘鍙ｅ帇鍔�
/// </summary>
public class EtaAnalyCalculator4鍗楀競姘村巶 : EtaAnalyCalculator娉电珯4閮芥槸鐙珛娴侀噺璁鏈夎繍琛岀姸鎬�, IEtaStationAnalyCalculator
{
@@ -30,12 +30,22 @@
//鍒濆鍖栨満娉�
if (!InitialPumpList(context, out error_info))
- {
+ {
return false;
}
//鏍稿績鍒嗘瀽
- return base.CalculateCore(context, out error_info);
+ var stat8x = base.CalculateCore(context, out error_info);
+ if (stat8x == false)
+ {
+ return false;
+ }
+
+
+ //娣诲姞瀛愮璺垎鏋愮粨鏋�
+ //涓夋潯绠¤矾 1578576583663423488(鍗楁眹1) 123 1578576400481390592 鍗楁眹2鍙风 456 1578576274077650944 宸濇矙绠� (78910)
+ var _sub_pipe_id = new long[] { 1578576583663423488, 1578576400481390592, 1578576274077650944 };//瀛愮璺疘D
+ return AddSubPipeAnaList(_sub_pipe_id);
}
@@ -49,19 +59,24 @@
/// <returns></returns>
protected override bool InitialPumpList(Model.EtaStationAnalyContextItem context, out string error_info)
{
- var monitor_id_pump_flow_array = new long[] { 1572097492756074496, 1572097521822601216, 1572097552336162816, 1572097581801148416, 1572097609970094080, 1572097630534766592, 1572098927287734272, 1572098965086801920, 1572098986196733952, 1572099000868409344 };// 娴侀噺璁�
- var monitor_id_run_status_array = new long[] { 1572097492793823232, 1572097521860349952, 1572097552361328640, 1572097581826314240, 1572097610007842816, 1572097630572515328, 1572098927338065920, 1572098965137133568, 1572098986230288384, 1572099000901963776 };//杩愯鐘舵��
- var monitor_id_inlet_press_array = new long[] { 1572097492726714368, 1572097521797435392, 1572097552310996992, 1572097581775982592, 1572097609944928256, 1572097630509600768, 1572098927254179840, 1572098965053247488, 1572098986163179520, 1572099000839049216 };//杩涘彛鍘嬪姏璁�
- var monitor_id_outlet_press_array = new long[] { 1572097492743491584, 1572097521810018304, 1572097552323579904, 1572097581788565504, 1572097609957511168, 1572097630522183680, 1572098927270957056, 1572098965070024704, 1572098986179956736, 1572099000851632128 };//鍑哄彛鍘嬪姏
- var monitor_id_motor_power_array = new long[] { 1572097492663799808, 1572097521730326528, 1572097552243888128, 1572097581713068032, 1572097609882013696, 1572097630446686208, 1572098927170293760, 1572098964969361408, 1572098986079293440, 1572099000755163136 };//鐬棿鍔熺巼
- var monitor_id_motor_frequence_array = new long[] { 1572097492651216896, 1572097521717743616, 1572097552231305216, 1572097581700485120, 1572097609869430784, 1572097630434103296, 1572098927153516544, 1572098964952584192, 1572098986062516224, 1572099000738385920 };//棰戠巼
- var monitor_id_motor_zhuansu_array = new long[] { 1572097492714131456, 1572097521784852480, 1572097552298414080, 1572097581763399680, 1572097609936539648, 1572097630497017856, 1572098927237402624, 1572098965036470272, 1572098986146402304, 1572099000822272000 };//杞��
+ var monitor_id_pump_flow_array = new long[] { 1578578225339174912, 1578578226492608512, 1578578227692179456, 1578578228858195968, 1578578230078738432, 1578578231458664448, 1578578232800841728, 1578578234004606976, 1578578235476807680, 1578578236709933056 };// 娴侀噺璁�
+ var monitor_id_run_status_array = new long[] { 1578578225230123008, 1578578226429693952, 1578578227629264896, 1578578228791087104, 1578578230015823872, 1578578231395749888, 1578578232742121472, 1578578233941692416, 1578578235413893120, 1578578236647018496 };//杩愯鐘舵��
+ var monitor_id_inlet_press_array = new long[] { 1578578225251094528, 1578578226446471168, 1578578227646042112, 1578578228812058624, 1578578230032601088, 1578578231412527104, 1578578232758898688, 1578578233958469632, 1578578235430670336, 1578578236663795712 };//杩涘彛鍘嬪姏璁�
+ var monitor_id_outlet_press_array = new long[] { 1578578225305620480, 1578578226463248384, 1578578227662819328, 1578578228828835840, 1578578230049378304, 1578578231429304320, 1578578232771481600, 1578578233975246848, 1578578235447447552, 1578578236676378624 };//鍑哄彛鍘嬪姏
+ var monitor_id_motor_power_array = new long[] { 1578578225414672384, 1578578226568105984, 1578578227767676928, 1578578228933693440, 1578578230154235904, 1578578231534161920, 1578578232876339200, 1578578234080104448, 1578578235552305152, 1578578236751876096 };//鐬棿鍔熺巼
+ var monitor_id_motor_frequence_array = new long[] { 1578578225355952128, 1578578226509385728, 1578578227708956672, 1578578228874973184, 1578578230095515648, 1578578231475441664, 1578578232817618944, 1578578234021384192, 1578578235493584896, 0 };//鏈�鍚庝竴鍙版槸宸ラ娉�
+ var monitor_id_motor_zhuansu_array = new long[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };//杞��
var is娑蹭綅浠ｆ浛杩涘彛鍘嬪姏 = false;
+
+
//鍒濆鍖栨満娉�
this._machineCount = 10;
- var machine_id_array = new long[] { 1565518966233894912, 1565519456896159744, 1565519699792498688, 1565519918001164288, 1565520158938763264, 1565520282846892032, 1565520398509019136, 1565520554755231744, 1565520692710084608, 1565520809135575040 };
-
+ var machine_id_array = new long[]
+ { 1565518966233894912, 1565519456896159744,
+ 1565519699792498688, 1565519918001164288, 1565520158938763264, 1565520282846892032,
+ 1565520398509019136, 1565520554755231744, 1565520692710084608, 1565520809135575040 };
+
this._allMachineList = InitialPumpMachineList(
context,
machine_id_array,//鏈烘车ID
@@ -82,15 +97,60 @@
}
+
error_info = null;
return true;
}
#endregion
+ #region 瀛愮璺垎鏋愮粨鏋�
+ private bool AddSubPipeAnaList(long[] _sub_pipe_id)
+ {
+ this._pipeAnaResultList = new List<EtaMultiRealRecordPure>();
+
+ EtaMultiRealRecordPure result_pipe_1 = new EtaMultiRealRecordPure();//涓�鍙风 鍒嗘瀽缁撴灉
+
+ result_pipe_1.ObjectType = IStation.ObjectType.PipeLine ;
+ result_pipe_1.ObjectID = _sub_pipe_id[0];
+ result_pipe_1.InitialRunList(this._machineCount);//鐢ㄦ车绔欐�绘暟閲�
+ result_pipe_1.AnalyStatus = Model.Eta.eAnalyStatus.Normal ;
+
+ BuildConnectResult(null, result_pipe_1,
+ new List<IStation.Calculation.Eta.Model.PumpAnaResult>() {
+ this._allMachineList[0],
+ this._allMachineList[1],
+ this._allMachineList[2] });
+ this._pipeAnaResultList.Add(result_pipe_1);
+
+
+
+ EtaMultiRealRecordPure result_pipe_2 = new EtaMultiRealRecordPure();//2鍙风 鍒嗘瀽缁撴灉
+ result_pipe_2.ObjectType = IStation.ObjectType.PipeLine;
+ result_pipe_2.ObjectID = _sub_pipe_id[1];
+ result_pipe_2.InitialRunList(this._machineCount);//鐢ㄦ车绔欐�绘暟閲�
+ result_pipe_2.AnalyStatus = Model.Eta.eAnalyStatus.Normal;
+
+ BuildConnectResult(null, result_pipe_2, new List<IStation.Calculation.Eta.Model.PumpAnaResult>() { this._allMachineList[3], this._allMachineList[4], this._allMachineList[5] });
+ this._pipeAnaResultList.Add(result_pipe_2);
+ EtaMultiRealRecordPure result_pipe_3 = new EtaMultiRealRecordPure();//涓�鍙风 鍒嗘瀽缁撴灉
+ result_pipe_3.ObjectType = IStation.ObjectType.PipeLine;
+ result_pipe_3.ObjectID = _sub_pipe_id[2];
+ result_pipe_3.InitialRunList(this._machineCount);//鐢ㄦ车绔欐�绘暟閲�
+ result_pipe_3.AnalyStatus = Model.Eta.eAnalyStatus.Normal;
+
+ BuildConnectResult(null, result_pipe_3, new List<IStation.Calculation.Eta.Model.PumpAnaResult>() { this._allMachineList[6], this._allMachineList[7], this._allMachineList[8], this._allMachineList[9] });
+ this._pipeAnaResultList.Add(result_pipe_3);
+
+
+
+ return true ;
+ }
+
+ #endregion
}
diff --git a/Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs b/Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs
index ed4ae51..f6aef37 100644
--- a/Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs
+++ b/Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs
@@ -121,10 +121,10 @@
var station = new Service.Station().GetByID(CorpID, logicTree.LogicID);
if (station == null)
continue;
- //if (station.ID==)
- //{
-
- //}
+ if (station.ID == 1564533764212789248)
+ {
+ var a = 1;
+ }
//鏋勫缓娉电珯涓婁笅鏂�
logicTreeContextItem.LogicName = station.Name;
@@ -280,19 +280,7 @@
{
LogHelper.Info($"鑳芥晥鍒嗘瀽浠诲姟涓紝瀹㈡埛鏍囪瘑锛歿this.CorpID}, 锛堜笟鍔★級璁板綍淇濆瓨澶辫触锛�");
}
- }
-
- if (this.CorpID==5)
- {
- var singleListJson = JsonHelper.Object2Json(singleList);
- LogHelper.Debug("singleListJson:" + singleListJson);
-
- var multiListJson = JsonHelper.Object2Json(multiList);
- LogHelper.Debug("multiListJson:" + multiListJson);
-
- var logicListJson = JsonHelper.Object2Json(logicList);
- LogHelper.Debug("logicListJson:" + logicListJson);
- }
+ }
});
#endregion
diff --git a/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user b/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user
index c53571c..1f62912 100644
--- a/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2022-10-08T02:04:57.3573208Z;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-10-08T05:42:45.7291582Z;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>
\ No newline at end of file
--
Gitblit v1.9.3