From 0e6a1b0840fd64f8ab75f88aba3a1ca3ef4e884b Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 11 六月 2024 11:05:04 +0800
Subject: [PATCH] 成行 AnaProject.db 数据库表中增加4列, StartOpenPumpIndexs , EndOpenPumpIndexs ,StartReservoirLevel,EndReservoirLevel 都是 TEXT
---
Calc/IStation.Calc.Core/计算基类/ErQuCalcBaseHelper.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper.cs" "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper.cs"
index fb985a8..a17ef62 100644
--- "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper.cs"
+++ "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper.cs"
@@ -14,21 +14,21 @@
/// <returns></returns>
public static IStation.Calc.ErQuCalcBaseHelper Build(IStation.CalcModel.AnaRequest anaRequest)
{
- if (anaRequest.MaxLimitWaterBoxLevel != null)
+ if (anaRequest.MaxReservoirLevel != null)
{
- DateTime? limit_time = GetMaxLimitWaterBoxTime(anaRequest);
+ DateTime? limit_time = GetMaxReservoirLevelTime(anaRequest);
if (limit_time == null)
{
var calc = new IStation.Calc.ErQuCalcHelper_2_閫掑綊_瀹氭按浣峗浠绘剰鏃堕棿();
- calc.SetMaxReservoirHeight(anaRequest.MaxLimitWaterBoxLevel.Value);
+ calc.SetMaxReservoirHeight(anaRequest.MaxReservoirLevel.Value);
return calc;
}
else
{
var calc = new IStation.Calc.ErQuCalcHelper_2_閫掑綊_瀹氭按浣峗鎸囧畾鏃堕棿();
- calc.SetMaxReservoirHeight(anaRequest.MaxLimitWaterBoxLevel.Value, limit_time.Value);
+ calc.SetMaxReservoirHeight(anaRequest.MaxReservoirLevel.Value, limit_time.Value);
return calc;
}
}
@@ -39,23 +39,23 @@
}
- private static DateTime? GetMaxLimitWaterBoxTime(IStation.CalcModel.AnaRequest anaRequest)
+ private static DateTime? GetMaxReservoirLevelTime(IStation.CalcModel.AnaRequest anaRequest)
{
- if (string.IsNullOrEmpty(anaRequest.MaxLimitWaterBoxTime))
+ if (string.IsNullOrEmpty(anaRequest.MaxReservoirLevelTime))
{
return null;
}
DateTime time;
- if (DateTime.TryParse(anaRequest.MaxLimitWaterBoxTime, out time))
+ if (DateTime.TryParse(anaRequest.MaxReservoirLevelTime, out time))
{
return time;
}
- if (anaRequest.MaxLimitWaterBoxTime.Contains(":"))
+ if (anaRequest.MaxReservoirLevelTime.Contains(":"))
{
- var sss = anaRequest.MaxLimitWaterBoxTime.Split(':');
+ var sss = anaRequest.MaxReservoirLevelTime.Split(':');
if (sss.Count() == 2)
{
int hour = 0;
@@ -72,7 +72,7 @@
else
{
int hour = 0;
- if (int.TryParse(anaRequest.MaxLimitWaterBoxTime, out hour))
+ if (int.TryParse(anaRequest.MaxReservoirLevelTime, out hour))
{
if (hour < anaRequest.StartTime.Hour)
return new DateTime(anaRequest.EndTime.Year, anaRequest.EndTime.Month, anaRequest.EndTime.Day, hour, 0, 0);
@@ -130,7 +130,7 @@
/// <param name="anaRequest"></param>
public void SetAnaRequest(IStation.CalcModel.AnaRequest anaRequest)
{
- this._start_level姘村簱姘翠綅 = anaRequest.CurrentWaterBoxLevel;
+ this._start_level姘村簱姘翠綅 = anaRequest.StartReservoirLevel;
this._clacOptType = anaRequest.CalcOptType;
if(anaRequest.IsKnownStartOpenPump)
--
Gitblit v1.9.3