From a71fbf8105683544129910626cc9e307134e0bab Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期三, 12 四月 2023 13:21:34 +0800
Subject: [PATCH] 最后再检查一下转速和频率

---
 Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
index 78f1f52..ad460e8 100644
--- a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
+++ b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
@@ -446,12 +446,10 @@
                         if (current_total_flow < scheme.TotalWrkQ && current_val_fr_hz.value > open_pump.Frequency)
                         {//淇濊瘉瓒嬪娍姝g‘
                             open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 2);
-                            open_pump.Speed = Math.Round(740 * open_pump.Frequency / 50, 1);
                         }
                         else if (current_total_flow > scheme.TotalWrkQ && current_val_fr_hz.value < open_pump.Frequency)
                         {//淇濊瘉瓒嬪娍姝g‘
                             open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 2);
-                            open_pump.Speed = Math.Round(740 * open_pump.Frequency / 50, 1);
                         }
                         else
                         {//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.5HZ
@@ -461,14 +459,7 @@
                                 //    (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);
-                            }
-
-                            if (open_pump.Frequency > 50)
-                            {
-                                open_pump.Frequency = 50;
-                                open_pump.Speed = 740;
-                            }
-                                
+                            }                           
                         }
                     }
                 }
@@ -486,16 +477,23 @@
                             x.Frequency = x.Frequency + 0.5;
                             x.Speed = Math.Round(740 * x.Frequency / 50, 1);
                         } 
-                    }
-                    if (x.Frequency > 50)
-                    {
-                        x.Frequency = 50;
-                        x.Speed = 740;
-                    }
-                        
+                    }                    
                 });
             }
 
+
+            result.Pumps.ForEach(x =>
+            {//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.5HZ
+                if (x.Frequency > 10)
+                {
+                    x.Speed = Math.Round(740 * x.Frequency / 50, 1);
+                }
+                if (x.Frequency >= 50)
+                {
+                    x.Frequency = 50;
+                    x.Speed = 740;
+                }
+            });
             return result;
         }
  

--
Gitblit v1.9.3