From 36a0ce55799c95821f39aab5c13566a5f238970b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 11 二月 2025 12:56:55 +0800
Subject: [PATCH] 修复预测接口问题
---
WebApi/Controllers/PumpRunController.cs | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/WebApi/Controllers/PumpRunController.cs b/WebApi/Controllers/PumpRunController.cs
index 68d0d54..b082193 100644
--- a/WebApi/Controllers/PumpRunController.cs
+++ b/WebApi/Controllers/PumpRunController.cs
@@ -19,7 +19,7 @@
/// </summary>
[RoutePrefix("PumpRun")]
public class PumpRunController : ApiController
- {
+ {
/// <summary>
/// 鑾峰彇娉靛疄闄呰繍琛屽弬鏁�(涓�澶�)
/// </summary>
@@ -46,7 +46,7 @@
PumpRunParasHelper pumpRunParasHelper = new PumpRunParasHelper();
result = Common.PumpRunParasHelper.ReadPumpRunParas(d);
string geterroer = null;
- if (result != null )
+ if (result != null)
{
result.Electric = Math.Round(result.Electric, 2);
result.Money = Math.Round(result.Money, 2);
@@ -416,5 +416,29 @@
}
return new IStation.Dto.ApiResult<List<SSAData>>(totalOneDays) { Code = ApiResultCode.Success, Message = "Success" };
}
+
+
+
+ [Route("GetPumpRealData")]
+ [HttpGet]
+ public async Task<IStation.Dto.ApiResult> GetPumpRealData(string startday, string endday, string resolution)
+ {
+ if (startday == null || endday == null)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
+ }
+ DateTime Start;
+ if (!DateTime.TryParse(startday, out Start))
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
+ }
+ DateTime d;
+ if (!DateTime.TryParse(endday, out d))
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
+ }
+ var TotalWater = await ZyConnectHelper.GetTotalWaterByTimeRange_Out(Start, d, resolution); //鍙栨按閲�
+ return new IStation.Dto.ApiResult<List<RealScadaData>>(TotalWater) { Code = ApiResultCode.Success, Message = "Success" };
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3