From 8b25d4c0c79c26900cea5de537887d658dcfa32e Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期一, 29 四月 2024 13:11:26 +0800
Subject: [PATCH] 添加接口内容 : 获取最近项目
---
WebApi/Controllers/ReservoirWaterLevelController.cs | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/WebApi/Controllers/ReservoirWaterLevelController.cs b/WebApi/Controllers/ReservoirWaterLevelController.cs
index b2bfe59..d53fc75 100644
--- a/WebApi/Controllers/ReservoirWaterLevelController.cs
+++ b/WebApi/Controllers/ReservoirWaterLevelController.cs
@@ -8,6 +8,7 @@
using System.Net.Http;
using System.Security.Permissions;
using System.Text;
+using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
@@ -26,44 +27,44 @@
/// <returns></returns>
[Route("GetRealValue")]
[HttpGet]
- public IStation.Dto.ApiResult GetRealValue()
+ public async Task<IStation.Dto.ApiResult> GetRealValue()
{
- var d = ZyConnectHelper.GetRealReservoirWaterLevel().Result;
+ var d = await ZyConnectHelper.GetRealReservoirWaterLevel();
return new IStation.Dto.ApiResult<double>(d);
}
- /// <summary>
- /// 鑾峰彇浠婃棩棰勬祴鍊�(24鐐规椂)
- /// </summary>
- /// <returns></returns>
- [Route("GetTodayEndPredictiveValue")]
- [HttpGet]
- public IStation.Dto.ApiResult GetTodayEndPredictiveValue()
- {
- var now_value = ZyConnectHelper.GetRealReservoirWaterLevel().Result;
+ ///// <summary>
+ ///// 鑾峰彇浠婃棩棰勬祴鍊�(24鐐规椂)
+ ///// </summary>
+ ///// <returns></returns>
+ //[Route("GetTodayEndPredictiveValue")]
+ //[HttpGet]
+ //public async Task<IStation.Dto.ApiResult> GetTodayEndPredictiveValue()
+ //{
+ // var now_value = await ZyConnectHelper.GetRealReservoirWaterLevel();
+ // IStation.CalcModel.AnaRequestBase requestBase
+ // var today_prj = Common.HistoryAnaPrjFileHelper.GetPrj(DateTime.Today);
- var today_prj = Common.HistoryAnaPrjFileHelper.GetPrj(DateTime.Today);
+ // if(today_prj == null || today_prj.BlockTimes == null || today_prj.PointTimes == null)
+ // {
+ // return new IStation.Dto.ApiResult<double>(-100);
+ // }
- if(today_prj == null || today_prj.BlockTimes == null || today_prj.PointTimes == null)
- {
- return new IStation.Dto.ApiResult<double>(-100);
- }
+ // var now = DateTime.Now;
+ // double predictiveValue = now_value;
- var now = DateTime.Now;
- double predictiveValue = now_value;
-
- foreach(var pt in today_prj.PointTimes)
- {
- if (now > pt.Time)
- {
- predictiveValue = now_value + today_prj.PointTimes.Last().WaterLevelH - pt.WaterLevelH;
- return new IStation.Dto.ApiResult<double>(predictiveValue);
- }
- }
+ // foreach(var pt in today_prj.PointTimes)
+ // {
+ // if (now > pt.Time)
+ // {
+ // predictiveValue = now_value + today_prj.PointTimes.Last().WaterLevelH - pt.WaterLevelH;
+ // return new IStation.Dto.ApiResult<double>(predictiveValue);
+ // }
+ // }
- return new IStation.Dto.ApiResult<double>(now_value);
- }
+ // return new IStation.Dto.ApiResult<double>(now_value);
+ //}
}
}
\ No newline at end of file
--
Gitblit v1.9.3