From 14725e33b8edeaa2235e01792c0440d79a0d9b83 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期三, 29 五月 2024 14:37:18 +0800
Subject: [PATCH] 更正
---
Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs | 287 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 154 insertions(+), 133 deletions(-)
diff --git a/Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs b/Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs
index 4b0719c..5ca6e6b 100644
--- a/Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs
+++ b/Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs
@@ -7,134 +7,150 @@
namespace IStation.Model
{
- /*
+ /// <summary>
+ /// 杩愯鍙傛暟
+ /// <summary>
+ public class PumpRunParasDays
+ {
/// <summary>
- /// 杩愯鍙傛暟
- /// <summary>
- public class PumpRunParasDays
- {
- /// <summary>
- /// 鍙栨按鎬婚噺
- /// </summary>
- public double TotalWater { get; set; }
- /// <summary>
- /// 鐢ㄧ數閲�
- /// </summary>
- public List<PumpTotalelectricity> Totalelectricity { get; set; }
- /// <summary>
- /// 涓�鍙锋车寮�鏈烘儏鍐�
- /// </summary>
- public PumpIsopen PumpRunTotalTime1 { get; set; }
- /// <summary>
- /// 浜屽彿娉靛紑鏈烘儏鍐�
- /// </summary>
- public PumpIsopen PumpRunTotalTime2 { get; set; }
- /// <summary>
- /// 涓夊彿娉靛紑鏈烘儏鍐�
- /// </summary>
- public PumpIsopen PumpRunTotalTime3 { get; set; }
- /// <summary>
- /// 鍥涘彿娉靛紑鏈烘儏鍐�
- /// </summary>
- public PumpIsopen PumpRunTotalTime4 { get; set; }
- /// <summary>
- /// 浜斿彿娉靛紑鏈烘儏鍐�
- /// </summary>
- public PumpIsopen PumpRunTotalTime5 { get; set; }
-
- }*/
-
- /* /// <summary>
- /// 娉靛紑鏈虹姸鎬�
+ /// 鍙栨按鎬婚噺
/// </summary>
- public class PumpIsopen
- {
- /// <summary>
- /// 鏍囩
- /// </summary>
- public string Tag { get; set; }
- /// <summary>
- /// 寮�鏈虹姸鎬�
- /// </summary>
- public List<IsOpen> Values { get; set; }
- }*/
+ public double TotalWater { get; set; }
- public class PumpTotalelectricity
- {
- /// <summary>
- /// 鏃堕棿
- /// </summary>
- public DateTime DateTime { get; set; }
- /// <summary>
- /// 鎬荤數鑳�
- /// </summary>
- public double value { get; set; }
- }
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public List<PumpTotalelectricity> Totalelectricity { get; set; }
-/* public class IsOpen
- {
- /// <summary>
- /// 鏃堕棿
- /// </summary>
- public DateTime DateTime { get; set; }
- /// <summary>
- /// 寮�鏈烘儏鍐�
- /// </summary>
- public string Isopen { get; set; }
- }*/
+ /// <summary>
+ /// 涓�鍙锋车寮�鏈烘儏鍐�
+ /// </summary>
+ public PumpIsopen PumpRunTotalTime1 { get; set; }
+
+ /// <summary>
+ /// 浜屽彿娉靛紑鏈烘儏鍐�
+ /// </summary>
+ public PumpIsopen PumpRunTotalTime2 { get; set; }
+
+ /// <summary>
+ /// 涓夊彿娉靛紑鏈烘儏鍐�
+ /// </summary>
+ public PumpIsopen PumpRunTotalTime3 { get; set; }
+
+ /// <summary>
+ /// 鍥涘彿娉靛紑鏈烘儏鍐�
+ /// </summary>
+ public PumpIsopen PumpRunTotalTime4 { get; set; }
+
+ /// <summary>
+ /// 浜斿彿娉靛紑鏈烘儏鍐�
+ /// </summary>
+ public PumpIsopen PumpRunTotalTime5 { get; set; }
+ }
+
+ /// <summary>
+ /// 娉靛紑鏈虹姸鎬�
+ /// </summary>
+ public class PumpIsopen
+ {
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public string Tag { get; set; }
+
+ /// <summary>
+ /// 寮�鏈虹姸鎬�
+ /// </summary>
+ public List<IsOpen> Values { get; set; }
+ }
+
+ public class PumpTotalelectricity
+ {
+ /// <summary>
+ /// 鏃堕棿
+ /// </summary>
+ public DateTime DateTime { get; set; }
+
+ /// <summary>
+ /// 鎬荤數鑳�
+ /// </summary>
+ public double value { get; set; }
+ }
+
+ public class IsOpen
+ {
+ /// <summary>
+ /// 鏃堕棿
+ /// </summary>
+ public DateTime DateTime { get; set; }
+
+ /// <summary>
+ /// 寮�鏈烘儏鍐�
+ /// </summary>
+ public string Isopen { get; set; }
+ }
//娉佃繍琛屽弬鏁�
- public class RunParasData
- {
- /// <summary>
- /// 鏁版嵁鏃ユ湡
- /// </summary>
- public DateTime DateTime { get; set; }
- /// <summary>
- /// 娉佃繍琛岀姸鎬�
- /// </summary>
- public List<RunParasBlock> Pump1 { get; set; }
- public List<RunParasBlock> Pump2 { get; set; }
- public List<RunParasBlock> Pump3 { get; set; }
- public List<RunParasBlock> Pump4 { get; set; }
- public List<RunParasBlock> Pump5 { get; set; }
- /// <summary>
- /// 鎬诲彇姘撮噺
- /// </summary>
- public double FlowIn { get; set; }
- /// <summary>
- /// 鎬荤敤鐢甸噺
- /// </summary>
- public double Electric { get; set; }
- /// <summary>
- /// 鎬荤數璐�
- /// </summary>
- public double Money { get; set; }
- }
+ public class RunParasData
+ {
+ /// <summary>
+ /// 鏁版嵁鏃ユ湡
+ /// </summary>
+ public DateTime DateTime { get; set; }
- public class RunParasBlock
- {
- /// <summary>
- /// 寮�濮嬫椂闂�
- /// </summary>
- public DateTime StartTime { get; set; }
- /// <summary>
- /// 缁撴潫鏃堕棿
- /// </summary>
- public DateTime EndTime { get; set; }
- /// <summary>
- /// 鍙栨按閲�
- /// </summary>
- public double FlowIn { get; set; }
- /// <summary>
- /// 鐢ㄧ數閲�
- /// </summary>
- public double Electric { get; set; }
- /// <summary>
- /// 鐢佃垂
- /// </summary>
- public double Money { get; set; }
- }
+ /// <summary>
+ /// 娉佃繍琛岀姸鎬�
+ /// </summary>
+ public List<RunParasBlock> Pump1 { get; set; }
+
+ public List<RunParasBlock> Pump2 { get; set; }
+ public List<RunParasBlock> Pump3 { get; set; }
+ public List<RunParasBlock> Pump4 { get; set; }
+ public List<RunParasBlock> Pump5 { get; set; }
+
+ /// <summary>
+ /// 鎬诲彇姘撮噺
+ /// </summary>
+ public double FlowIn { get; set; }
+
+ /// <summary>
+ /// 鎬荤敤鐢甸噺
+ /// </summary>
+ public double Electric { get; set; }
+
+ /// <summary>
+ /// 鎬荤數璐�
+ /// </summary>
+ public double Money { get; set; }
+ }
+
+ public class RunParasBlock
+ {
+ /// <summary>
+ /// 寮�濮嬫椂闂�
+ /// </summary>
+ public DateTime StartTime { get; set; }
+
+ /// <summary>
+ /// 缁撴潫鏃堕棿
+ /// </summary>
+ public DateTime EndTime { get; set; }
+
+ /// <summary>
+ /// 鍙栨按閲�
+ /// </summary>
+ public double FlowIn { get; set; }
+
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public double Electric { get; set; }
+
+ /// <summary>
+ /// 鐢佃垂
+ /// </summary>
+ public double Money { get; set; }
+ }
/// <summary>
///鍙栨按閲�
@@ -145,65 +161,70 @@
/// 鏃堕棿
/// </summary>
public DateTime DateTime { get; set; }
+
/// <summary>
/// 鐬椂娴侀噺
/// </summary>
public double TotalWater { get; set; }
+
/// <summary>
/// 鏈夊姛鍔熺巼
/// </summary>
public double TotalEle { get; set; }
}
-
-
#region 渚涙按鎵�闇�绫�
+
public class OutList
{
- public DateTime DateTime { get; set; }
- public List<Model.PumpOutWater> pumpOutWater { get; set; }
+ public DateTime DateTime { get; set; }
+ public List<Model.PumpOutWater> pumpOutWater { get; set; }
}
-
+
public class OutTotalOneDayList
{
public DateTime DateTime { get; set; }
- public List<Model.TotalOneDay> pumpOutWater { get; set; }
+ public List<Model.SSAData> pumpOutWater { get; set; }
}
- public class TotalOneDay
+ public class SSAData
{
public DateTime DateTime { get; set; }
- public double Total { get; set; }
+ public double Total { get; set; }
}
-
+
public class PumpOutWater
{
/// <summary>
/// 鏃堕棿
/// </summary>
public DateTime DateTime { get; set; }
+
/// <summary>
///浜岃緭姘�2400
/// </summary>
public double Out2400 { get; set; }
+
/// <summary>
/// 浜岃緭姘�2700
/// </summary>
public double Out2700 { get; set; }
+
/// <summary>
/// 涓�杈撴按鍢夊畾涓�绾�
/// </summary>
public double OutLine1 { get; set; }
+
/// <summary>
/// 涓�杈撴按鍢夊畾浜岀嚎
/// </summary>
public double OutLine2 { get; set; }
+
/// <summary>
/// 涓�杈撴按鍢夊畾涓夌嚎
/// </summary>
public double OutLine3 { get; set; }
}
- #endregion
-}
-
+ #endregion 渚涙按鎵�闇�绫�
+}
\ No newline at end of file
--
Gitblit v1.9.3