From e08f18c84c96ca794407f4fcb737b26fa76c0a1f Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 11 六月 2024 09:35:03 +0800
Subject: [PATCH] 改了配置类
---
WinFrmUI/IStation.WinFrmUI.Monitor/AnaCompareData/ResultChartControl.cs | 108 ++++++++++++++++++++++++++++--------------------------
1 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/WinFrmUI/IStation.WinFrmUI.Monitor/AnaCompareData/ResultChartControl.cs b/WinFrmUI/IStation.WinFrmUI.Monitor/AnaCompareData/ResultChartControl.cs
index a5f6211..74788e8 100644
--- a/WinFrmUI/IStation.WinFrmUI.Monitor/AnaCompareData/ResultChartControl.cs
+++ b/WinFrmUI/IStation.WinFrmUI.Monitor/AnaCompareData/ResultChartControl.cs
@@ -72,29 +72,29 @@
DateTime DateTime; //api鏌ヨ闇�瑕佺殑鏃ユ湡
DateTime ListDayTime; //listBox褰撳墠閫夋嫨鐨勬棩鏈�
- DateTime HistoryTime=new DateTime();
+ DateTime HistoryTime = new DateTime();
List<CurrentModel> _CurrentModel = new List<CurrentModel>();
PumpRunHelper _PumpRunHelper = new PumpRunHelper();
CalcModel.AnaPrj _Ana = null; //鏂规鏁版嵁
Model.RunParasData _LastYeay = null; //鍘诲勾鍚屾湡
Model.RunParasData _CurrentData = null; //瀹為檯鏁版嵁
List<PumpWater> _HistorypumpWater = new List<PumpWater>(); //鍘嗗彶鍙傛暟鏃ユ湡閲嶆瀯
- bool isChage=true;
+ bool isChage = true;
- List<Model.PumpWater> _CurrentPumpWater =new List<PumpWater>(); //瀹為檯鍙傛暟鏃ユ湡閲嶆瀯
+ List<Model.PumpWater> _CurrentPumpWater = new List<PumpWater>(); //瀹為檯鍙傛暟鏃ユ湡閲嶆瀯
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
/// <param name="datetime"></param>
public void SetBindingData(DateTime datetime)
{
- /* PumpHistoryDataFileHelper pumpHistoryDataFileHelper = new PumpHistoryDataFileHelper();
- pumpHistoryDataFileHelper.GetHistoryData();*/
+ /* PumpHistoryDataFileHelper pumpHistoryDataFileHelper = new PumpHistoryDataFileHelper();
+ pumpHistoryDataFileHelper.GetHistoryData();*/
WaitFrmHelper.ShowWaitForm();
ListDayTime = datetime;
if (isChage) { SetTextToCheckBtn(datetime); }
- if (checkEditCalendar.SelectedIndex == 0)
+ if (checkEditCalendar.SelectedIndex == 0)
{
DateTime = datetime.AddDays(-366);
}
@@ -111,7 +111,7 @@
{
_LastYeay = _PumpRunHelper.GetByHistoryOneData(DateTime, out string error);
}
- _CurrentData = _PumpRunHelper.GetPumpRunParasOneDay(DateTime, out string err); //瀹為檯鏁版嵁
+ _CurrentData = _PumpRunHelper.GetPumpRunParasOneDay(DateTime, out string err); //瀹為檯鏁版嵁
MergeCurrentModel(_Ana, _LastYeay, _CurrentData);//girdview鍚堝苟鏁版嵁
SetHistoryPumpWaterParas(new DateTime(datetime.Year, datetime.Month, datetime.Day)); //鍘嗗彶鍙栨按閲�
SetCurretnPumpWaterParas(new DateTime(datetime.Year, datetime.Month, datetime.Day)); //瀹為檯鍙栨按閲�
@@ -145,11 +145,14 @@
SeriesCurrent.Points.Add(new SeriesPoint(item.DateTime, Math.Round(item.TotalEle), 2));
}
}
- if (_Ana != null&& isSetData)
+ if (_Ana != null && isSetData)
{
- foreach (var item in _Ana.PointTimes)
+ foreach (var bt in _Ana.BlockTimes)
{
- SeriesAna.Points.Add(new SeriesPoint(item.Time, Math.Round(item.SumPower), 2));
+ foreach (var item in bt.PointTimes)
+ {
+ SeriesAna.Points.Add(new SeriesPoint(item.Time, Math.Round(item.SumPower), 2));
+ }
}
}
if (SeriesHistory.Points.Count == 0)
@@ -180,14 +183,14 @@
this.checkEditCalendar.Properties.Items.Add($"闃村巻({ConvertDateTime(dateTime).ToString("yyyy-MM-dd")})");
this.checkEditCalendar.Properties.Items.Add("鑷畾涔夐�夋嫨鏃堕棿");
this.checkEditCalendar.SelectedIndex = 0;
-
+
}
//淇敼鑷畾涔夋椂闂�
private void EditComBom(DateTime dateTime)
{
- isChage=false;
+ isChage = false;
this.checkEditCalendar.Properties.Items.RemoveAt(2);
this.checkEditCalendar.Properties.Items.Add($"鑷畾涔夋椂闂磠dateTime}");
HistoryTime = dateTime;
@@ -224,28 +227,28 @@
//鍐滃巻闃村巻鏃ユ湡杞崲
- private DateTime ConvertDateTime(DateTime lastYearDay)
+ private DateTime ConvertDateTime(DateTime lastYearDay)
{
- // lastYearDay = new DateTime(2024, 4, 8);
+ // lastYearDay = new DateTime(2024, 4, 8);
//lastYearDay = lastYearDay.AddYears(-1);
// 鍒涘缓涓�涓� ChineseLunisolarCalendar 瀹炰緥
ChineseLunisolarCalendar chineseCalendar = new ChineseLunisolarCalendar();
int thisYear = chineseCalendar.GetYear(lastYearDay);
int thisMonth = chineseCalendar.GetMonth(lastYearDay);
int thisDay = chineseCalendar.GetDayOfMonth(lastYearDay);
-
- // DateTime lastYearLunarDate = new DateTime(thisYear, thisMonth, thisDay, 0, 0, 0, 0).AddYears(-1);
- var LunarDate = convert(thisYear-1, thisMonth, thisDay);
- // DateTime gregorianDate = chineseCalendar.ToDateTime(thisYear, thisMonth, thisDay, 0, 0, 0, 0);
+
+ // DateTime lastYearLunarDate = new DateTime(thisYear, thisMonth, thisDay, 0, 0, 0, 0).AddYears(-1);
+ var LunarDate = convert(thisYear - 1, thisMonth, thisDay);
+ // DateTime gregorianDate = chineseCalendar.ToDateTime(thisYear, thisMonth, thisDay, 0, 0, 0, 0);
return LunarDate;
}
-
+
//闃村巻杞崲闃冲巻
- private DateTime convert(int year,int month,int day)
+ private DateTime convert(int year, int month, int day)
{
- for (DateTime dateTime = new DateTime(year, 1, 1); dateTime < new DateTime(year, month + 3, 1);dateTime=dateTime.AddDays(1))
+ for (DateTime dateTime = new DateTime(year, 1, 1); dateTime < new DateTime(year, month + 3, 1); dateTime = dateTime.AddDays(1))
{
ChineseLunisolarCalendar chineseCalendar = new ChineseLunisolarCalendar();
int thisYear = chineseCalendar.GetYear(dateTime);
@@ -255,9 +258,9 @@
{
return dateTime;
}
-
+
}
- return new DateTime(2023,1,1);
+ return new DateTime(2023, 1, 1);
}
//鑾峰彇姘翠綅鏁版嵁
@@ -303,7 +306,7 @@
axisTime.VisualRange.SideMarginsValue = 0;
// axisTime.WholeRange.SetMinMaxValues(LastYearTime, LastYearTime.AddDays(1));
// axisTime.VisualRange.SetMinMaxValues(LastYearTime, LastYearTime.AddDays(1));
- var waterParas = _PumpRunHelper.GetByPumpOneDayWaterData(LastYearTime, out string error);
+ var waterParas = _PumpRunHelper.GetByPumpOneDayWaterData(LastYearTime, out string error);
if (waterParas == null) return;
foreach (var item in waterParas)
{
@@ -326,10 +329,10 @@
}
- //娣诲姞瀹為檯鍙栨按閲�
+ //娣诲姞瀹為檯鍙栨按閲�
private void SetCurretnPumpWaterParas(DateTime dateTime)
{
- // List<PumpWater> pumpWater = new List<PumpWater>();
+ // List<PumpWater> pumpWater = new List<PumpWater>();
XYDiagram main_diagram = chartControl瀹炴椂鏁版嵁.Diagram as XYDiagram;
var axisTime = main_diagram.AxisX;
axisTime.VisualRange.Auto = true;
@@ -344,7 +347,7 @@
axisTimeele.VisualRange.SideMarginsValue = 0;
// axisTime.WholeRange.SetMinMaxValues(LastYearTime, LastYearTime.AddDays(1));
// axisTime.VisualRange.SetMinMaxValues(LastYearTime, LastYearTime.AddDays(1));
- var CurrentPumpWater = _PumpRunHelper.GetByPumpOneDayWaterData(dateTime, out string error);
+ var CurrentPumpWater = _PumpRunHelper.GetByPumpOneDayWaterData(dateTime, out string error);
var SeriseMonitor = this.chartControl瀹炴椂鏁版嵁.Series[0];
if (CurrentPumpWater == null) return;
_CurrentPumpWater.Clear();
@@ -373,25 +376,26 @@
//娣诲姞鏂规鍙栨按閲�
private void GetAnaWater()
{
- XYDiagram main_diagram = chartControl瀹炴椂鏁版嵁.Diagram as XYDiagram;
+ XYDiagram main_diagram = chartControl瀹炴椂鏁版嵁.Diagram as XYDiagram;
var axisTime = main_diagram.AxisX;
axisTime.VisualRange.Auto = true;
axisTime.WholeRange.Auto = true;
axisTime.WholeRange.SideMarginsValue = 0;
axisTime.VisualRange.SideMarginsValue = 0;
- var SeriseMonitor = this.chartControl瀹炴椂鏁版嵁.Series[2];
+ var SeriseMonitor = this.chartControl瀹炴椂鏁版嵁.Series[2];
SeriseMonitor.Points.Clear();
- if (_Ana == null || !isSetData)
+ if (_Ana == null || !isSetData)
{
SeriseMonitor.ShowInLegend = false;
return;
}
- foreach (var item in _Ana.PointTimes)
- {
+ var allTime = _Ana.GetAllPointTimeList();
+ foreach (var item in allTime)
+ {
SeriseMonitor.Points.Add(new SeriesPoint(item.Time, item.RealFlow));
- }
+ }
SeriseMonitor.ShowInLegend = true;
- }
+ }
@@ -420,7 +424,7 @@
private void barCheckData_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
isSetData = this.barCheckData.Checked;
- var a = new CalcModel.AnaPrj();
+ var a = new CalcModel.AnaPrj();
GetAnaWater();
SetSeriseEle();
MergeCurrentModel(a, _LastYeay, _CurrentData);
@@ -429,7 +433,7 @@
this.barCheckData.Caption = "闅愯棌鏂规鏁版嵁";
}
else this.barCheckData.Caption = "鏄剧ず鏂规鏁版嵁";
-
+
}
@@ -438,7 +442,7 @@
{
HistoryDataAPiHelper historyDataAPiHelper = new HistoryDataAPiHelper();
var LastYearIsOpen = historyDataAPiHelper.MergeTimeSlots(MergeList(LastYeay));
-
+
var CurrentDateOpen = historyDataAPiHelper.MergeTimeSlots(MergeList(currentData));
_CurrentModel.Clear();
if (DateTime.Now.Date >= ListDayTime && CurrentDateOpen != null /*&& LastYearIsOpen != null *//*&& anaPrj != null*/)
@@ -452,13 +456,13 @@
PumpCount = string.Format("{0}鍙版车", model.Item3.ToString()),
Time = model.Item1.ToString("HH:mm") + "-" + model.Item2.ToString("HH:mm"),
ElectricityPrice = model.Item4 * 1000,
- Water = model.Item5*1000, //km鲁---m鲁
- Electricity = model.Item6*1000,
+ Water = model.Item5 * 1000, //km鲁---m鲁
+ Electricity = model.Item6 * 1000,
TimeSpan = (model.Item2 - model.Item1).TotalMinutes,
- TotalEle = _CurrentData.Electric*1000, //Mwh--kwh
+ TotalEle = _CurrentData.Electric * 1000, //Mwh--kwh
TotalElePrice = _CurrentData.Money * 1000,
- TotalWater =Math.Round( _CurrentData.FlowIn/10,1),//km鲁 ---涓噈鲁
- QDSLN = Math.Round(((_CurrentData.Electric * 1000) /( _CurrentData.FlowIn / 10))/10, 1)
+ TotalWater = Math.Round(_CurrentData.FlowIn / 10, 1),//km鲁 ---涓噈鲁
+ QDSLN = Math.Round(((_CurrentData.Electric * 1000) / (_CurrentData.FlowIn / 10)) / 10, 1)
};
_CurrentModel.Add(CurrentDate);
}
@@ -489,7 +493,7 @@
_CurrentModel.Add(project);
}
}
- if (LastYearIsOpen != null )
+ if (LastYearIsOpen != null)
{
foreach (var model in LastYearIsOpen)
{
@@ -499,29 +503,29 @@
PumpCount = string.Format("{0}鍙版车", model.Item3.ToString()),
Time = model.Item1.ToString("HH:mm") + "-" + model.Item2.ToString("HH:mm"),
ElectricityPrice = model.Item4 * 1000,
- Water = model.Item5*1000,
+ Water = model.Item5 * 1000,
Electricity = model.Item6 * 1000,
TimeSpan = (model.Item2 - model.Item1).TotalMinutes,
TotalEle = _LastYeay.Electric * 1000,
- TotalElePrice = _LastYeay.Money*1000,
- TotalWater = Math.Round( _LastYeay.FlowIn/10,1),
+ TotalElePrice = _LastYeay.Money * 1000,
+ TotalWater = Math.Round(_LastYeay.FlowIn / 10, 1),
QDSLN = Math.Round(((_LastYeay.Electric * 1000) / (_LastYeay.FlowIn / 10)) / 10, 1)
};
_CurrentModel.Add(LastYear);
}
}
-
+
this.bindingSource1.DataSource = _CurrentModel;
this.bindingSource1.ResetBindings(false);
- }
+ }
//鑷畾涔夊悎骞�
- private void gridView2_CellMerge(object sender, CellMergeEventArgs e)
+ private void gridView2_CellMerge(object sender, CellMergeEventArgs e)
{
var gridViewPumpID1 = gridView2.GetRow(e.RowHandle1) as CurrentModel;
- var gridViewPumpID2 = gridView2.GetRow(e.RowHandle2) as CurrentModel;
- if (gridViewPumpID1 == gridViewPumpID2)
+ var gridViewPumpID2 = gridView2.GetRow(e.RowHandle2) as CurrentModel;
+ if (gridViewPumpID1 == gridViewPumpID2)
{
return;
}
@@ -530,6 +534,6 @@
e.Merge = false;
e.Handled = true;
}
- }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3