From ad80204d8c020c626253da9547e5e192c2395195 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期二, 07 五月 2024 14:01:23 +0800
Subject: [PATCH] 代码提交
---
WebApi/IStation.Application.Core/1-dispatch/1-solution/DispatchSolution_Controller.cs | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/WebApi/IStation.Application.Core/1-dispatch/1-solution/DispatchSolution_Controller.cs b/WebApi/IStation.Application.Core/1-dispatch/1-solution/DispatchSolution_Controller.cs
index 2270f1d..a2af3f8 100644
--- a/WebApi/IStation.Application.Core/1-dispatch/1-solution/DispatchSolution_Controller.cs
+++ b/WebApi/IStation.Application.Core/1-dispatch/1-solution/DispatchSolution_Controller.cs
@@ -1,4 +1,5 @@
-锘縰sing Yw.Calculation;
+锘縰sing IStation.Algorithm;
+using Yw.Calculation;
namespace IStation.Application
{
@@ -49,24 +50,44 @@
if (optimal_combine1 != null)
{
output.objects["1杈撴按鎬绘祦閲�"] = optimal_combine1.Flow;
- output.objects["1杈撴按鎬诲帇鍔�"] = M2Mpa(optimal_combine1.Head);
+ output.objects["1杈撴按鎬诲帇鍔�"] = Math.Round(M2Mpa(optimal_combine1.Head), 4);
+ output.objects["1杈撴按鎬诲姛鐜�"] = optimal_combine1.Power;
+ output.objects["1杈撴按鎬绘晥鐜�"] = optimal_combine1.Efficiency;
+ output.objects["1杈撴按鎬诲崈鍚ㄨ兘鑰�"] = optimal_combine1.WP;
+ output.objects["1杈撴按鎬诲崟浣嶈兘鑰�"] = optimal_combine1.UWP;
foreach (var combine in optimal_combine1.Combines)
{
- foreach (var pump_flag in combine.Flags)
+ foreach (var fre_pump in combine.FrePumps)
{
- output.objects[$"1杈撴按{pump_flag}#棰戠巼"] = combine.Frequency;
+ var flag = fre_pump.Flag;
+ output.objects[$"1杈撴按{flag}#娴侀噺"] = fre_pump.Flow;
+ output.objects[$"1杈撴按{flag}#鎵▼"] = fre_pump.Head;
+ output.objects[$"1杈撴按{flag}#鍔熺巼"] = fre_pump.Power;
+ output.objects[$"1杈撴按{flag}#鏁堢巼"] = fre_pump.Efficiency;
+ output.objects[$"1杈撴按{flag}#棰戠巼"] = fre_pump.Frequency;
+ output.objects[$"1杈撴按{flag}#杞��"] = fre_pump.Speed;
}
}
}
if (optimal_combine2 != null)
{
output.objects["2杈撴按鎬绘祦閲�"] = optimal_combine2.Flow;
- output.objects["2杈撴按鎬诲帇鍔�"] = M2Mpa(optimal_combine2.Head);
+ output.objects["2杈撴按鎬诲帇鍔�"] = Math.Round(M2Mpa(optimal_combine2.Head), 4);
+ output.objects["2杈撴按鎬诲姛鐜�"] = optimal_combine2.Power;
+ output.objects["2杈撴按鎬绘晥鐜�"] = optimal_combine2.Efficiency;
+ output.objects["2杈撴按鎬诲崈鍚ㄨ兘鑰�"] = optimal_combine2.WP;
+ output.objects["2杈撴按鎬诲崟浣嶈兘鑰�"] = optimal_combine2.UWP;
foreach (var combine in optimal_combine2.Combines)
{
- foreach (var pump_flag in combine.Flags)
+ foreach (var fre_pump in combine.FrePumps)
{
- output.objects[$"2杈撴按{pump_flag}#棰戠巼"] = combine.Frequency;
+ var flag = fre_pump.Flag;
+ output.objects[$"2杈撴按{flag}#娴侀噺"] = fre_pump.Flow;
+ output.objects[$"2杈撴按{flag}#鎵▼"] = fre_pump.Head;
+ output.objects[$"2杈撴按{flag}#鍔熺巼"] = fre_pump.Power;
+ output.objects[$"2杈撴按{flag}#鏁堢巼"] = fre_pump.Efficiency;
+ output.objects[$"2杈撴按{flag}#棰戠巼"] = fre_pump.Frequency;
+ output.objects[$"2杈撴按{flag}#杞��"] = fre_pump.Speed;
}
}
}
--
Gitblit v1.9.3