From 68da658e90864f503d97bc58a2a97f80d8e71065 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期五, 12 四月 2024 10:52:03 +0800
Subject: [PATCH] 添加众毅 接口日志
---
WebApi/Controllers/ZyPrjController.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/WebApi/Controllers/ZyPrjController.cs b/WebApi/Controllers/ZyPrjController.cs
index fabb12b..33995f3 100644
--- a/WebApi/Controllers/ZyPrjController.cs
+++ b/WebApi/Controllers/ZyPrjController.cs
@@ -37,15 +37,15 @@
/// </summary>
[RoutePrefix("ZyPrj")]
public class ZyPrjController : ApiController
- {
+ {
/// <summary>
///
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
- [Route("CalcPrj")]
+ [Route("Calc")]
[HttpPost]
- public IStation.Dto.ApiResult CalcPrj([FromBody] ZyPrjRequest request)
+ public IStation.Dto.ApiResult Calc([FromBody] ZyPrjRequest request)
{
if (request == null )
{
@@ -64,17 +64,25 @@
DateTime end_timme = DateTime.Now;
if(!DateTime.TryParse(request.StartTime,out start_timme))
{
+ IStation.LogHelper.Error(string.Format("ZyPrjRequest Time:{0}-{1} StartTime is error format", start_timme, end_timme));
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "StartTime is error format" };
}
if (!DateTime.TryParse(request.EndTime, out end_timme))
{
+ IStation.LogHelper.Error(string.Format("ZyPrjRequest Time:{0}-{1} EndTime is error format", start_timme, end_timme));
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "EndTime is error format" };
}
if(end_timme< start_timme.AddMinutes(60))
{
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏃堕棿鑼冨洿閿欒" };
+ IStation.LogHelper.Error(string.Format("ZyPrjRequest Time:{0}-{1} 鏃堕棿鑼冨洿閿欒,闂撮殧杩囩煭", start_timme, end_timme));
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏃堕棿鑼冨洿閿欒,闂撮殧杩囩煭" };
}
- if(request.TotalFlowIn == null)
+ if(end_timme > start_timme.AddDays(1))
+ {
+ IStation.LogHelper.Error(string.Format("ZyPrjRequest Time:{0}-{1} 鏃堕棿鑼冨洿閿欒,涓嶈兘瓒呰繃24灏忔椂", start_timme, end_timme)) ;
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏃堕棿鑼冨洿閿欒,涓嶈兘瓒呰繃24灏忔椂" };
+ }
+ if (request.TotalFlowIn == null)
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鍙栨按鎬婚噺閿欒" };
}
@@ -110,6 +118,13 @@
}
dto_prj.schemeID = defaultPrj.ID;
dto_prj.Day = defaultPrj.StartTime.ToString("yyyy-MM-dd");
+ dto_prj.StartTime = defaultPrj.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
+ dto_prj.EndTime = defaultPrj.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
+
+ dto_prj.FlowTotal = Math.Round(defaultPrj.SumFlow, 0);
+ dto_prj.PowerTotal = Math.Round(defaultPrj.SumPower, 0);
+ dto_prj.MoneyTotal = Math.Round(defaultPrj.SumMoney, 0);
+
dto_prj.Items = new List<ZyDto.SubmitPrjItem>();
foreach (var bt in defaultPrj.BlockTimes)
{
@@ -119,6 +134,7 @@
dto_item.StartTime = bt.StartTime;
dto_item.EndTime = bt.EndTime;
dto_item.OpenPumpCount = bt.OpenPumpCount;
+ dto_item.OpenPumpIndexs = CalcPrjHelper.GetOpenPumpIndexs(bt.OpenPumpCount);
dto_prj.Items.Add(dto_item);
}
--
Gitblit v1.9.3