From 0171d347fec140d31db39ab5d76d51eebac472c2 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 31 十月 2022 14:28:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs | 83 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs b/Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs
index 8d046c3..65c9363 100644
--- a/Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs
+++ b/Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs
@@ -27,59 +27,58 @@
return _dict[SgFactoryId];
}
-
+ // {1,2},//闀垮叴娉电珯
+ // {2,12},//浜斿彿娌熷噷妗ユ柟鍚�
+ // {3,9},//浜斿彿娌熼噾娴锋柟鍚�
+ // {4,3},//浜斿彿娌熶弗妗ユ柟鍚�1
+ // {5,5},//浜斿彿娌熶弗妗ユ柟鍚�2
+ // {6,4},//涓ユˉ娉电珯
+ // {7,6},//涓存睙1#娉电珯
+ // {8,7},//涓存睙2#娉电珯
+ // {9,8},//寰愭尘娉电珯
+ // {10,10},//閲戞捣娉电珯
+ // {11,11},//鍗楁眹鍖楁车绔�
+ // {12,15},//闄堣涓�杈�
+ // {13,16},//闄堣浜岃緭
+ // {14,17},//娉板拰娉电珯
+ // {15,19},//閲戞辰娉电珯
+ // {16,20},//鏉炬睙娉电珯
+ // {17,21},//澶фˉ娉电珯
static Dictionary<int, StationInfo> _dict;
private static void Inital()
{
_dict = new Dictionary<int, StationInfo>();
+
// 鍑烘按鎬荤鍘嬪姏, 娌℃湁鏁版嵁
//_dict.Add(15, new StationInfo(19, new IStation.Calculation.shys閲戞辰娉电珯()));//NG 鍑烘按鎬荤鍘嬪姏,鐬椂娴侀噺娌℃湁鏁版嵁 涓夐珮鏁版嵁涓嶅叏
//_dict.Add(9, new StationInfo(8, new IStation.Calculation.shys寰愭尘娉电珯()));//NG 娌℃湁姘存睜姘翠綅,杩涙按鍘嬪姏楂樹簬鍑烘按鍘嬪姏
//_dict.Add(6, new StationInfo(4, new IStation.Calculation.shys涓ユˉ娉电珯()));//NG 娌℃湁娴侀噺鏁版嵁, 娌℃湁鍑哄彛娑蹭綅鏁版嵁
+ //_dict.Add(3, new StationInfo(9, new IStation.Calculation.shys浜斿彿娌熼噾娴锋柟鍚�()));//NG 鍑哄彛鍘嬪姏鏈夌殑鏄�1MPa 鏈夌殑3MPa 娉电珯鏍规湰杈句笉鍒拌繖涓帇鍔�
+ //_dict.Add(10, new StationInfo(10, new IStation.Calculation.shys閲戞捣娉电珯()));//NG 绠¤矾涓� 杩涘彛鍘嬪姏:0.1259MPa,鍑哄彛鍘嬪姏:0.2135MPa,绾�8.8m鎵▼,娴侀噺瑕佹眰:11596, 娉甸瀹氭壃绋嬩负47m,鍙橀涔熸棤娉曞緱鍒板姝や綆鐨勬壃绋�
+ //_dict.Add(12, new StationInfo(15, new IStation.Calculation.shys闄堣涓�杈�()));//NG 娌℃湁鎻愪緵 _0402010503030202003 涓夊彿绠″嚭鍙ｆ祦閲忓��
+ //_dict.Add(7, new StationInfo(6, new IStation.Calculation.shys涓存睙1鍙锋车鎴�())); //NG 娌℃湁鎻愪緵 娴侀噺 ,鏃犳硶璁＄畻
+ //_dict.Add(11, new StationInfo(11, new IStation.Calculation.shys鍗楁眹鍖楁车绔�()));//NG 绠¤矾涓� 杩涘彛鍘嬪姏: 6MPa , 涓嶅彲鑳借揪鍒拌繖涔堥珮鍘嬪姏
+ //_dict.Add(16, new StationInfo(20, new IStation.Calculation.shys鏉炬睙娉电珯()));//NG 娌℃湁鎻愪緵 鍑烘按鎬荤鍘嬪姏 鍜屾祦閲� ,鏃犳硶璁＄畻
+ //_dict.Add(17, new StationInfo(21, new IStation.Calculation.shys澶фˉ娉电珯())); // NG 娌℃湁鎻愪緵 娴侀噺 ,鏃犳硶璁＄畻
- _dict.Add(3, new StationInfo(9, new IStation.Calculation.shys浜斿彿娌熼噾娴锋柟鍚�()));
+ // _dict.Add(14, new StationInfo(17, new IStation.Calculation.shys娉板拰娉电珯()));//NG 绠¤矾浜岃皟搴︽柟妗堟棤娉曡绠�,璇风‘璁ゆ暟鎹槸鍚﹀悎鐞�,杩涘彛鍘嬪姏:0.12395039999999999MPa,鍑哄彛鍘嬪姏:0.14949020652770995MPa,娴侀噺瑕佹眰:4180.51220703125"
-
- //_dict.Add(1, new StationInfo(2, new IStation.Calculation.shys闀垮叴娉电珯()));//OK
- //_dict.Add(2, new StationInfo(12, new IStation.Calculation.shys浜斿彿娌熷噷妗ユ柟鍚�()));//ok
- //_dict.Add(4, new StationInfo(3, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�1()));//OK
- //_dict.Add(5, new StationInfo(5, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�2()));//OK
-
-
- //
- //
- //_dict.Add(7, new StationInfo(6, new IStation.Calculation.shys涓存睙1鍙锋车鎴�()));
- //_dict.Add(8, new StationInfo(7, new IStation.Calculation.shys涓存睙2鍙锋车鎴�()));
- //
- //_dict.Add(10, new StationInfo(10, new IStation.Calculation.shys閲戞捣娉电珯()));
- //_dict.Add(11, new StationInfo(11, new IStation.Calculation.shys鍗楁眹鍖楁车绔�()));
- //_dict.Add(12, new StationInfo(15, new IStation.Calculation.shys闄堣涓�杈�()));
- //_dict.Add(13, new StationInfo(16, new IStation.Calculation.shys闄堣浜岃緭()));
- //_dict.Add(14, new StationInfo(17, new IStation.Calculation.shys娉板拰娉电珯()));
- //
- //_dict.Add(16, new StationInfo(20, new IStation.Calculation.shys鏉炬睙娉电珯()));
- //_dict.Add(17, new StationInfo(21, new IStation.Calculation.shys澶фˉ娉电珯()));
-
-
- // {1,2},//闀垮叴娉电珯
- // {2,12},//浜斿彿娌熷噷妗ユ柟鍚�
- // {3,9},//浜斿彿娌熼噾娴锋柟鍚�
- // {4,3},//浜斿彿娌熶弗妗ユ柟鍚�1
- // {5,5},//浜斿彿娌熶弗妗ユ柟鍚�2
- // {6,4},//涓ユˉ娉电珯
- // {7,6},//涓存睙1#娉电珯
- // {8,7},//涓存睙2#娉电珯
- // {9,8},//寰愭尘娉电珯
- // {10,10},//閲戞捣娉电珯
- // {11,11},//鍗楁眹鍖楁车绔�
- // {12,15},//闄堣涓�杈�
- // {13,16},//闄堣浜岃緭
- // {14,17},//娉板拰娉电珯
- // {15,19},//閲戞辰娉电珯
- // {16,20},//鏉炬睙娉电珯
- // {17,21},//澶фˉ娉电珯
-
+#if (DEBUG)
+ _dict.Add(1, new StationInfo(2, new IStation.Calculation.shys闀垮叴娉电珯()));//OK
+ _dict.Add(2, new StationInfo(12, new IStation.Calculation.shys浜斿彿娌熷噷妗ユ柟鍚�()));//ok
+ _dict.Add(4, new StationInfo(3, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�1()));//OK
+ _dict.Add(5, new StationInfo(5, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�2()));//OK
+ _dict.Add(13, new StationInfo(16, new IStation.Calculation.shys闄堣浜岃緭()));//ok
+ _dict.Add(8, new StationInfo(7, new IStation.Calculation.shys涓存睙2鍙锋车鎴�()));//ok
+#else
+ _dict.Add(1, new StationInfo(2, new IStation.Calculation.shys闀垮叴娉电珯()));//OK
+ _dict.Add(2, new StationInfo(12, new IStation.Calculation.shys浜斿彿娌熷噷妗ユ柟鍚�()));//ok
+ _dict.Add(4, new StationInfo(3, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�1()));//OK
+ _dict.Add(5, new StationInfo(5, new IStation.Calculation.shys浜斿彿娌熶弗妗ユ柟鍚�2()));//OK
+ _dict.Add(13, new StationInfo(16, new IStation.Calculation.shys闄堣浜岃緭()));//ok
+ _dict.Add(8, new StationInfo(7, new IStation.Calculation.shys涓存睙2鍙锋车鎴�()));//ok
+#endif
}
/// <summary>
--
Gitblit v1.9.3