From c14e9e6b31bc808a7defa271b3dd140b6dd67c74 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 26 三月 2024 15:36:40 +0800
Subject: [PATCH] 修改报错
---
WebApi/Controllers/PumpRunController.cs | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/WebApi/Controllers/PumpRunController.cs b/WebApi/Controllers/PumpRunController.cs
index 10b4b6f..35440b4 100644
--- a/WebApi/Controllers/PumpRunController.cs
+++ b/WebApi/Controllers/PumpRunController.cs
@@ -14,7 +14,7 @@
public class PumpRunController : ApiController
{
- Dto.PumpRunParasDays pumpRunParasDay = new Dto.PumpRunParasDays();
+
/// <summary>
/// 鑾峰彇鏌愪竴澶╁弬鏁�
/// </summary>
@@ -22,10 +22,15 @@
/// <returns></returns>
[Route("GetByOneDay")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetByOneDay(DateTime startday)
+ public async Task<IStation.Dto.ApiResult> GetByOneDay(string startday)
{
-
- var PumpState = await ZyConnectHelper.GetPumpIsopen(startday,startday);
+ DateTime d;
+ if (!DateTime.TryParse(startday, out d))
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
+ }
+ Dto.PumpRunParasDays pumpRunParasDay = new Dto.PumpRunParasDays();
+ var PumpState = await ZyConnectHelper.GetPumpOpenStatusBySingleDay(d);
// var totalWater = await ZyConnectHelper.GetTotalWaterByDayRange_In(startday, startday);
// pumpRunParasDay.TotalWater = totalWater;
// var PumpTotalElecty = await ZyConnectHelper.GetPumpTotalElectricity(startday, startday);
@@ -39,25 +44,29 @@
return new IStation.Dto.ApiResult<Dto.PumpRunParasDays>(pumpRunParasDay) { Code = ApiResultCode.Success, Message = "Success" };
}
-
+ /* /// <summary>
+ ///
+ /// </summary>
+ /// <param name="day"></param>
+ /// <returns></returns>
[Route("GetByHistoryOneDay")]
[HttpGet]
- public async Task<IStation.Dto.ApiResult> GetByHistoryOneDay(DateTime day)
+ public async Task<IStation.Dto.ApiResult> GetByHistoryOneDay(string day)
{
if (day == null)
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
}
DateTime d;
- /* if (!DateTime.TryParse(day, out d))
+ if (!DateTime.TryParse(day, out d))
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
- }*/
+ }
- var prj = Common.PumpHistoryDataFileHelper.GetHistoryData(day);
- return new IStation.Dto.ApiResult<List<Common.PumpHistoryDataFileHelper.RunParasData>>(prj) { Code = ApiResultCode.Success, Message = "Success" };
+ var history = Common.PumpHistoryDataFileHelper.GetHistoryData(d);
+ return new IStation.Dto.ApiResult<List<RunParasData>>(history) { Code = ApiResultCode.Success, Message = "Success" };
}
-
+*/
--
Gitblit v1.9.3