From c5136b7517998a076f1bd2e4abdda01decae8b6f Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 07 二月 2025 09:35:58 +0800
Subject: [PATCH] 问题修复
---
Calc/IStation.Calc.Model/AnaRequest.cs | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/Calc/IStation.Calc.Model/AnaRequest.cs b/Calc/IStation.Calc.Model/AnaRequest.cs
index c886f34..7e48087 100644
--- a/Calc/IStation.Calc.Model/AnaRequest.cs
+++ b/Calc/IStation.Calc.Model/AnaRequest.cs
@@ -1,4 +1,4 @@
-锘縰sing IStation.CalcModel;
+锘�
using System;
using System.Collections.Generic;
using System.Linq;
@@ -6,57 +6,49 @@
namespace IStation.CalcModel
{
- public class AnaRequest
+ public class AnaRequest: AnaRequestBase
{
- public eCalcOptType CalcOptType { get; set; }
- public DateTime StartTime { get; set; }
- public DateTime EndTime { get; set; }
+ public AnaRequest() { }
+ public AnaRequest(AnaRequestBase rhs):base(rhs) { }
+
+ //闀挎睙姘翠綅
public List<Model.TimeWaterLevel> WaterLevels闀挎睙 { get; set; }
- public int StartOpenCount { get; set; } = -1;
- public double? TotalFlowIn { get; set; }//鍗曚綅 鍚�
-
- public double CurrentWaterBoxLevel { get; set; }//褰撳墠姘村簱姘翠綅
- public double? MaxLimitWaterBoxLevel { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒�
- public string MaxLimitWaterBoxTime { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒舵椂闂�
-
- //public double ReservoirTotalFlow { get; set; }//鐢ㄦ按鎬婚噺 鍗曚綅 鍚�
- public List<double> ReservoirDropFlow { get; set; }//姘存睜鎺掓按鏃堕棿娴侀噺
- //public List<double?> ReservoirMinLimitHours { get; set; }
- //public List<double?> ReservoirMaxLimitHours { get; set; }
-
//鑷畾涔夌殑寮�鏈虹瓥鐣�
public List<CalcModel.PumpRunRange> ManuPrjTimeBlockList { get; set; }
}
public class AnaRequestBase
{
public AnaRequestBase() { }
- public AnaRequestBase(AnaRequest rhs) {
+ public AnaRequestBase(AnaRequestBase rhs)
+ {
this.CalcOptType = rhs.CalcOptType;
- this.StartTime = rhs.StartTime; this.EndTime = rhs.EndTime;
- this.StartOpenCount = rhs.StartOpenCount;
+ this.StartTime = rhs.StartTime;
+ this.EndTime = rhs.EndTime;
+ this.StartOpenPumpIndexArray = rhs.StartOpenPumpIndexArray;
+ this.IsKnownStartOpenPump = rhs.IsKnownStartOpenPump;
this.TotalFlowIn = rhs.TotalFlowIn;
- this.CurrentWaterBoxLevel = rhs.CurrentWaterBoxLevel;
- this.MaxLimitWaterBoxLevel = rhs.MaxLimitWaterBoxLevel;
- this.MaxLimitWaterBoxTime = rhs.MaxLimitWaterBoxTime;
+ this.StartReservoirLevel = rhs.StartReservoirLevel;
+ this.MaxReservoirLevel = rhs.MaxReservoirLevel;
+ this.MaxReservoirLevelTime = rhs.MaxReservoirLevelTime;
- this.ReservoirDropFlow = rhs.ReservoirDropFlow;
+ this.PerHourFlowOut = rhs.PerHourFlowOut;
//this.ReservoirMinLimitHours = rhs.ReservoirMinLimitHours;
//this.ReservoirMaxLimitHours = rhs.ReservoirMaxLimitHours;
}
public eCalcOptType CalcOptType { get; set; }
public DateTime StartTime { get; set; }
public DateTime EndTime { get; set; }
- public int StartOpenCount { get; set; } = -1;
- public double? TotalFlowIn { get; set; }//鍗曚綅 鍚�
+ public List<int> StartOpenPumpIndexArray { get; set; }//寮�濮嬫椂寮�鐨勬槸鍝簺鍑犲彴娉�
+ public bool IsKnownStartOpenPump { get; set; } //鏄惁鐭ラ亾鐭ラ亾寮�濮嬫椂鐨勫紑娉电姸鎬�
+ public double? TotalFlowIn { get; set; }//鍙栨按鎬婚噺 鍗曚綅(鍚�)
- public double CurrentWaterBoxLevel { get; set; }//褰撳墠姘村簱姘翠綅
- public double? MaxLimitWaterBoxLevel { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒�
- public string MaxLimitWaterBoxTime { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒舵椂闂�
+ public double StartReservoirLevel { get; set; }//褰撳墠姘村簱姘翠綅(鐢盋urrentWaterBoxLevel 鏀�)
- public List<double> ReservoirDropFlow { get; set; }//姘存睜鎺掓按鏃堕棿娴侀噺
- //public List<double?> ReservoirMinLimitHours { get; set; }
- //public List<double?> ReservoirMaxLimitHours { get; set; }
-
+ public double? MaxReservoirLevel { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒�
+ public string MaxReservoirLevelTime { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒舵椂闂�
+
+ public List<double> PerHourFlowOut { get; set; }//姘存睜鎺掓按鏃堕棿娴侀噺 鍗曚綅 鍚�
+
}
}
--
Gitblit v1.9.3