From 14801a2e40bc79833c41151a37fe4cb0acbc5c7f Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 三月 2023 10:32:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs | 28 ++++++++++++++++++++++------
Server/IStation.Server.LinuxTest/task/MonitorJobHelper.cs | 2 +-
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
index 867b024..ebb0959 100644
--- a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
+++ b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
@@ -338,9 +338,11 @@
pump_item.Name = "闀垮叴娉垫埧4鍙锋満娉�";
}
- //淇濊瘉寮�涓�鍙版车鏃�, 娴侀噺澶� 棰戠巼涔熷ぇ, 娴侀噺灏� , 棰戠巼涔熷皬
+
+
+
if (machine_run_status.Count == 1)
- {
+ {//淇濊瘉寮�涓�鍙版车鏃�, 娴侀噺澶� 棰戠巼涔熷ぇ, 娴侀噺灏� , 棰戠巼涔熷皬
double current_total_flow = 0;
var pipe1_val_flow_current = result_sg.scada.Find(t => t.tagname == "_0402010403030002001");
if (pipe1_val_flow_current != null && pipe1_val_flow_current.value > 100)
@@ -376,12 +378,26 @@
{
open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 2);
}
+ else
+ {//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.5HZ
+ open_pump.Frequency = open_pump.Frequency + 0.5;
+ if (open_pump.Frequency > 50)
+ open_pump.Frequency = 50;
+ }
}
-
}
-
-
-
+ }
+ else
+ {
+ result.Pumps.ForEach(x =>
+ {//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.5HZ
+ if (x.Frequency > 10)
+ {
+ x.Frequency = x.Frequency + 0.5;//
+ }
+ if (x.Frequency > 50)
+ x.Frequency = 50;
+ });
}
return result;
diff --git a/Server/IStation.Server.LinuxTest/task/MonitorJobHelper.cs b/Server/IStation.Server.LinuxTest/task/MonitorJobHelper.cs
index e101cde..92ad3ef 100644
--- a/Server/IStation.Server.LinuxTest/task/MonitorJobHelper.cs
+++ b/Server/IStation.Server.LinuxTest/task/MonitorJobHelper.cs
@@ -41,7 +41,7 @@
#endregion
- var result = new Service.MonitorRecord().Inserts(data);
+ var result = new Service.MonitorRecord().InsertsLastRecord(data);
if (!result)
{
LogHelper.Error($"鐩戞祴鏁版嵁瀛樺偍鏈嶅姟涓�,褰撳墠閫氶亾澶勪簬闃诲鐘舵�� 锛�");
--
Gitblit v1.9.3