From 473084031d410d95db66e81f4d1761f9a2d1b8e5 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期五, 21 四月 2023 13:42:42 +0800
Subject: [PATCH] 成行 加上数据圆整
---
Calculation/IStation.Calculation.Dispatch/custom/shys/station/长兴岛/KeepStatus.cs | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git "a/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\351\225\277\345\205\264\345\262\233/KeepStatus.cs" "b/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\351\225\277\345\205\264\345\262\233/KeepStatus.cs"
index d7396ba..650b83f 100644
--- "a/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\351\225\277\345\205\264\345\262\233/KeepStatus.cs"
+++ "b/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\351\225\277\345\205\264\345\262\233/KeepStatus.cs"
@@ -13,8 +13,6 @@
{
public Calculator_KeepStatus_SHYS_闀垮叴宀�()
{
- _corpID = 4;
- _stationID = 2;
}
Model.RequestParasComplex _request_paras;
List<long> _open_machine_IdList ;
@@ -41,10 +39,8 @@
/// </summary>
/// <param name="error_info">閿欒淇℃伅</param>
/// <returns></returns>
- public Model.AnaScheme Calc ( out string error_info)
+ public Model.AnaScheme Calc(out string error_info)
{
- _corpID = 4;
- _stationID = 2;
if (_open_machine_IdList == null || _open_machine_IdList.Count == 0)
{
error_info = "ERROR 25";
@@ -74,9 +70,9 @@
double water_level = 0;//姘翠綅
- if (_request_paras.WaterLevelPara != null && _request_paras.WaterLevelPara.Count > 0)
+ if (_request_paras.InletPipePara != null && _request_paras.InletPipePara.Count > 0)
{
- water_level = _request_paras.WaterLevelPara.First().Value;
+ water_level = _request_paras.InletPipePara.First().Value;
}
@@ -116,18 +112,15 @@
new Common.DispatchAnaGeneralHelper鍘嬪姏();
calc_pipe_helper.InitialParas(
pipe1_TargetFlow + pipe2_TargetFlow,
- water_level,
- press,
- null, null,
- allMachineList, null);
+ water_level, true,
+ press, false,
+ null, null,
+ allMachineList, null, out error_info);
return calc_pipe_helper.CalcKeepStatus(_open_machine_IdList);
}
else //闃�闂ㄥ叧鐨勭姸鎬佷笅 涓ょ鐩歌繛鏁版嵁鐩稿姞
{
- var pipe1_machineIds = new List<long>() { 19, 22 };//1鍙锋车锛�2鍙锋车
- var pipe2_machineIds = new List<long>() { 25, 28 };//3鍙锋车锛�4鍙锋车
-
Common.DispatchAnaGeneralHelper鍘嬪姏 calc_pipe1_helper
= new Common.DispatchAnaGeneralHelper鍘嬪姏();
@@ -138,10 +131,10 @@
{//鍙紑涓�鍙锋车浜屽彿娉�
calc_pipe1_helper.InitialParas(
pipe1_TargetFlow,
- water_level,
- pipe1_TargetPess,
+ water_level, true,
+ pipe1_TargetPess, false,
null, null,
- (from x in allMachineList where pipe1_machineIds.Contains(x.MachineID) select x).ToList(), null);
+ (from x in allMachineList where pipe1_machineIds.Contains(x.MachineID) select x).ToList(), null, out error_info);
return calc_pipe1_helper.CalcKeepStatus(_open_machine_IdList);
}
@@ -149,10 +142,10 @@
{
calc_pipe2_helper.InitialParas(
pipe2_TargetFlow,
- water_level,
- pipe2_TargetPess,
+ water_level, true,
+ pipe2_TargetPess, false,
null, null,
- (from x in allMachineList where pipe2_machineIds.Contains(x.MachineID) select x).ToList(), null);
+ (from x in allMachineList where pipe2_machineIds.Contains(x.MachineID) select x).ToList(), null, out error_info);
return calc_pipe2_helper.CalcKeepStatus(_open_machine_IdList);
}
@@ -162,19 +155,19 @@
calc_pipe1_helper.InitialParas(
pipe1_TargetFlow,
- water_level,
- pipe1_TargetPess,
+ water_level, true,
+ pipe1_TargetPess, false,
null, null,
- (from x in allMachineList where pipe1_machineIds.Contains(x.MachineID) select x).ToList(), null);
+ (from x in allMachineList where pipe1_machineIds.Contains(x.MachineID) select x).ToList(), null, out error_info);
var pipe1_result = calc_pipe1_helper.CalcKeepStatus(_open_machine_IdList);
calc_pipe2_helper.InitialParas(
pipe2_TargetFlow,
- water_level,
- pipe2_TargetPess,
+ water_level,true ,
+ pipe2_TargetPess,false ,
null, null,
- (from x in allMachineList where pipe2_machineIds.Contains(x.MachineID) select x).ToList(), null);
+ (from x in allMachineList where pipe2_machineIds.Contains(x.MachineID) select x).ToList(), null, out error_info);
var pipe2_result = calc_pipe2_helper.CalcKeepStatus(_open_machine_IdList);
--
Gitblit v1.9.3