From 18a1a6faf82b1ad00d27f6fc7f5734c34aea32df Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期五, 07 六月 2024 15:30:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/shys/ChEqCalc.V1.3
---
WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile1.pubxml | 13
WebApi/Controllers/PumpRunController.cs | 2
WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10
WaterPredict/IStation.ChEr.WebApi.Predict/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile2.pubxml.user | 10
WaterPredict/IStation.ChEr.WebApi.Predict/任务/PredictCronJobHelper.cs | 16
WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile2.pubxml | 13
WebApi/Data/History/2024-05/2024-05-31 01.xml | 1586 +++++++++++++++++++++++++++++++++++++++++++++
WaterPredict/IStation.ChEr.WebApi.Predict/任务/CalcWaterPredictJob.cs | 30
WaterPredict/IStation.ChEr.WebApi.Predict/IStation.ChEr.WebApi.Predict.csproj.user | 6
WebApi/Logs/Tests/20240530.txt | 0
WebApi/众毅调度/ZyConnectHelper.cs | 33
WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
WaterPredict/IStation.ChEr.Application.WaterPredict/02-predict/ConnectHelper.cs | 4
WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs | 76 +-
WebApi/Logs/Tests/20240531.txt | 0
WebApi/Web.config | 4
WebApi/Controllers/ZyPrjController.cs | 45
WebApi/Data/AnaProject.db | 0
WebApi/Logs/error.log | 37 +
WebApi/IStation.ChEr.WebApi.csproj.user | 2
WebApi/Logs/info.log | 116 +++
WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 32
WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/IStation.ChEr.TopShelf.WaterPredict.Core.csproj.user | 2
WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs | 3
25 files changed, 1,926 insertions(+), 118 deletions(-)
diff --git a/WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs b/WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs
index 44db11c..7175637 100644
--- a/WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs
+++ b/WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs
@@ -32,44 +32,44 @@
}
}
bll.Inserts(waterPredictRecord);*/
- /* List<SSAData> sSADatas = new List<SSAData>();
- var path = "C:\\Users\\ZKC\\Desktop\\宸ヤ綔绨縩ow.csv";
- int totalLines = File.ReadLines(path, Encoding.GetEncoding("gb2312")).Count();//鎬昏鏁�
- System.IO.FileStream fs = new System.IO.FileStream(path, System.IO.FileMode.Open);
- System.IO.StreamReader sr = new System.IO.StreamReader(fs, Encoding.GetEncoding("gb2312"));
- string tempText;
- // int line = 0;
- double total = 0;
- for (int i = 0; i < totalLines; i++)
- {
- tempText = sr.ReadLine();
- string[] arr = tempText.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
- if (Convert.ToDateTime(arr[0]).Minute == 0)
- {
- sSADatas.Add(new SSAData { DateTime = Convert.ToDateTime(arr[0]), Total = Convert.ToDouble(arr[1]) });
- }
- }
- var nee = new List<WaterPredictRecord>();
- double lastValue = 1;
- foreach (var item in sSADatas)
- {
- if (item.DateTime.Minute == 0)
- {
- if (lastValue != 1)
- {
- int historyhour = int.Parse(string.Format("{0:00}{1:00}{2:00}", item.DateTime.Month, item.DateTime.Day, item.DateTime.Hour));
- nee.Add(new WaterPredictRecord() { DayHour = historyhour, RealTotalValue = item.Total, RealDifferenceValue = item.Total - lastValue });
- lastValue = item.Total;
- }
- else
- {
- int historyhour = int.Parse(string.Format("{0:00}{1:00}{2:00}", item.DateTime.Month, item.DateTime.Day, item.DateTime.Hour));
- nee.Add(new WaterPredictRecord() { DayHour = historyhour, RealTotalValue = item.Total, RealDifferenceValue = 0 });
- lastValue = item.Total;
- }
- }
- }
- bll.Inserts(nee);*/
+ List<SSAData> sSADatas = new List<SSAData>();
+ /* var path = "C:\\Users\\ZKC\\Desktop\\宸ow.csv";
+ int totalLines = File.ReadLines(path, Encoding.GetEncoding("gb2312")).Count();//鎬昏鏁�
+ System.IO.FileStream fs = new System.IO.FileStream(path, System.IO.FileMode.Open);
+ System.IO.StreamReader sr = new System.IO.StreamReader(fs, Encoding.GetEncoding("gb2312"));
+ string tempText;
+ // int line = 0;
+ double total = 0;
+ for (int i = 0; i < totalLines; i++)
+ {
+ tempText = sr.ReadLine();
+ string[] arr = tempText.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+ if (Convert.ToDateTime(arr[0]).Minute == 0)
+ {
+ sSADatas.Add(new SSAData { DateTime = Convert.ToDateTime(arr[0]), Total = Convert.ToDouble(arr[1]) });
+ }
+ }
+ var nee = new List<WaterPredictRecord>();
+ double lastValue = 1;
+ foreach (var item in sSADatas)
+ {
+ if (item.DateTime.Minute == 0)
+ {
+ if (lastValue != 1)
+ {
+ int historyhour = int.Parse(string.Format("{0:00}{1:00}{2:00}", item.DateTime.Month, item.DateTime.Day, item.DateTime.Hour));
+ nee.Add(new WaterPredictRecord() { DayHour = historyhour, RealTotalValue = item.Total, RealDifferenceValue = item.Total - lastValue });
+ lastValue = item.Total;
+ }
+ else
+ {
+ int historyhour = int.Parse(string.Format("{0:00}{1:00}{2:00}", item.DateTime.Month, item.DateTime.Day, item.DateTime.Hour));
+ nee.Add(new WaterPredictRecord() { DayHour = historyhour, RealTotalValue = item.Total, RealDifferenceValue = 0 });
+ lastValue = item.Total;
+ }
+ }
+ }
+ bll.Inserts(nee);*/
double lastValue = 1;
var historylist = new List<WaterPredictRecord>();
var historydata = ConnectHelper.GetByPumpOneDayWaterData(DateTime.Today.AddDays(-15), DateTime.Today, "1h");
diff --git a/WaterPredict/IStation.ChEr.Application.WaterPredict/02-predict/ConnectHelper.cs b/WaterPredict/IStation.ChEr.Application.WaterPredict/02-predict/ConnectHelper.cs
index 3c70b04..e26936c 100644
--- a/WaterPredict/IStation.ChEr.Application.WaterPredict/02-predict/ConnectHelper.cs
+++ b/WaterPredict/IStation.ChEr.Application.WaterPredict/02-predict/ConnectHelper.cs
@@ -89,9 +89,9 @@
{
// string apiServiceUrl = System.Configuration.ConfigurationManager.AppSettings["ApiServiceUrl"];
- string apiServiceUrl = "http://192.168.21.14:86/";
+ string apiServiceUrl = "http://192.168.21.14:86";
// var apiServiceUrl = System.Configuration.ConfigurationManager.AppSettings["APiServerUrl"];
- string url = string.Format(@"{0}/PumpRun/GetPumpHistoryData?startday={1}&endday={2}&resolution ={3}", apiServiceUrl, starttime, endtime, resolution);
+ string url = string.Format(@"{0}/PumpRun/GetPumpHistoryData?startday={1}&endday={2}&resolution={3}", apiServiceUrl, starttime, endtime, resolution);
string Accept = "application/json";
//鍒涘缓Web璁块棶瀵硅薄
HttpWebRequest myRequest = (HttpWebRequest)WebRequest.Create(url);
diff --git a/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs b/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs
index 65a8131..1a0c570 100644
--- a/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs
+++ b/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs
@@ -103,8 +103,9 @@
t.LastPredictTime = DateTime.Now;
t.PredictValueList = model.PredictValueList;
t.BakData = model.BakData;
+ t.States = model.States;
t.Description = model.Description;
- db.Updateable<Entity.WaterPredictRecord>(t).UpdateColumns(t => new { t.LastPredictValue, t.LastPredictTime, t.PredictValueList, t.Description, t.BakData }).Where(t => t.ID == model.ID).ExecuteCommand();
+ db.Updateable<Entity.WaterPredictRecord>(t).UpdateColumns(t => new { t.LastPredictValue, t.LastPredictTime, t.PredictValueList, t.Description, t.BakData, t.States }).Where(t => t.ID == model.ID).ExecuteCommand();
}
}
}
diff --git a/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/IStation.ChEr.TopShelf.WaterPredict.Core.csproj.user b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/IStation.ChEr.TopShelf.WaterPredict.Core.csproj.user
index e735ad6..26a0322 100644
--- a/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/IStation.ChEr.TopShelf.WaterPredict.Core.csproj.user
+++ b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/IStation.ChEr.TopShelf.WaterPredict.Core.csproj.user
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_LastSelectedProfileId>D:\WorkData\IStation\ChEqCalc.V1.3\WaterPredict\IStation.ChEr.TopShelf.WaterPredict.Core\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+ <_LastSelectedProfileId>D:\WorkData\IStation\ChEqCalc.V1.3\WaterPredict\IStation.ChEr.TopShelf.WaterPredict.Core\Properties\PublishProfiles\FolderProfile2.pubxml</_LastSelectedProfileId>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile.pubxml.user b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
index 9283249..d303407 100644
--- a/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-05-20T17:05:20.8236058Z;True|2024-05-20T23:26:57.0878945+08:00;True|2024-05-20T23:26:28.6716557+08:00;True|2024-05-15T14:18:40.7142654+08:00;True|2024-05-15T14:15:49.2250423+08:00;True|2024-05-15T14:09:11.4946274+08:00;True|2024-05-15T11:37:21.9116952+08:00;True|2024-05-15T11:33:38.0639947+08:00;True|2024-05-14T18:15:50.0521573+08:00;</History>
+ <History>True|2024-05-30T09:08:45.5257461Z;True|2024-05-30T17:08:10.6799090+08:00;True|2024-05-30T17:05:23.7686870+08:00;True|2024-05-30T17:02:17.2979765+08:00;True|2024-05-30T17:00:44.1153108+08:00;True|2024-05-30T16:56:45.5350700+08:00;True|2024-05-30T16:53:26.9930215+08:00;True|2024-05-30T16:29:28.5278396+08:00;True|2024-05-30T16:28:22.7204766+08:00;True|2024-05-30T15:57:57.2817642+08:00;True|2024-05-30T15:49:15.7586780+08:00;True|2024-05-30T15:40:27.5985409+08:00;True|2024-05-30T15:37:11.7249949+08:00;True|2024-05-30T15:37:02.8121961+08:00;True|2024-05-30T15:33:39.7726269+08:00;True|2024-05-30T15:30:17.1345479+08:00;True|2024-05-31T02:10:18.5988243+08:00;True|2024-05-31T02:07:04.1647778+08:00;True|2024-05-31T01:32:09.7513779+08:00;True|2024-05-30T00:55:36.4063404+08:00;True|2024-05-30T00:05:47.1465108+08:00;True|2024-05-30T00:01:28.6809343+08:00;True|2024-05-29T23:34:47.9809437+08:00;True|2024-05-29T23:27:19.4365830+08:00;True|2024-05-29T23:23:41.7181441+08:00;True|2024-05-29T23:21:40.8425970+08:00;True|2024-05-29T23:20:54.2042345+08:00;True|2024-05-29T23:18:33.0597513+08:00;True|2024-05-29T23:15:16.5702896+08:00;True|2024-05-29T23:10:21.7498941+08:00;True|2024-05-29T23:07:36.2659955+08:00;True|2024-05-29T23:06:42.3732085+08:00;True|2024-05-21T01:05:20.8236058+08:00;True|2024-05-20T23:26:57.0878945+08:00;True|2024-05-20T23:26:28.6716557+08:00;True|2024-05-15T14:18:40.7142654+08:00;True|2024-05-15T14:15:49.2250423+08:00;True|2024-05-15T14:09:11.4946274+08:00;True|2024-05-15T11:37:21.9116952+08:00;True|2024-05-15T11:33:38.0639947+08:00;True|2024-05-14T18:15:50.0521573+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile1.pubxml b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile1.pubxml
new file mode 100644
index 0000000..513f371
--- /dev/null
+++ b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -0,0 +1,13 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <Configuration>Release</Configuration>
+ <Platform>Any CPU</Platform>
+ <PublishDir>C:\Users\ZKC\Desktop</PublishDir>
+ <PublishProtocol>FileSystem</PublishProtocol>
+ <_TargetId>Folder</_TargetId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile1.pubxml.user
new file mode 100644
index 0000000..f84a92e
--- /dev/null
+++ b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -0,0 +1,10 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <History>True|2024-05-30T09:09:19.7374494Z;</History>
+ <LastFailureDetails />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile2.pubxml b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile2.pubxml
new file mode 100644
index 0000000..2957375
--- /dev/null
+++ b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile2.pubxml
@@ -0,0 +1,13 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <Configuration>Release</Configuration>
+ <Platform>Any CPU</Platform>
+ <PublishDir>C:\Users\ZKC\Desktop\plush</PublishDir>
+ <PublishProtocol>FileSystem</PublishProtocol>
+ <_TargetId>Folder</_TargetId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile2.pubxml.user
new file mode 100644
index 0000000..c6a96f0
--- /dev/null
+++ b/WaterPredict/IStation.ChEr.TopShelf.WaterPredict.Core/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -0,0 +1,10 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <History>True|2024-05-30T13:59:08.2455401Z;True|2024-05-30T21:58:19.3234045+08:00;True|2024-05-30T21:57:30.3444112+08:00;True|2024-05-30T21:46:41.5809632+08:00;True|2024-05-30T21:44:31.2092288+08:00;True|2024-05-30T21:39:40.9872627+08:00;True|2024-06-01T17:23:23.5735421+08:00;True|2024-06-01T17:21:46.2076474+08:00;True|2024-06-01T17:20:10.3017359+08:00;True|2024-06-01T17:18:16.6449135+08:00;True|2024-06-01T17:18:02.6749261+08:00;True|2024-06-01T17:16:51.6629440+08:00;True|2024-06-01T17:11:32.9349239+08:00;True|2024-06-01T17:11:23.0294296+08:00;True|2024-05-30T17:10:44.0968822+08:00;True|2024-05-30T17:10:32.6735967+08:00;</History>
+ <LastFailureDetails />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.WebApi.Predict/IStation.ChEr.WebApi.Predict.csproj.user b/WaterPredict/IStation.ChEr.WebApi.Predict/IStation.ChEr.WebApi.Predict.csproj.user
new file mode 100644
index 0000000..98527a1
--- /dev/null
+++ b/WaterPredict/IStation.ChEr.WebApi.Predict/IStation.ChEr.WebApi.Predict.csproj.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_LastSelectedProfileId>D:\WorkData\IStation\ChEqCalc.V1.3\WaterPredict\IStation.ChEr.WebApi.Predict\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.WebApi.Predict/Properties/PublishProfiles/FolderProfile.pubxml.user b/WaterPredict/IStation.ChEr.WebApi.Predict/Properties/PublishProfiles/FolderProfile.pubxml.user
index ea40fb1..112f8f5 100644
--- a/WaterPredict/IStation.ChEr.WebApi.Predict/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WaterPredict/IStation.ChEr.WebApi.Predict/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project>
<PropertyGroup>
- <History>True|2024-04-02T01:53:16.9900141Z;</History>
+ <History>True|2024-06-01T09:16:30.5084533Z;True|2024-04-02T09:53:16.9900141+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/WaterPredict/IStation.ChEr.WebApi.Predict/\344\273\273\345\212\241/CalcWaterPredictJob.cs" "b/WaterPredict/IStation.ChEr.WebApi.Predict/\344\273\273\345\212\241/CalcWaterPredictJob.cs"
index dbca213..cce8e46 100644
--- "a/WaterPredict/IStation.ChEr.WebApi.Predict/\344\273\273\345\212\241/CalcWaterPredictJob.cs"
+++ "b/WaterPredict/IStation.ChEr.WebApi.Predict/\344\273\273\345\212\241/CalcWaterPredictJob.cs"
@@ -33,19 +33,20 @@
/// <returns></returns>
public Task Execute(IJobExecutionContext context)
{
+ LogHelper.Info(DateTime.Now.ToString());
if (DateTime.Now.Hour == 0 && DateTime.Now.Minute == 5)
{
insert2daysPredictData();
}
var TodayRealdataList = ConnectHelper.GetByPumpOneDayWaterData(DateTime.Today, DateTime.Today.AddDays(1), "1h").Where(x => x.DateTime.Hour <= DateTime.Now.Hour).ToList();
//鑾峰彇褰撳墠鏃ユ湡鍓嶄粖澶╃殑鎵�鏈夊��
- LogHelper.Info("宸叉壘鍒板綋鍓嶆椂闂村墠鎵�鏈夋暟鎹�");
- // int dayHour = int.Parse(string.Format("{0:00}{1:00}{2:00}", DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour));
- int dayHour = WaterPredictRecord.ConvertIntDay(DateTime.Today);
+ int dayHour = WaterPredictRecord.ConvertIntDay(DateTime.Now);
var TwoDaysList = _bll.GetEnd2Days(300);
+ LogHelper.Info("2");
var select = TwoDaysList.Where(x => x.DayHour == dayHour).FirstOrDefault();
if (TodayRealdataList != null)
{
+ LogHelper.Info("宸叉壘鍒板綋鍓嶆椂闂村墠鎵�鏈夋暟鎹�");
if (TodayRealdataList.Last().DateTime.Hour == DateTime.Now.Hour && select != null)
{
try
@@ -77,7 +78,7 @@
else
{
select.RealTotalValue = TodayRealdataList.Last().Total;
- select.RealDifferenceValue = TodayRealdataList.Last().Total - _bll.GetEnd2Days(24).Last().RealTotalValue;
+ select.RealDifferenceValue = TodayRealdataList.Last().Total - _bll.GetEnd2Days(240).Where(x => x.DayHour == WaterPredictRecord.ConvertIntDay(DateTime.Now.AddHours(-1))).Last().RealTotalValue;
if (select.RealDifferenceValue == 0 || select.RealDifferenceValue < 0)
{
if (PredictHelper.IsOpenState())
@@ -107,6 +108,16 @@
// LogHelper.Info("鏈兘浠庝紬姣呭彇鍒扮湡瀹炴暟鎹�,鏃堕棿:" + DateTime.Now.ToString());
}
}
+ else
+ {
+ select.RealTotalValue = 0;
+ select.States = 0;
+ select.RealDifferenceValue = 60000;
+ select.Description = "鍙栧埌鐨勬暟鎹笌褰撳墠鏃堕棿涓嶅尮閰�,鎴栨壘涓嶅埌涓庡綋鍓嶆椂闂村尮閰嶇殑棰勬祴鍊�";
+ var ErrorBakData = ConnectHelper.GetByPumpOneDayWaterData(DateTime.Today, DateTime.Today.AddDays(1), "300s").Where(x => x.DateTime.Hour <= DateTime.Now.Hour).ToList(); //鑾峰彇褰撳墠鏃ユ湡鍓嶄粖澶╃殑鎵�鏈夊��
+ select.BakData = JsonHelper.Object2Json(ErrorBakData);
+ _bll.Update(select);
+ }
}
else
{
@@ -122,7 +133,6 @@
var beforeTwoDays = _bll.GetEnd2Days(350);
var beforedata = beforeTwoDays.Where(x => x.DayHour <= dayHour).Take(240).ToList();
-
List<Tuple<DateTime, double>> tupleList = beforedata
.Select(input =>
{
@@ -142,7 +152,12 @@
{
currentdata[i].Description = "棰勬祴鏁版嵁鍋忓樊杩囧ぇ";
var ErrorBakData = ConnectHelper.GetByPumpOneDayWaterData(DateTime.Today, DateTime.Today.AddDays(1), "300s").Where(x => x.DateTime.Hour <= DateTime.Now.Hour).ToList(); //鑾峰彇褰撳墠鏃ユ湡鍓嶄粖澶╃殑鎵�鏈夊��
- select.BakData = JsonHelper.Object2Json(ErrorBakData);
+ currentdata[i].BakData = JsonHelper.Object2Json(ErrorBakData);
+ currentdata[i].States = 0;
+ }
+ else
+ {
+ currentdata[i].States = 1;
}
currentdata[i].LastPredictTime = DateTime.Now;
currentdata[i].PredictValueList = currentdata[i].LastPredictValue.ToString() + "," + currentdata[i].PredictValueList;
@@ -181,11 +196,12 @@
list[i].LastPredictTime = DateTime.Now;
list[i].LastPredictValue = Math.Round(predictdata[i].Total, 0);
list[i].PredictValueList = list[i].LastPredictValue.ToString() + "," + list[i].PredictValueList;
+ list[i].States = 1;
}
else
{
int dayHour = int.Parse(string.Format("{0:00}{1:00}{2:00}", predictdata[i].DateTime.Month, predictdata[i].DateTime.Day, predictdata[i].DateTime.Hour));
- list.Add(new WaterPredictRecord { DayHour = dayHour, PredictTime = DateTime.Now, LastPredictValue = Math.Round(predictdata[i].Total, 0) });
+ list.Add(new WaterPredictRecord { DayHour = dayHour, PredictTime = DateTime.Now, LastPredictValue = Math.Round(predictdata[i].Total, 0), States = 1 });
}
}
_bll.BatSet(list);
diff --git "a/WaterPredict/IStation.ChEr.WebApi.Predict/\344\273\273\345\212\241/PredictCronJobHelper.cs" "b/WaterPredict/IStation.ChEr.WebApi.Predict/\344\273\273\345\212\241/PredictCronJobHelper.cs"
index 8d5e2e7..c57725d 100644
--- "a/WaterPredict/IStation.ChEr.WebApi.Predict/\344\273\273\345\212\241/PredictCronJobHelper.cs"
+++ "b/WaterPredict/IStation.ChEr.WebApi.Predict/\344\273\273\345\212\241/PredictCronJobHelper.cs"
@@ -36,16 +36,16 @@
// 4.鍒涘缓Trigger
var trigger = TriggerBuilder.Create()
.WithIdentity(_triggerName, _jobGroup)
- .WithCronSchedule("0 33 0/1 * * ? ")//"0 32 0/1 * * ? "
+ .WithCronSchedule("0 05 0/1 * * ? ")//"0 32 0/1 * * ? "
.Build();
- /* //4.鍒涘缓Trigger
- var trigger = TriggerBuilder.Create()
- .WithIdentity(_triggerName, _jobGroup)
- .WithSimpleSchedule(x => x.WithIntervalInSeconds(2)
- .RepeatForever().WithMisfireHandlingInstructionNextWithRemainingCount())
- .Build();
-*/
+ /* //4.鍒涘缓Trigger
+ var trigger = TriggerBuilder.Create()
+ .WithIdentity(_triggerName, _jobGroup)
+ .WithSimpleSchedule(x => x.WithIntervalInSeconds(10)
+ .RepeatForever().WithMisfireHandlingInstructionNextWithRemainingCount())
+ .Build();*/
+
//5.鍔犲叆璋冨害绠＄悊鍣�
await _sched.ScheduleJob(job, trigger);
}
diff --git a/WebApi/Controllers/PumpRunController.cs b/WebApi/Controllers/PumpRunController.cs
index 99c17b3..13264f8 100644
--- a/WebApi/Controllers/PumpRunController.cs
+++ b/WebApi/Controllers/PumpRunController.cs
@@ -103,7 +103,7 @@
{
var PumpTotalElecty = await ZyConnectHelper.GetPumpTotalElectricity(d, d); //鑾峰彇鏌愭鏃堕棿鐨勭敤鐢甸噺
var PumpState = await ZyConnectHelper.GetPumpOpenStatusBySingleDay(d); //鑾峰彇娉电殑寮�鏈烘儏鍐�
- var TotalWater = await ZyConnectHelper.GetTotalWaterByDayTimeRange_In(d, d); //鍙栨按閲�
+ var TotalWater = await ZyConnectHelper.GetTotalWaterByDayTimeRange_In(d.AddDays(-1), d); //鍙栨按閲�
/* PumpHistoryDataFileHelper pumpHistoryDataFileHelper=new PumpHistoryDataFileHelper();
var TotalWater = pumpHistoryDataFileHelper.GetAllWaterData();
diff --git a/WebApi/Controllers/ZyPrjController.cs b/WebApi/Controllers/ZyPrjController.cs
index bb7de69..6cc8eae 100644
--- a/WebApi/Controllers/ZyPrjController.cs
+++ b/WebApi/Controllers/ZyPrjController.cs
@@ -56,6 +56,7 @@
[HttpPost]
public IStation.Dto.ApiResult Calc([FromBody] ZyPrjRequest request)
{
+ LogHelper.Info(JsonHelper.Object2Json(request));
if (request == null)
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "request is null" };
@@ -92,31 +93,25 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏃堕棿鑼冨洿閿欒,涓嶈兘瓒呰繃24灏忔椂" };
}
-
-
-
-
-
IStation.CalcModel.AnaRequest anaRequest = new AnaRequest();
anaRequest.CalcOptType = (eCalcOptType)IStation.AnaGlobalParas.Setting.OptSortType;
anaRequest.StartTime = start_timme;
anaRequest.EndTime = end_timme;
anaRequest.WaterLevels闀挎睙 = GetTide3Day(start_timme);
-
if (string.IsNullOrEmpty(request.TotalFlowIn))
{
if (string.IsNullOrEmpty(request.MaxReservoirLevel))
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�",
- start_timme, end_timme ));
+ start_timme, end_timme));
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�" };
}
}
else
{
double TotalFlowIn = 0;
- if(!double.TryParse( request.TotalFlowIn,out TotalFlowIn))
+ if (!double.TryParse(request.TotalFlowIn, out TotalFlowIn))
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 娉ㄦ剰鍙栨按鎬婚噺鍗曚綅鏄惃,褰撳墠鍙傛暟鍙傛暟杩囧皬",
start_timme, end_timme));
@@ -134,9 +129,9 @@
if (!string.IsNullOrEmpty(request.MaxReservoirLevel))
{
anaRequest.MaxLimitWaterBoxLevel = Convert.ToDouble(request.MaxReservoirLevel);
-
IStation.DAL.WaterPredictRecord dal = new DAL.WaterPredictRecord();
- var water_records = dal.GetByHourRangle( start_timme , end_timme );
+ var water_records = dal.GetByHourRangle(start_timme, end_timme);
+ LogHelper.Info(water_records.Count.ToString());
if (water_records == null)
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 姘翠綅棰勬祴鏁版嵁涓虹┖,璇峰厛淇濇寔姘翠綅棰勬祴鏈嶅姟姝ｅ父杩愯",
@@ -150,28 +145,26 @@
start_timme, end_timme));
return new IStation.Dto.ApiResult<string>() { Code = ApiResultCode.Error, Data = "棰勬祴鏁版嵁鑾峰彇澶辫触,鏁版嵁鏉℃棤娉曞尮閰�, 妫�鏌ユ槸鍚﹂娴嬫湇鍔′腑鏂�" };
}
-
+
anaRequest.SpaceFlowOut = new List<double>();
- foreach(var r in water_records)
+ foreach (var r in water_records)
{
- if(r.States == 0)
+ if (r.States == 0)
{
var error_info11 = string.Format("棰勬祴鏁版嵁寮傚父,鏃犳硶杩涜姘翠綅璁＄畻:{0} {1},{2}", r.DayHour, r.LastPredictValue, r.Description);
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , {2}}",
start_timme, end_timme, error_info11));
- return new IStation.Dto.ApiResult<string>() { Code = ApiResultCode.Error, Data = error_info11
+ return new IStation.Dto.ApiResult<string>()
+ {
+ Code = ApiResultCode.Error,
+ Data = error_info11
};
}
- anaRequest.SpaceFlowOut.Add(r.LastPredictValue/10000);
+ anaRequest.SpaceFlowOut.Add(r.LastPredictValue / 10000);
}
}
-
if (!string.IsNullOrEmpty(request.MaxReservoirLevelTime))
anaRequest.MaxLimitWaterBoxTime = request.MaxReservoirLevelTime;
-
-
-
-
//
if (request.StartOpenCount == null)
{
@@ -192,22 +185,19 @@
anaRequest.CurrentWaterBoxLevel = ZyConnectHelper.GetRealReservoirWaterLevel();
}
-
-
-
-
var calcHelper = new IStation.CalcPrjHelper();
AnaPrj defaultPrj = null;
string error_info = calcHelper.Calc(anaRequest, out defaultPrj);
+ LogHelper.Info(error_info);
if (!string.IsNullOrEmpty(error_info) || defaultPrj == null)
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璁＄畻閿欒, 鍘熷洜鏄�:{2} ,Request::: ",
- start_timme, end_timme, error_info)+ JsonHelper.Object2Json( anaRequest));
+ start_timme, end_timme, error_info) + JsonHelper.Object2Json(anaRequest));
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璁＄畻閿欒, 鍘熷洜鏄�:" + error_info };
}
else
{
- IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璁＄畻鎴愬姛", start_timme, end_timme ));
+ IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璁＄畻鎴愬姛", start_timme, end_timme));
}
//淇濆瓨鏂规
@@ -428,10 +418,9 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏈�澶у垏娉垫鏁� 璁剧疆杩囬暱" };
}
model_setting.MaxPumpSwitchCountQ = dto.MaxPumpSwitchCount;
- if(dto.OptSortType>=2)
+ if (dto.OptSortType >= 2)
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "OptSortType 鍙兘璁剧疆 0 鎴栬�� 1, 0浠ｈ〃 鐢ㄧ數閲忔渶灏� 1浠ｈ〃 鐢佃垂鏈�灏�" };
-
}
model_setting.OptSortType = dto.OptSortType;
if (dto.SwitchPumpIgnoreTimes != null)
diff --git a/WebApi/Data/AnaProject.db b/WebApi/Data/AnaProject.db
index 98f5462..61e6e79 100644
--- a/WebApi/Data/AnaProject.db
+++ b/WebApi/Data/AnaProject.db
Binary files differ
diff --git a/WebApi/Data/History/2024-05/2024-05-31 01.xml b/WebApi/Data/History/2024-05/2024-05-31 01.xml
new file mode 100644
index 0000000..024d752
--- /dev/null
+++ b/WebApi/Data/History/2024-05/2024-05-31 01.xml
@@ -0,0 +1,1586 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <VersionInfo Description="XML_Version">V1</VersionInfo>
+ <ProjectInfo>
+ <ID>055540d29d3745c9b1e702d7db1f9557</ID>
+ <StartTime>2024/5/31 1:00:00</StartTime>
+ <EndTime>2024/5/31 19:00:00</EndTime>
+ <Name>2024/5/31 10:51:24</Name>
+ <WaterLevelInfo>
+ </WaterLevelInfo>
+ <SumPower>1666.5</SumPower>
+ <SumFlow>100187.9</SumFlow>
+ <SumMoney>651.2</SumMoney>
+ <CalcSpaceMinute>10</CalcSpaceMinute>
+ <LastTime_OpenPumpCount>0</LastTime_OpenPumpCount>
+ <BlockTimes>
+ <BlockTime>
+ <StartTime>2024/5/31 1:00:00</StartTime>
+ <EndTime>2024/5/31 4:20:00</EndTime>
+ <OpenPumpCount>0</OpenPumpCount>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ </BlockTime>
+ <BlockTime>
+ <StartTime>2024/5/31 4:20:00</StartTime>
+ <EndTime>2024/5/31 6:00:00</EndTime>
+ <OpenPumpCount>1</OpenPumpCount>
+ <SumFlow>100187.9</SumFlow>
+ <SumPower>1666.5</SumPower>
+ <SumMoney>651.2</SumMoney>
+ </BlockTime>
+ <BlockTime>
+ <StartTime>2024/5/31 6:00:00</StartTime>
+ <EndTime>2024/5/31 19:00:00</EndTime>
+ <OpenPumpCount>0</OpenPumpCount>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ </BlockTime>
+ </BlockTimes>
+ <PointTimes>
+ <PointTime>
+ <Time>2024/5/31 1:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.5</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 1:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.5</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 1:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.5</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 1:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.5</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 1:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.5</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 1:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.5</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 2:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.5</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 2:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.56666666666667</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.56666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 2:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.63333333333333</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.63333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 2:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.7</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.7</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 2:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.76666666666667</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.76666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 2:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.83333333333333</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.83333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 3:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.9</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.9</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 3:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.98333333333333</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>1.98333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 3:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.06666666666667</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>2.06666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 3:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.15</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>2.15</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 3:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.23333333333333</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>2.23333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 3:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.31666666666667</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>2.31666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 4:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.4</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>2.4</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 4:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.5</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>2.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 4:20:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.529</RealHead>
+ <RealFlow>59279.8</RealFlow>
+ <RealPower>1022.3</RealPower>
+ <SumFlow>9880</SumFlow>
+ <SumPower>170.4</SumPower>
+ <SumMoney>66.6</SumMoney>
+ <WaterLevelQ>2.27</WaterLevelQ>
+ <WaterLevelH>0</WaterLevelH>
+ <WaterLevelC>2.6</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 4:30:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.429</RealHead>
+ <RealFlow>59483.6</RealFlow>
+ <RealPower>1014.6</RealPower>
+ <SumFlow>9913.9</SumFlow>
+ <SumPower>169.1</SumPower>
+ <SumMoney>66.1</SumMoney>
+ <WaterLevelQ>2.37</WaterLevelQ>
+ <WaterLevelH>0.015</WaterLevelH>
+ <WaterLevelC>2.7</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 4:40:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.329</RealHead>
+ <RealFlow>59789.3</RealFlow>
+ <RealPower>1003.7</RealPower>
+ <SumFlow>9964.9</SumFlow>
+ <SumPower>167.3</SumPower>
+ <SumMoney>65.4</SumMoney>
+ <WaterLevelQ>2.47</WaterLevelQ>
+ <WaterLevelH>0.03</WaterLevelH>
+ <WaterLevelC>2.8</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 4:50:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.229</RealHead>
+ <RealFlow>59993.1</RealFlow>
+ <RealPower>996.9</RealPower>
+ <SumFlow>9998.9</SumFlow>
+ <SumPower>166.1</SumPower>
+ <SumMoney>64.9</SumMoney>
+ <WaterLevelQ>2.57</WaterLevelQ>
+ <WaterLevelH>0.045</WaterLevelH>
+ <WaterLevelC>2.9</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 5:00:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.204</RealHead>
+ <RealFlow>60095</RealFlow>
+ <RealPower>993.6</RealPower>
+ <SumFlow>10015.8</SumFlow>
+ <SumPower>165.6</SumPower>
+ <SumMoney>64.7</SumMoney>
+ <WaterLevelQ>2.6</WaterLevelQ>
+ <WaterLevelH>0.06</WaterLevelH>
+ <WaterLevelC>3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 5:10:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.154</RealHead>
+ <RealFlow>60228.2</RealFlow>
+ <RealPower>993.6</RealPower>
+ <SumFlow>10038</SumFlow>
+ <SumPower>165.6</SumPower>
+ <SumMoney>64.7</SumMoney>
+ <WaterLevelQ>2.65</WaterLevelQ>
+ <WaterLevelH>0.075</WaterLevelH>
+ <WaterLevelC>3.05</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 5:20:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.104</RealHead>
+ <RealFlow>60362.7</RealFlow>
+ <RealPower>993.6</RealPower>
+ <SumFlow>10060.5</SumFlow>
+ <SumPower>165.6</SumPower>
+ <SumMoney>64.7</SumMoney>
+ <WaterLevelQ>2.7</WaterLevelQ>
+ <WaterLevelH>0.0899</WaterLevelH>
+ <WaterLevelC>3.1</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 5:30:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.054</RealHead>
+ <RealFlow>60497.3</RealFlow>
+ <RealPower>993.6</RealPower>
+ <SumFlow>10082.9</SumFlow>
+ <SumPower>165.6</SumPower>
+ <SumMoney>64.7</SumMoney>
+ <WaterLevelQ>2.75</WaterLevelQ>
+ <WaterLevelH>0.1049</WaterLevelH>
+ <WaterLevelC>3.15</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 5:40:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>4.004</RealHead>
+ <RealFlow>60631.9</RealFlow>
+ <RealPower>993.6</RealPower>
+ <SumFlow>10105.3</SumFlow>
+ <SumPower>165.6</SumPower>
+ <SumMoney>64.7</SumMoney>
+ <WaterLevelQ>2.8</WaterLevelQ>
+ <WaterLevelH>0.1199</WaterLevelH>
+ <WaterLevelC>3.2</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 5:50:00</Time>
+ <OpenPumpCount>1</OpenPumpCount>
+ <RealHead>3.954</RealHead>
+ <RealFlow>60766.5</RealFlow>
+ <RealPower>993.6</RealPower>
+ <SumFlow>10127.7</SumFlow>
+ <SumPower>165.6</SumPower>
+ <SumMoney>64.7</SumMoney>
+ <WaterLevelQ>2.85</WaterLevelQ>
+ <WaterLevelH>0.1349</WaterLevelH>
+ <WaterLevelC>3.25</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 6:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 6:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 6:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 6:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 6:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 6:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 7:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 7:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.26666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.26666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 7:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.23333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.23333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 7:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.2</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.2</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 7:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.16666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.16666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 7:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.13333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.13333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 8:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.1</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.1</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 8:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>3.03333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>3.03333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 8:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.96666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.96666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 8:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.9</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.9</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 8:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.83333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.83333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 8:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.76666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.76666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 9:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.7</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.7</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 9:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.65</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.65</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 9:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.6</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.6</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 9:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.55</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.55</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 9:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.5</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 9:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.45</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.45</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 10:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.4</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.4</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 10:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.33333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.33333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 10:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.26666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.26666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 10:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.2</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.2</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 10:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.13333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.13333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 10:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.06666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.06666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 11:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 11:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.95</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.95</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 11:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.9</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.9</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 11:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.85</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.85</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 11:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.8</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.8</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 11:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.75</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.75</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 12:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.7</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.7</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 12:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.66666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.66666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 12:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.63333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.63333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 12:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.6</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.6</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 12:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.56666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.56666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 12:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.53333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.53333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 13:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.5</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 13:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.46666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.46666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 13:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.43333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.43333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 13:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.4</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.4</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 13:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.36666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.36666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 13:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.33333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.33333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 14:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 14:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.28333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.28333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 14:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.26666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.26666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 14:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.25</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.25</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 14:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.23333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.23333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 14:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.21666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.21666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 15:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.2</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.2</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 15:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.23333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.23333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 15:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.26666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.26666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 15:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.3</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.3</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 15:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.33333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.33333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 15:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.36666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.36666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 16:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.4</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.4</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 16:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.48333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.48333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 16:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.56666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.56666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 16:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.65</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.65</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 16:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.73333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.73333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 16:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.81666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.81666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 17:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.9</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.9</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 17:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>1.98333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>1.98333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 17:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.06666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.06666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 17:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.15</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.15</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 17:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.23333333333333</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.23333333333333</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 17:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.31666666666667</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.31666666666667</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 18:00:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.4</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.4</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 18:10:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.45</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.45</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 18:20:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.5</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.5</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 18:30:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.55</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.55</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 18:40:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.6</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.6</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ <PointTime>
+ <Time>2024/5/31 18:50:00</Time>
+ <OpenPumpCount>0</OpenPumpCount>
+ <RealHead>0</RealHead>
+ <RealFlow>0</RealFlow>
+ <RealPower>0</RealPower>
+ <SumFlow>0</SumFlow>
+ <SumPower>0</SumPower>
+ <SumMoney>0</SumMoney>
+ <WaterLevelQ>2.65</WaterLevelQ>
+ <WaterLevelH>0.1499</WaterLevelH>
+ <WaterLevelC>2.65</WaterLevelC>
+ <ReservoirDropFlowTotal>0</ReservoirDropFlowTotal>
+ </PointTime>
+ </PointTimes>
+ <Settting>
+ <StartHourPerDay>0</StartHourPerDay>
+ <MinOpenTimeMinute>60</MinOpenTimeMinute>
+ <MinSwitchTimeMinute>30</MinSwitchTimeMinute>
+ <CalcSpaceMinuteQ>10</CalcSpaceMinuteQ>
+ <CalcSpaceMinuteL>20</CalcSpaceMinuteL>
+ <MaxPumpSwitchCountQ>3</MaxPumpSwitchCountQ>
+ <MaxPumpSwitchCountL>3</MaxPumpSwitchCountL>
+ <SwitchPumpIgnoreTimes>
+ </SwitchPumpIgnoreTimes>
+ <OptSortType>1</OptSortType>
+ <OpenPumpTimes>False-6:0-17:0</OpenPumpTimes>
+ <HaveTargetTotalFlow>True</HaveTargetTotalFlow>
+ <RiverWaterLevelBase>0</RiverWaterLevelBase>
+ </Settting>
+ <AnaRequest>
+ <CalcOptType>鐢佃垂</CalcOptType>
+ <StartTime>2024/5/31 1:00:00</StartTime>
+ <EndTime>2024/5/31 19:00:00</EndTime>
+ <StartOpenCount>-1</StartOpenCount>
+ <TotalFlowIn>100000</TotalFlowIn>
+ <MaxLimitWaterBoxLevel>
+ </MaxLimitWaterBoxLevel>
+ <MaxLimitWaterBoxTime>
+ </MaxLimitWaterBoxTime>
+ <SpaceFlowOut>
+ </SpaceFlowOut>
+ <CurrentWaterBoxLevel>0</CurrentWaterBoxLevel>
+ </AnaRequest>
+ </ProjectInfo>
+</root>
\ No newline at end of file
diff --git a/WebApi/IStation.ChEr.WebApi.csproj.user b/WebApi/IStation.ChEr.WebApi.csproj.user
index 205e1f4..60d5730 100644
--- a/WebApi/IStation.ChEr.WebApi.csproj.user
+++ b/WebApi/IStation.ChEr.WebApi.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>true</Use64BitIISExpress>
<IISExpressSSLPort>44318</IISExpressSSLPort>
diff --git a/WebApi/Logs/Tests/20240530.txt b/WebApi/Logs/Tests/20240530.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/WebApi/Logs/Tests/20240530.txt
diff --git a/WebApi/Logs/Tests/20240531.txt b/WebApi/Logs/Tests/20240531.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/WebApi/Logs/Tests/20240531.txt
diff --git a/WebApi/Logs/error.log b/WebApi/Logs/error.log
index d0b29bc..0aba66b 100644
--- a/WebApi/Logs/error.log
+++ b/WebApi/Logs/error.log
@@ -138,3 +138,40 @@
在 System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
在 System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
在 System.Web.Http.Controllers.ExceptionFilterResult.<ExecuteAsync>d__6.MoveNext()
+记录时间：2024-05-29 20:41:14,522 线程ID:[18] 出错类：IStation.Error property:[(null)] - 错误描述：UnknowException,Exception:值不能为 null。
+参数名: source,StackTrace: 在 System.Linq.Enumerable.SelectMany[TSource,TResult](IEnumerable`1 source, Func`2 selector)
+ 在 IStation.WebApi.Controllers.PumpRunController.<GetPumpOpenState>d__8.MoveNext() 位置 D:\WorkData\IStation\ChEqCalc.V1.3\WebApi\Controllers\PumpRunController.cs:行号 405
+--- 引发异常的上一位置中堆栈跟踪的末尾 ---
+ 在 System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+ 在 System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+ 在 System.Threading.Tasks.TaskHelpersExtensions.<CastToObject>d__1`1.MoveNext()
+--- 引发异常的上一位置中堆栈跟踪的末尾 ---
+ 在 System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+ 在 System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+ 在 System.Web.Http.Controllers.ApiControllerActionInvoker.<InvokeActionAsyncCore>d__1.MoveNext()
+--- 引发异常的上一位置中堆栈跟踪的末尾 ---
+ 在 System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+ 在 System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+ 在 System.Web.Http.Controllers.ActionFilterResult.<ExecuteAsync>d__5.MoveNext()
+--- 引发异常的上一位置中堆栈跟踪的末尾 ---
+ 在 System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+ 在 System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+ 在 System.Web.Http.Controllers.ExceptionFilterResult.<ExecuteAsync>d__6.MoveNext()
+记录时间：2024-05-31 10:49:40,776 线程ID:[7] 出错类：IStation.Error property:[(null)] - 错误描述：UnknowException,Exception:缺少WaterPredictDsPath配置,StackTrace: 在 IStation.DAL.WaterPredictRecord.CreateConnection(Int32 year) 位置 D:\WorkData\IStation\ChEqCalc.V1.3\DAL\IStation.DAL.Project\DAL\WaterPredictRecord.cs:行号 27
+ 在 IStation.DAL.WaterPredictRecord.GetByHourRangle(DateTime start_time, DateTime end_time) 位置 D:\WorkData\IStation\ChEqCalc.V1.3\DAL\IStation.DAL.Project\DAL\WaterPredictRecord.cs:行号 78
+ 在 IStation.WebApi.Controllers.ZyPrjController.Calc(ZyPrjRequest request) 位置 D:\WorkData\IStation\ChEqCalc.V1.3\WebApi\Controllers\ZyPrjController.cs:行号 135
+ 在 lambda_method(Closure , Object , Object[] )
+ 在 System.Web.Http.Controllers.ReflectedHttpActionDescriptor.ActionExecutor.<>c__DisplayClass6_2.<GetExecutor>b__2(Object instance, Object[] methodParameters)
+ 在 System.Web.Http.Controllers.ReflectedHttpActionDescriptor.ExecuteAsync(HttpControllerContext controllerContext, IDictionary`2 arguments, CancellationToken cancellationToken)
+--- 引发异常的上一位置中堆栈跟踪的末尾 ---
+ 在 System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+ 在 System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+ 在 System.Web.Http.Controllers.ApiControllerActionInvoker.<InvokeActionAsyncCore>d__1.MoveNext()
+--- 引发异常的上一位置中堆栈跟踪的末尾 ---
+ 在 System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+ 在 System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+ 在 System.Web.Http.Controllers.ActionFilterResult.<ExecuteAsync>d__5.MoveNext()
+--- 引发异常的上一位置中堆栈跟踪的末尾 ---
+ 在 System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+ 在 System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
+ 在 System.Web.Http.Controllers.ExceptionFilterResult.<ExecuteAsync>d__6.MoveNext()
diff --git a/WebApi/Logs/info.log b/WebApi/Logs/info.log
index e606e73..ce05951 100644
--- a/WebApi/Logs/info.log
+++ b/WebApi/Logs/info.log
@@ -103,3 +103,119 @@
2024-05-29 15:08:18,802|初始化成功|
2024-05-29 15:08:41,271|初始化成功|
2024-05-29 15:11:54,811|初始化成功|
+2024-05-29 20:25:13,866|初始化成功|
+2024-05-29 20:28:18,064|初始化成功|
+2024-05-29 20:29:12,244|初始化成功|
+2024-05-29 20:40:42,622|初始化成功|
+2024-05-29 20:41:37,005|初始化成功|
+2024-05-29 20:52:50,069|初始化成功|
+2024-05-29 21:05:47,600|初始化成功|
+2024-05-29 21:11:19,399|初始化成功|
+2024-05-29 22:48:37,940|初始化成功|
+2024-05-29 22:52:52,087|初始化成功|
+2024-05-30 00:20:18,298|初始化成功|
+2024-05-30 00:30:00,391|初始化成功|
+2024-05-31 01:36:28,235|初始化成功|
+2024-05-31 10:47:21,388|初始化成功|
+2024-05-31 10:48:51,353|{"StartTime":"2024/5/31 1:00","EndTime":"2024/5/31 19:00","StartOpenCount":-1,"TotalFlowIn":"100000","StartReservoirLevel":"","MaxReservoirLevel":"444","MaxReservoirLevelTime":"","IsSubmit":"false"}|
+2024-05-31 10:49:11,319|通过取数据库|
+2024-05-31 10:49:13,710|1|
+2024-05-31 10:49:47,502|{"StartTime":"2024/5/31 1:00","EndTime":"2024/5/31 19:00","StartOpenCount":-1,"TotalFlowIn":"100000","StartReservoirLevel":"","MaxReservoirLevel":"444","MaxReservoirLevelTime":"","IsSubmit":"false"}|
+2024-05-31 10:49:57,281|通过取数据库|
+2024-05-31 10:50:06,275|33333|
+2024-05-31 10:50:35,079|初始化成功|
+2024-05-31 10:50:44,595|{"StartTime":"2024/5/31 1:00","EndTime":"2024/5/31 19:00","StartOpenCount":-1,"TotalFlowIn":"100000","StartReservoirLevel":"","MaxReservoirLevel":"","MaxReservoirLevelTime":"","IsSubmit":"false"}|
+2024-05-31 10:51:26,183|错误信息通过|
+2024-05-31 10:51:30,118||
+2024-05-31 10:54:19,592|Zy Prj Time:2024/5/31 1:00:00-2024/5/31 19:00:00 , 计算成功|
+2024-05-31 10:54:30,247|初始化成功|
+2024-05-31 10:54:40,587|{"StartTime":"2024/5/31 1:00","EndTime":"2024/5/31 19:00","StartOpenCount":-1,"TotalFlowIn":"100000","StartReservoirLevel":"","MaxReservoirLevel":"444","MaxReservoirLevelTime":"","IsSubmit":"false"}|
+2024-05-31 10:54:47,561|通过取数据库|
+2024-05-31 10:54:49,055|1|
+2024-05-31 11:18:33,552|初始化成功|
+2024-05-31 11:18:50,088|{"StartTime":"2024/5/31 1:00","EndTime":"2024/5/31 19:00","StartOpenCount":-1,"TotalFlowIn":"","StartReservoirLevel":"","MaxReservoirLevel":"5","MaxReservoirLevelTime":"","IsSubmit":"false"}|
+2024-05-31 11:19:02,371|通过取数据库|
+2024-05-31 11:19:05,101|1|
+2024-05-31 11:20:50,718|初始化成功|
+2024-05-31 11:21:03,495|{"StartTime":"2024/5/31 1:00","EndTime":"2024/5/31 19:00","StartOpenCount":-1,"TotalFlowIn":"","StartReservoirLevel":"","MaxReservoirLevel":"5","MaxReservoirLevelTime":"","IsSubmit":"false"}|
+2024-05-31 11:21:08,174|通过取数据库|
+2024-05-31 11:21:08,928|1|
+2024-05-31 11:51:56,657|初始化成功|
+2024-05-31 11:52:19,003|{"StartTime":"2024-05-31 20:00:00","EndTime":"2024-06-01 20:00:00","StartOpenCount":-1,"TotalFlowIn":"1600000","StartReservoirLevel":null,"MaxReservoirLevel":"4","MaxReservoirLevelTime":null,"IsSubmit":"False"}|
+2024-05-31 11:52:30,988|通过取数据库|
+2024-05-31 11:52:31,765|1|
+2024-05-31 11:54:37,522|初始化成功|
+2024-05-31 11:54:56,668|{"StartTime":"2024-05-31 20:00:00","EndTime":"2024-06-01 20:00:00","StartOpenCount":-1,"TotalFlowIn":"1600000","StartReservoirLevel":null,"MaxReservoirLevel":null,"MaxReservoirLevelTime":null,"IsSubmit":"False"}|
+2024-05-31 11:55:01,176|下一步|
+2024-05-31 11:55:18,330|初始化成功|
+2024-05-31 11:55:24,707|{"StartTime":"2024-05-31 20:00:00","EndTime":"2024-06-01 20:00:00","StartOpenCount":-1,"TotalFlowIn":"1600000","StartReservoirLevel":null,"MaxReservoirLevel":"4","MaxReservoirLevelTime":null,"IsSubmit":"False"}|
+2024-05-31 11:55:27,044|通过取数据库|
+2024-05-31 11:55:28,130|1|
+2024-05-31 11:56:04,537|33333|
+2024-05-31 11:56:07,237|2|
+2024-05-31 11:56:55,242|3|
+2024-05-31 11:57:01,218|4|
+2024-05-31 11:57:29,649|初始化成功|
+2024-05-31 11:57:37,351|{"StartTime":"2024-05-31 20:00:00","EndTime":"2024-06-01 20:00:00","StartOpenCount":-1,"TotalFlowIn":"1600000","StartReservoirLevel":null,"MaxReservoirLevel":"4","MaxReservoirLevelTime":null,"IsSubmit":"False"}|
+2024-05-31 11:57:39,314|通过取数据库|
+2024-05-31 11:57:39,618|1|
+2024-05-31 11:57:41,165|33333|
+2024-05-31 11:57:41,654|2|
+2024-05-31 11:57:43,051|3|
+2024-05-31 12:17:11,665|33333|
+2024-05-31 12:17:12,285|2|
+2024-05-31 12:17:14,771|通过取数据库|
+2024-05-31 12:17:15,471|1|
+2024-05-31 12:17:20,724|33333|
+2024-05-31 12:17:21,071|2|
+2024-05-31 12:17:22,022|3|
+2024-05-31 12:17:25,219|4|
+2024-05-31 12:17:27,502|通过取数据库2|
+2024-05-31 12:17:28,472|4|
+2024-05-31 12:17:28,887|通过取数据库2|
+2024-05-31 12:17:30,013|4|
+2024-05-31 12:17:30,251|通过取数据库2|
+2024-05-31 12:17:30,572|4|
+2024-05-31 12:17:33,192|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:33,193|4|
+2024-05-31 12:17:33,193|通过取数据库2|
+2024-05-31 12:17:34,647|下一步|
+2024-05-31 12:17:35,828|下一步2|
diff --git a/WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 707f68d..97b8e7e 100644
--- a/WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\WorkData\IStation\ChEqCalc.V1.3\WebApi\bin\app.publish\</_PublishTargetUrl>
- <History>True|2024-05-20T14:19:25.6819845Z;True|2024-05-20T22:17:16.3228686+08:00;True|2024-05-20T22:09:43.8419388+08:00;True|2024-05-20T20:47:30.7123496+08:00;False|2024-05-20T20:46:44.8172532+08:00;True|2024-05-17T09:19:12.0003732+08:00;True|2024-05-13T16:34:26.1798389+08:00;True|2024-05-13T15:25:51.2634210+08:00;True|2024-05-13T15:06:06.6614778+08:00;True|2024-05-13T14:05:16.2224051+08:00;True|2024-04-12T11:21:29.5845897+08:00;True|2024-04-12T11:05:57.4077528+08:00;True|2024-04-12T09:48:11.6556767+08:00;True|2024-04-07T14:56:11.5899311+08:00;True|2024-03-13T13:43:30.5799100+08:00;True|2024-03-13T13:36:27.8330849+08:00;True|2024-03-13T13:28:52.4054628+08:00;True|2024-03-13T13:09:48.3039075+08:00;True|2024-03-13T13:06:59.6509464+08:00;True|2024-03-13T12:56:44.3509382+08:00;True|2024-03-13T12:43:04.0436634+08:00;False|2024-03-13T12:42:49.1037427+08:00;False|2024-03-13T12:42:25.1444775+08:00;True|2024-03-13T12:34:29.4082591+08:00;True|2024-03-13T12:32:39.1414007+08:00;True|2024-03-13T12:27:13.0387359+08:00;True|2024-03-13T12:24:15.2859267+08:00;</History>
+ <History>True|2024-05-29T14:55:40.8917081Z;True|2024-05-29T22:53:51.8888824+08:00;True|2024-05-29T21:24:14.2935182+08:00;True|2024-05-29T21:15:26.4176230+08:00;True|2024-05-29T20:21:23.2652363+08:00;True|2024-05-20T22:19:25.6819845+08:00;True|2024-05-20T22:17:16.3228686+08:00;True|2024-05-20T22:09:43.8419388+08:00;True|2024-05-20T20:47:30.7123496+08:00;False|2024-05-20T20:46:44.8172532+08:00;True|2024-05-17T09:19:12.0003732+08:00;True|2024-05-13T16:34:26.1798389+08:00;True|2024-05-13T15:25:51.2634210+08:00;True|2024-05-13T15:06:06.6614778+08:00;True|2024-05-13T14:05:16.2224051+08:00;True|2024-04-12T11:21:29.5845897+08:00;True|2024-04-12T11:05:57.4077528+08:00;True|2024-04-12T09:48:11.6556767+08:00;True|2024-04-07T14:56:11.5899311+08:00;True|2024-03-13T13:43:30.5799100+08:00;True|2024-03-13T13:36:27.8330849+08:00;True|2024-03-13T13:28:52.4054628+08:00;True|2024-03-13T13:09:48.3039075+08:00;True|2024-03-13T13:06:59.6509464+08:00;True|2024-03-13T12:56:44.3509382+08:00;True|2024-03-13T12:43:04.0436634+08:00;False|2024-03-13T12:42:49.1037427+08:00;False|2024-03-13T12:42:25.1444775+08:00;True|2024-03-13T12:34:29.4082591+08:00;True|2024-03-13T12:32:39.1414007+08:00;True|2024-03-13T12:27:13.0387359+08:00;True|2024-03-13T12:24:15.2859267+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@@ -106,10 +106,10 @@
<publishTime>05/13/2024 16:29:27</publishTime>
</File>
<File Include="bin/IStation.Calc.Core.dll">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/29/2024 21:15:24</publishTime>
</File>
<File Include="bin/IStation.Calc.Core.pdb">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/29/2024 21:15:24</publishTime>
</File>
<File Include="bin/IStation.Calc.ErQu.dll">
<publishTime>03/13/2024 12:32:32</publishTime>
@@ -118,10 +118,10 @@
<publishTime>03/13/2024 12:32:32</publishTime>
</File>
<File Include="bin/IStation.Calc.Model.dll">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/29/2024 20:24:52</publishTime>
</File>
<File Include="bin/IStation.Calc.Model.pdb">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/29/2024 20:24:52</publishTime>
</File>
<File Include="bin/IStation.Core.dll">
<publishTime>05/13/2024 16:29:27</publishTime>
@@ -130,19 +130,19 @@
<publishTime>05/13/2024 16:29:27</publishTime>
</File>
<File Include="bin/IStation.DAL.Paras.dll">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/29/2024 21:15:24</publishTime>
</File>
<File Include="bin/IStation.DAL.Paras.pdb">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/29/2024 21:15:24</publishTime>
</File>
<File Include="bin/IStation.DAL.Project.dll">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/29/2024 20:24:52</publishTime>
</File>
<File Include="bin/IStation.DAL.Project.dll.config">
<publishTime>04/29/2024 13:50:24</publishTime>
</File>
<File Include="bin/IStation.DAL.Project.pdb">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/29/2024 20:24:52</publishTime>
</File>
<File Include="bin/IStation.Entity.Basic.dll">
<publishTime>05/13/2024 16:34:21</publishTime>
@@ -169,10 +169,10 @@
<publishTime>05/13/2024 16:29:27</publishTime>
</File>
<File Include="bin/IStation.Model.Basic.dll">
- <publishTime>05/20/2024 22:58:22</publishTime>
+ <publishTime>05/29/2024 20:21:19</publishTime>
</File>
<File Include="bin/IStation.Model.Basic.pdb">
- <publishTime>05/20/2024 22:58:22</publishTime>
+ <publishTime>05/29/2024 20:21:19</publishTime>
</File>
<File Include="bin/IStation.Model.Config.dll">
<publishTime>03/13/2024 12:32:32</publishTime>
@@ -223,16 +223,16 @@
<publishTime>05/13/2024 16:29:28</publishTime>
</File>
<File Include="bin/IStation.Untity.dll">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/24/2024 13:41:44</publishTime>
</File>
<File Include="bin/IStation.Untity.pdb">
- <publishTime>05/21/2024 00:01:12</publishTime>
+ <publishTime>05/24/2024 13:41:44</publishTime>
</File>
<File Include="bin/IStation.WebApi.dll">
- <publishTime>05/21/2024 00:01:13</publishTime>
+ <publishTime>05/31/2024 01:34:14</publishTime>
</File>
<File Include="bin/IStation.WebApi.pdb">
- <publishTime>05/21/2024 00:01:13</publishTime>
+ <publishTime>05/31/2024 01:34:14</publishTime>
</File>
<File Include="bin/log4net.dll">
<publishTime>03/25/2024 09:57:26</publishTime>
@@ -682,7 +682,7 @@
<publishTime>03/25/2024 09:57:27</publishTime>
</File>
<File Include="Web.config">
- <publishTime>05/13/2024 14:05:15</publishTime>
+ <publishTime>05/29/2024 21:15:25</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebApi/Web.config b/WebApi/Web.config
index 4346cb7..25d367e 100644
--- a/WebApi/Web.config
+++ b/WebApi/Web.config
@@ -13,9 +13,9 @@
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
- <add key="isDebug" value="true" />
+ <add key="isDebug" value="false" />
<add key="ZYAPiUrl" value="http://192.168.201.235:8009/" />
- <add key="WaterPredictDsPath" value="D:\WorkData\IStation\ChEq\CodeV1.3\WaterPredict\IStation.ChEr.Entry.Predict\bin\Debug\net6.0\Data" />
+ <add key="WaterPredictDsPath" value="D:\WorkData\IStation\ChEqCalc.V1.3\WaterPredict\IStation.ChEr.Entry.Predict\bin\Debug\net6.0\Data" />
</appSettings>
<system.web>
<compilation debug="true" targetFramework="4.7.2" />
diff --git "a/WebApi/\344\274\227\346\257\205\350\260\203\345\272\246/ZyConnectHelper.cs" "b/WebApi/\344\274\227\346\257\205\350\260\203\345\272\246/ZyConnectHelper.cs"
index 8ea55a3..70c8668 100644
--- "a/WebApi/\344\274\227\346\257\205\350\260\203\345\272\246/ZyConnectHelper.cs"
+++ "b/WebApi/\344\274\227\346\257\205\350\260\203\345\272\246/ZyConnectHelper.cs"
@@ -249,8 +249,8 @@
{ "涓�杈�1", "鍢夊畾鏁版嵁.1绾胯〃澶寸疮璁�" },
{ "涓�杈�2", "鍢夊畾鏁版嵁.2绾胯〃澶寸疮璁�" },
{ "涓�杈�3", "鍢夊畾鏁版嵁.3绾胯〃澶寸疮璁�" },
- { "浜岃緭1", "2400鎬荤.瀹為檯绱娴侀噺" },
- { "浜岃緭2", "2600鎬荤.瀹為檯绱娴侀噺" },
+ { "浜岃緭1", "闀挎睙绠＄綉鍥�.2400鎬荤.鐬椂娴侀噺" },
+ { "浜岃緭2", "闀挎睙绠＄綉鍥�.2600鎬荤.鐬椂娴侀噺" },
};
/* var input = new ZyDto.ScadaDispatchInput
{
@@ -305,8 +305,8 @@
{ "涓�杈�1", "鍢夊畾鏁版嵁.1绾胯〃澶寸疮璁�" },
{ "涓�杈�2", "鍢夊畾鏁版嵁.2绾胯〃澶寸疮璁�" },
{ "涓�杈�3", "鍢夊畾鏁版嵁.3绾胯〃澶寸疮璁�" },
- { "浜岃緭1", "2400鎬荤.瀹為檯绱娴侀噺" },
- { "浜岃緭2", "2600鎬荤.瀹為檯绱娴侀噺" },
+ { "浜岃緭1", "闀挎睙绠＄綉鍥�.2400鎬荤.绱娴侀噺" },
+ { "浜岃緭2", "闀挎睙绠＄綉鍥�.2600鎬荤.绱娴侀噺" },
};
/* var input = new ZyDto.ScadaDispatchInput
{
@@ -319,6 +319,7 @@
string joinedValues = string.Join(",", tagDict.Values);
var result = HttpClientHelper.Get<List<DataPoint>>(_GetUrl, startTime.ToString("yyyy-MM-dd"), endTime.ToString("yyyy-MM-dd"), "first", resolution, joinedValues);
var realScadaDataList = GetScadaData(result);
+ // LogHelper.Info(JsonHelper.Object2Json(realScadaDataList));
return realScadaDataList;
/* double totalWaterSupply = 0;
if (realScadaDataList != null && realScadaDataList.Any())
@@ -428,7 +429,7 @@
Resolution = resolution,
taglist = tagDict.Select(x => x.Key).ToArray()
};*/
- var starttime = new DateTime(StartTime.Year, StartTime.Month, StartTime.Day, 0, 0, 0).ToString("yyyy-MM-dd");
+ var starttime = new DateTime(StartTime.Year, StartTime.Month, StartTime.Day - 1, 0, 0, 0).ToString("yyyy-MM-dd");
var endtime = new DateTime(StartTime.Year, StartTime.Month, StartTime.Day, 23, 59, 59).ToString("yyyy-MM-dd");
string joinedValues = string.Join(",", tagDict.Values);
var result = HttpClientHelper.Get<List<DataPoint>>(_GetUrl, starttime, endtime, "first", resolution, joinedValues);
@@ -454,7 +455,7 @@
{
{ "21#", "浜岃緭姘�21鍙锋按娉佃鍥�.娉佃繍琛�" },
{ "22#", "浜岃緭姘�22鍙锋按娉佃鍥�.娉佃繍琛�" },
- { "23#", "浜岃緭姘�23鍙锋按娉佃鍥�.娉佃繍琛�" },
+ { "23#", "浜岃緭姘�23鍙锋按娉佃蒋鍚姩.杩愯" },
{ "24#", "浜岃緭姘�24鍙锋按娉佃鍥�.娉佃繍琛�" },
{ "25#", "浜岃緭姘�25鍙锋按娉佃鍥�.娉佃繍琛�" },
{ "26#", "浜岃緭姘�26鍙锋按娉佃鍥�.娉佃繍琛�" },
@@ -468,10 +469,20 @@
{ "17#", "涓�杈撴按娉�18鍙峰彉棰戝崟娉�.鍙橀鍣ㄨ繍琛�" },
{ "18#", "HF闀挎睙鍘熸按鍘侫BPLC.6KV閰嶇數涓�杈撴按.0402010201011501003涓�杈撴按15鍙锋车杩愯" },
};
- string joinedValues = string.Join(",", tagDict.Values);
- var result = HttpClientHelper.Get<List<DataPoint>>(_GetUrl, StartTime.ToString("yyyy-MM-dd"), EndTime.ToString("yyyy-MM-dd"), "first", resolution, joinedValues);
- var realScadaDataList = GetScadaData(result);
- return realScadaDataList;
+ List<RealScadaData> AllrealScadaDatasList = new List<RealScadaData>();
+ var joinedValues = (tagDict.Values).ToList();
+ foreach (var item in joinedValues)
+ {
+ var result = HttpClientHelper.Get<List<DataPoint>>(_GetUrl, StartTime.ToString("yyyy-MM-dd"), EndTime.ToString("yyyy-MM-dd"), "first", resolution, item.ToString());
+ if (result != null)
+ {
+ var realScadaDataList = GetScadaData(result);
+ AllrealScadaDatasList.AddRange(realScadaDataList);
+ }
+ }
+ LogHelper.Info(JsonHelper.Object2Json(AllrealScadaDatasList));
+ // return realScadaDataList;
+ return AllrealScadaDatasList;
}
/// <summary>
@@ -499,7 +510,7 @@
Resolution = resolution,
taglist = tagDict.Select(x => x.Key).ToArray(),
};*/
- var starttime = new DateTime(StartTime.Year, StartTime.Month, StartTime.Day, 0, 0, 0).ToString("yyyy-MM-dd");
+ var starttime = new DateTime(StartTime.Year, StartTime.Month, StartTime.Day - 1, 0, 0, 0).ToString("yyyy-MM-dd");
var endtime = new DateTime(StartTime.Year, StartTime.Month, StartTime.Day, 23, 59, 59).ToString("yyyy-MM-dd");
string joinedValues = string.Join(",", tagDict.Values);
var result = HttpClientHelper.Get<List<DataPoint>>(_GetUrl, starttime, endtime, "first", resolution, joinedValues);
--
Gitblit v1.9.3