From 8d31cd366ea79ced8e5f3d56ce9b4e6f75872939 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 26 三月 2024 15:04:23 +0800
Subject: [PATCH] 改
---
DAL/IStation.DAL.Paras/PumpHistoryDataFileHelper.cs | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/DAL/IStation.DAL.Paras/PumpHistoryDataFileHelper.cs b/DAL/IStation.DAL.Paras/PumpHistoryDataFileHelper.cs
index db1cabd..aca58d6 100644
--- a/DAL/IStation.DAL.Paras/PumpHistoryDataFileHelper.cs
+++ b/DAL/IStation.DAL.Paras/PumpHistoryDataFileHelper.cs
@@ -13,20 +13,85 @@
public class RunParasData
{
+ public DateTime Day { get; set; }
/// <summary>
/// 娉佃繍琛岀姸鎬�
/// </summary>
- public List<(DateTime,DateTime,int )> TimeRunParas { get; set; }
+ public List<RunParasBlock> Blocks { get; set; }
/// <summary>
/// 鍙栨按閲�
/// </summary>
- public List<double> Water { get; set; }
+ public double FlowIn { get; set; }
/// <summary>
/// 鐢ㄧ數閲�
/// </summary>
- public List<double> Electric { get; set; }
- }
+ public double Electric { get; set; }
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public double Money { get; set; }
+ }
+ public class RunParasBlock
+ {
+ public DateTime StartTime { get; set; }
+
+ public DateTime EndTime { get; set; }
+
+ public double FlowIn1 { get; set; }
+
+ public double FlowIn2 { get; set; }
+
+ public double FlowIn3 { get; set; }
+
+ public double FlowIn4 { get; set; }
+
+ public double FlowIn5 { get; set; }
+
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public double Electric1 { get; set; }
+ /// <summary>
+ /// 鐢佃垂
+ /// </summary>
+ public double Money1 { get; set; }
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public double Electric2 { get; set; }
+ /// <summary>
+ /// 鐢佃垂
+ /// </summary>
+ public double Money2 { get; set; }
+
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public double Electric3 { get; set; }
+ /// <summary>
+ /// 鐢佃垂
+ /// </summary>
+ public double Money3 { get; set; }
+
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public double Electric4 { get; set; }
+ /// <summary>
+ /// 鐢佃垂
+ /// </summary>
+ public double Money4 { get; set; }
+
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public double Electric5 { get; set; }
+ /// <summary>
+ /// 鐢佃垂
+ /// </summary>
+ public double Money5 { get; set; }
+ }
/// <summary>
/// 鍒濆鏂规硶鑾峰彇鎵�鏈夋暟鎹�
/// </summary>
--
Gitblit v1.9.3