From 0ff2225384c72ab981b116ce15685e07e4615603 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期五, 21 四月 2023 16:01:07 +0800
Subject: [PATCH] 去掉趋势修正
---
Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs | 95 +++++++++++++++++++++++++----------------------
1 files changed, 51 insertions(+), 44 deletions(-)
diff --git a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
index a2f6ee9..54eb99c 100644
--- a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
+++ b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
@@ -316,14 +316,14 @@
var pipe1_val_flow_real = result_sg.scada.Find(t => t.tagname == "_0402010403030002001");
if (pipe1_val_flow_real != null && pipe1_val_flow_real.value > 100)
{//瀹炴椂閲�, stationCX_2#_flow" 涓夐珮缁欑殑鐩爣閲�
- real_total_flow_pipe1 = pipe1_val_flow_real.value;
+ real_total_flow_pipe1 = Math.Round( pipe1_val_flow_real.value,0);
}
double real_oulet_press_pipe1 = 0;
var pipe1_val_press_real = result_sg.scada.Find(t => t.tagname == "_0402010403030002005");
if (pipe1_val_press_real != null)
{//瀹炴椂閲�, "stationCX_2#_flow" 鏄� 涓夐珮缁欑殑鐩爣閲�
- real_oulet_press_pipe1 = pipe1_val_press_real.value;
+ real_oulet_press_pipe1 = Math.Round(pipe1_val_press_real.value,5);
}
@@ -331,19 +331,17 @@
var pipe2_val_flow_real = result_sg.scada.Find(t => t.tagname == "_0402010403030002002");
if (pipe2_val_flow_real != null && pipe2_val_flow_real.value > 100)
{
- real_total_flow_pipe2 = pipe2_val_flow_real.value;
+ real_total_flow_pipe2 = Math.Round(pipe2_val_flow_real.value,0);
}
double real_oulet_press_pipe2 = 0;
var pipe2_val_press_real = result_sg.scada.Find(t => t.tagname == "_0402010403030002006");
if (pipe2_val_press_real != null)
{//瀹炴椂閲�, stationCX_2#_flow" 涓夐珮缁欑殑鐩爣閲�
- real_oulet_press_pipe2 = pipe2_val_press_real.value;
+ real_oulet_press_pipe2 = Math.Round(pipe2_val_press_real.value,5);
}
- #endregion
-
-
+
//鍑烘柟妗�
var scheme = calulator.Calc(out error_info);
if (scheme == null)
@@ -439,45 +437,10 @@
result.Pumps.Add(pump_item);
}
+ #endregion
+ #region 淇
if (machine_run_status.Count == 1)
- {//淇濊瘉寮�涓�鍙版车鏃�, 娴侀噺澶� 棰戠巼涔熷ぇ, 娴侀噺灏� , 棰戠巼涔熷皬
- if (pipe1.TargetFlow + pipe2.TargetFlow > 100)
- {
- double current_total_flow = 0;
- if (pipe1.TargetFlow > 100)
- current_total_flow = pipe1.TargetFlow;
- else
- current_total_flow = pipe2.TargetFlow;
-
-
- var open_pump = result.Pumps.First();
- var fr_hz_tag_name = machine_frq_hz_target_name[open_pump.Index];
- var current_val_fr_hz = result_sg.scada.Find(t => t.tagname == fr_hz_tag_name);
- if (current_val_fr_hz != null && current_val_fr_hz.value > 10)
- {
- if (current_total_flow < scheme.TotalWrkQ && current_val_fr_hz.value > open_pump.Frequency)
- {//淇濊瘉瓒嬪娍姝ｇ‘
- open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 1);
- }
- else if (current_total_flow > scheme.TotalWrkQ && current_val_fr_hz.value < open_pump.Frequency)
- {//淇濊瘉瓒嬪娍姝ｇ‘
- open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 1);
- }
- else
- {//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.5HZ
- if (open_pump.Frequency < 49.5)
- {
- //open_pump.Speed = Math.Round
- // (open_pump.Speed * (open_pump.Frequency + 0.5) / (open_pump.Frequency),0);
- open_pump.Frequency = open_pump.Frequency + 0.5;
- open_pump.Speed = Math.Round(740 * open_pump.Frequency / 50, 1);
- }
- }
- }
- }
- }
- else
{
result.Pumps.ForEach(x =>
{//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.5HZ
@@ -492,8 +455,52 @@
}
}
});
+
+ //if (pipe1.TargetFlow + pipe2.TargetFlow > 100)
+ //{
+ // double current_total_flow = 0;
+ // if (pipe1.TargetFlow > 100)
+ // current_total_flow = pipe1.TargetFlow;
+ // else
+ // current_total_flow = pipe2.TargetFlow;
+ // var open_pump = result.Pumps.First();
+ // var fr_hz_tag_name = machine_frq_hz_target_name[open_pump.Index];
+ // var current_val_fr_hz = result_sg.scada.Find(t => t.tagname == fr_hz_tag_name);
+ // if (current_val_fr_hz != null && current_val_fr_hz.value > 10)
+ // {
+ // bool isCor = false;
+ // if (current_total_flow < scheme.TotalWrkQ && current_val_fr_hz.value > open_pump.Frequency)
+ // {//淇濊瘉瓒嬪娍姝ｇ‘
+ // isCor = true;
+ // open_pump.Note = string.Format("ORI_{0}", open_pump.Frequency);
+ // open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 1);
+ // }
+ // else if (current_total_flow > scheme.TotalWrkQ && current_val_fr_hz.value < open_pump.Frequency)
+ // {//淇濊瘉瓒嬪娍姝ｇ‘
+ // isCor = true;
+ // open_pump.Note = string.Format("ORI_{0}", open_pump.Frequency);
+ // open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 1);
+ // }
+
+ // }
+ //}
+ }
+ else
+ {
+ result.Pumps.ForEach(x =>
+ {//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.3HZ
+ if (x.Frequency > 10)
+ {
+ if (x.Frequency < 49.7)
+ {
+ x.Frequency = x.Frequency + 0.3;
+ x.Speed = Math.Round(740 * x.Frequency / 50, 1);
+ }
+ }
+ });
}
+ #endregion
result.Pumps.ForEach(x =>
{//鍐嶆鏌ヤ竴涓嬭浆閫�
--
Gitblit v1.9.3