From b24092beff11a75a3fec392dcedd475b407ebdc3 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期二, 22 四月 2025 14:21:05 +0800
Subject: [PATCH] 代码修改
---
01-api/Application/IStation.Application/01-open-api/01-schedule/Schedule_Controller.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/01-api/Application/IStation.Application/01-open-api/01-schedule/Schedule_Controller.cs b/01-api/Application/IStation.Application/01-open-api/01-schedule/Schedule_Controller.cs
index 3e61863..4bf39df 100644
--- a/01-api/Application/IStation.Application/01-open-api/01-schedule/Schedule_Controller.cs
+++ b/01-api/Application/IStation.Application/01-open-api/01-schedule/Schedule_Controller.cs
@@ -188,8 +188,9 @@
};
schedule_pump_list1 = new List<Model.SchedulePump>();
- output.objects["1杈撴按鎬绘祦閲�"] = optimal_combine1.TotalFlow;
- output.objects["1杈撴按鎬诲帇鍔�"] = Math.Round(Curve.PumpCalculateHelper.M2Mpa(optimal_combine1.TotalPressure), 4);
+ // 20250422 淇敼鍘熷洜,姘翠腑蹇冪洿鎺ユ嬁鎴戠殑鐞嗚鍊煎鍒拌皟搴︿笂浜嗭紝鎴戣繑鍥炲師鍊肩粰浠栦滑
+ output.objects["1杈撴按鎬绘祦閲�"] = target_flow1;
+ output.objects["1杈撴按鎬诲帇鍔�"] = target_mpa_pressure1;
output.objects["1杈撴按鎬诲姛鐜�"] = optimal_combine1.TotalPower;
output.objects["1杈撴按鎬绘晥鐜�"] = optimal_combine1.TotalEfficiency;
output.objects["1杈撴按鎬诲崈鍚ㄨ兘鑰�"] = optimal_combine1.WP;
@@ -270,6 +271,8 @@
}
else
{
+ output.objects["1杈撴按鎬绘祦閲�"] = target_flow1;
+ output.objects["1杈撴按鎬诲帇鍔�"] = target_mpa_pressure1;
msg += $" 1杈撴按璋冨害璁＄畻澶辫触锛屾棤娉曟弧瓒崇洰鏍囨祦閲�:{target_flow1},鐩爣鍘嬪姏:{target_mpa_pressure1}!";
}
@@ -292,8 +295,8 @@
};
schedule_pump_list2 = new List<Model.SchedulePump>();
- output.objects["2杈撴按鎬绘祦閲�"] = optimal_combine2.TotalFlow;
- output.objects["2杈撴按鎬诲帇鍔�"] = Math.Round(Curve.PumpCalculateHelper.M2Mpa(optimal_combine2.TotalPressure), 4);
+ output.objects["2杈撴按鎬绘祦閲�"] = target_flow2;
+ output.objects["2杈撴按鎬诲帇鍔�"] = target_mpa_pressure2;
output.objects["2杈撴按鎬诲姛鐜�"] = optimal_combine2.TotalPower;
output.objects["2杈撴按鎬绘晥鐜�"] = optimal_combine2.TotalEfficiency;
output.objects["2杈撴按鎬诲崈鍚ㄨ兘鑰�"] = optimal_combine2.WP;
@@ -369,6 +372,8 @@
}
else
{
+ output.objects["2杈撴按鎬绘祦閲�"] = target_flow2;
+ output.objects["2杈撴按鎬诲帇鍔�"] = target_mpa_pressure2;
msg += $" 2杈撴按璋冨害璁＄畻澶辫触锛屾棤娉曟弧瓒崇洰鏍囨祦閲�:{target_flow2},鐩爣鍘嬪姏:{target_mpa_pressure2}!";
}
}
--
Gitblit v1.9.3