From dc97e187c607119bbd2945b9a277db8da15f8dc0 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 27 三月 2024 13:51:36 +0800
Subject: [PATCH] 重新优化接口调取数据
---
WinFrmUI/IStation.WinFrmUI.Monitor/ResultChartControl.cs | 95 +++--------------------------------------------
1 files changed, 7 insertions(+), 88 deletions(-)
diff --git a/WinFrmUI/IStation.WinFrmUI.Monitor/ResultChartControl.cs b/WinFrmUI/IStation.WinFrmUI.Monitor/ResultChartControl.cs
index 6930cba..4f6879b 100644
--- a/WinFrmUI/IStation.WinFrmUI.Monitor/ResultChartControl.cs
+++ b/WinFrmUI/IStation.WinFrmUI.Monitor/ResultChartControl.cs
@@ -13,6 +13,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
+using IStation.BLL;
namespace IStation.WinFrmUI.Monitor
{
@@ -52,64 +53,12 @@
/// <param name="datetime"></param>
public void SetBindingData(DateTime datetime)
{
- _currentModel.Clear();
- HistoryDataAPiHelper historyDataHelper = new HistoryDataAPiHelper();
- var result = historyDataHelper.getPumpIsOpen();
- var time = new DateTime(2022, 11, 6);
- foreach (var item in result)
- {
- var currentmodel = new CurrentModel
- {
- Name = "鏂规",
- Time = item.Item1.ToString("HH:mm") + "----" + item.Item2.ToString("HH:mm"),
- PumpCount = item.Item3.ToString() + "鍙�",
- water = Math.Round(GetWaterdata(item.Item1, item.Item2), 2),
- electricity = GetElectrityData(item.Item1, item.Item2),
- Electricity = electricityPirce(item.Item1, item.Item2, GetElectrityData(item.Item1, item.Item2))
- };
- _currentModel.Add(currentmodel);
- }
- this.bindingSource1.DataSource = _currentModel;
+ PumpRunHelper pumpRunHelper = new PumpRunHelper();
+ pumpRunHelper.GetPumpRunParasOneDay(datetime,out string error1);
+ pumpRunHelper.GetByHistoryOneData(new DateTime(2023,2,5),out string error);
+
}
-
-
- private double GetWaterdata(DateTime Str, DateTime end)
- {
- HistoryDataAPiHelper historyDataHelper = new HistoryDataAPiHelper();
- var waterData = historyDataHelper.GetWaterData();
- var pump1 = WaterData(waterData.Where(x => x.Tag == "浜屽彇姘�1鍙蜂富姘存车.鏃ョ疮璁�").ToList(), Str, end);
- var pump2 = WaterData(waterData.Where(x => x.Tag == "浜屽彇姘�2鍙蜂富姘存车.鏃ョ疮璁�").ToList(), Str, end);
- var pump3 = WaterData(waterData.Where(x => x.Tag == "浜屽彇姘�3鍙蜂富姘存车.鏃ョ疮璁�").ToList(), Str, end);
- var pump4 = WaterData(waterData.Where(x => x.Tag == "浜屽彇姘�4鍙蜂富姘存车.鏃ョ疮璁�").ToList(), Str, end);
- var pump5 = WaterData(waterData.Where(x => x.Tag == "浜屽彇姘�5鍙蜂富姘存车.鏃ョ疮璁�").ToList(), Str, end);
- return pump1 + pump2 + pump3 + pump4 + pump5;
- }
-
-
- private double WaterData(List<Model.PumpWater> waterData, DateTime Str, DateTime end)
- {
- double result = 0;
- for (int i = 0; i < waterData.Count; i++)
- {
- if (waterData[i].Values[0].DateTime == Str)
- {
- double startValue;
- double endValue;
- startValue = waterData[i].Values[0].SingleWater;
- for (int j = i + 1; j < waterData.Count; j++)
- {
- if (waterData[j].Values[0].DateTime == end)
- {
- endValue = waterData[j].Values[0].SingleWater;
- result = endValue - startValue;
- return result;
- }
- }
- }
- }
- return result;
- }
//鐢佃垂璁＄畻
@@ -132,40 +81,10 @@
private double GetElectrityData(DateTime Str, DateTime end)
{
- HistoryDataAPiHelper historyDataHelper = new HistoryDataAPiHelper();
- var Ele = historyDataHelper.GetEleData();
- var pump1 = ElectricityData(Ele.Where(x => x.Tag == "_0402010204040193046").ToList(), Str, end);
- var pump2 = ElectricityData(Ele.Where(x => x.Tag == "_0402010204040193047").ToList(), Str, end);
- var pump3 = ElectricityData(Ele.Where(x => x.Tag == "_0402010204012308007").ToList(), Str, end);
- var pump4 = ElectricityData(Ele.Where(x => x.Tag == "_0402010204012408007").ToList(), Str, end);
- var pump5 = ElectricityData(Ele.Where(x => x.Tag == "_0402010204012508007").ToList(), Str, end);
- return Math.Round(pump1 + pump2 + pump3 + pump4 + pump5, 2);
+ return 0;
}
-
- private double ElectricityData(List<Model.electricity> EleData, DateTime Str, DateTime end)
- {
- double result = 0;
- for (int i = 0; i < EleData.Count; i++)
- {
- if (EleData[i].TotalEle[0].DateTime == Str)
- {
- double startValue;
- double endValue;
- startValue = EleData[i].TotalEle[0].Value;
- for (int j = i + 1; j < EleData.Count; j++)
- {
- if (EleData[j].TotalEle[0].DateTime == end)
- {
- endValue = EleData[j].TotalEle[0].Value;
- result = endValue - startValue;
- return result;
- }
- }
- }
- }
- return result;
- }
+
--
Gitblit v1.9.3