From 1f91ca552c8c7a22c8853149c9be802a73bc843d Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期三, 09 十一月 2022 11:42:31 +0800
Subject: [PATCH] 松浦大桥泵站 kpi修改 (出口压力)
---
Calculation/IStation.EtaCalculation4Custom/shys/station/EtaAnalyCalculator4松浦大桥泵站.cs | 17 +++++------------
TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user | 2 +-
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git "a/Calculation/IStation.EtaCalculation4Custom/shys/station/EtaAnalyCalculator4\346\235\276\346\265\246\345\244\247\346\241\245\346\263\265\347\253\231.cs" "b/Calculation/IStation.EtaCalculation4Custom/shys/station/EtaAnalyCalculator4\346\235\276\346\265\246\345\244\247\346\241\245\346\263\265\347\253\231.cs"
index 87fbd8e..29dcf3d 100644
--- "a/Calculation/IStation.EtaCalculation4Custom/shys/station/EtaAnalyCalculator4\346\235\276\346\265\246\345\244\247\346\241\245\346\263\265\347\253\231.cs"
+++ "b/Calculation/IStation.EtaCalculation4Custom/shys/station/EtaAnalyCalculator4\346\235\276\346\265\246\345\244\247\346\241\245\346\263\265\347\253\231.cs"
@@ -24,7 +24,7 @@
if (context == null)
{
error_info = "涓婁笅鏂囧弬鏁颁负绌�";
- return false ;
+ return false;
}
this._threshold_flow = 50;//濡傛灉姝ゆ车寮�浜�, 闃叉闆剁偣椋樻祦, 鍒ゆ柇娴侀噺璁″�兼槸鍚︽甯�
this._stationID = context.ID;
@@ -54,7 +54,7 @@
var monitor_id_pump_flow_array = new long[] { 1054, 1060, 1066, 1072, 1078, 1084, 1090, 1096, 1102, 1108, 1114, 1120 };// 娴侀噺璁�
var monitor_id_run_status_array = new long[] { 1052, 1058, 1064, 1070, 1076, 1082, 1088, 1094, 1100, 1106, 1112, 1118 };//杩愯鐘舵��
var monitor_id_inlet_press_array = new long[] { 1044, 1044, 1044, 1045, 1045, 1045, 1046, 1046, 1046, 1047, 1047, 1047, 1047 };//杩涘彛鍘嬪姏璁�(娑蹭綅)
- var monitor_id_outlet_press_array = new long[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };//鍑哄彛鍘嬪姏
+ var monitor_id_outlet_press_array = new long[] { 1049, 1049, 1049, 1049, 1049, 1049, 1050, 1050, 1050, 1050, 1050, 1050 };//鍑哄彛鍘嬪姏
var monitor_id_motor_power_array = new long[] { 1056, 1062, 1068, 1074, 1080, 1086, 1092, 1098, 1104, 1110, 1116, 1122 };//鐬棿鍔熺巼
var monitor_id_motor_frequence_array = new long[] { 0, 0, 1124, 1125, 0, 0, 0, 0, 0, 1126, 0, 0 };//棰戠巼
var monitor_id_motor_zhuansu_array = new long[] { 1055, 1061, 1067, 1073, 1079, 1085, 1091, 1097, 1103, 1109, 1115, 1121 };//杞��
@@ -66,7 +66,7 @@
//7 - 12缁� 826姹犱緵姘�
this._machineCount = 12;//3,4,10鏄彉棰�
var machine_id_array = new long[] { 322, 325, 328, 331, 334, 337, 340, 343, 346, 349, 352, 355 };
-
+
this._allMachineList = InitialPumpMachineList(
context,
machine_id_array,//鏈烘车ID
@@ -83,9 +83,9 @@
if (_allMachineList == null)
{
IStation.LogHelper.Error(error_info);
- return false ;
+ return false;
}
- foreach(var m in this._allMachineList)
+ foreach (var m in this._allMachineList)
{
m.Is娑蹭綅浠ｆ浛鍑哄彛鍘嬪姏 = true;
}
@@ -94,13 +94,6 @@
}
#endregion
-
-
-
-
}
-
-
-
}
diff --git a/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user b/TopShelf/IStation.TopShelf.Eta/Properties/PublishProfiles/FolderProfile.pubxml.user
index 17406cd..8943eed 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-31T07:35:55.6311717Z;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-08T06:50:42.1914017Z;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>
\ No newline at end of file
--
Gitblit v1.9.3