From 6954aa5b4a32aeba903b9532d5ff8e75c1b9548b Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 11 六月 2024 15:03:26 +0800
Subject: [PATCH] 计算调用远程服务
---
WebApi/Controllers/PumpRunController.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WebApi/Controllers/PumpRunController.cs b/WebApi/Controllers/PumpRunController.cs
index 0aa14be..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();
@@ -325,7 +325,7 @@
/// <returns></returns>
[Route("GetPumpHistoryData")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetPumpHistoryData(string startday, string endday)
+ public async Task<IStation.Dto.ApiResult> GetPumpHistoryData(string startday, string endday, string resolution)
{
if (startday == null || endday == null)
{
@@ -341,7 +341,7 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
}
- var TotalWater = await ZyConnectHelper.GetTotalWaterByTimeRange_Out(Start, d, "1h"); //鍙栨按閲�
+ var TotalWater = await ZyConnectHelper.GetTotalWaterByTimeRange_Out(Start, d, resolution); //鍙栨按閲�
/* var one = TotalWater
.SelectMany(otdl => otdl.MonitorRecords);
var two = one.GroupBy(totalDay => totalDay.Time);
--
Gitblit v1.9.3