From 18a1a6faf82b1ad00d27f6fc7f5734c34aea32df Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期五, 07 六月 2024 15:30:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/shys/ChEqCalc.V1.3
---
WebApi/Controllers/ZyPrjController.cs | 47 ++++++++++++++++++++---------------------------
1 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/WebApi/Controllers/ZyPrjController.cs b/WebApi/Controllers/ZyPrjController.cs
index e9ef32e..6cc8eae 100644
--- a/WebApi/Controllers/ZyPrjController.cs
+++ b/WebApi/Controllers/ZyPrjController.cs
@@ -56,6 +56,7 @@
[HttpPost]
public IStation.Dto.ApiResult Calc([FromBody] ZyPrjRequest request)
{
+ LogHelper.Info(JsonHelper.Object2Json(request));
if (request == null)
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "request is null" };
@@ -92,31 +93,25 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏃堕棿鑼冨洿閿欒,涓嶈兘瓒呰繃24灏忔椂" };
}
-
-
-
-
-
IStation.CalcModel.AnaRequest anaRequest = new AnaRequest();
anaRequest.CalcOptType = (eCalcOptType)IStation.AnaGlobalParas.Setting.OptSortType;
anaRequest.StartTime = start_timme;
anaRequest.EndTime = end_timme;
anaRequest.WaterLevels闀挎睙 = GetTide3Day(start_timme);
-
if (string.IsNullOrEmpty(request.TotalFlowIn))
{
if (string.IsNullOrEmpty(request.MaxReservoirLevel))
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�",
- start_timme, end_timme ));
+ start_timme, end_timme));
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�" };
}
}
else
{
double TotalFlowIn = 0;
- if(!double.TryParse( request.TotalFlowIn,out TotalFlowIn))
+ if (!double.TryParse(request.TotalFlowIn, out TotalFlowIn))
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 娉ㄦ剰鍙栨按鎬婚噺鍗曚綅鏄惃,褰撳墠鍙傛暟鍙傛暟杩囧皬",
start_timme, end_timme));
@@ -134,9 +129,9 @@
if (!string.IsNullOrEmpty(request.MaxReservoirLevel))
{
anaRequest.MaxLimitWaterBoxLevel = Convert.ToDouble(request.MaxReservoirLevel);
-
IStation.DAL.WaterPredictRecord dal = new DAL.WaterPredictRecord();
- var water_records = dal.GetByHourRangle( start_timme , end_timme );
+ var water_records = dal.GetByHourRangle(start_timme, end_timme);
+ LogHelper.Info(water_records.Count.ToString());
if (water_records == null)
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 姘翠綅棰勬祴鏁版嵁涓虹┖,璇峰厛淇濇寔姘翠綅棰勬祴鏈嶅姟姝ｅ父杩愯",
@@ -150,28 +145,26 @@
start_timme, end_timme));
return new IStation.Dto.ApiResult<string>() { Code = ApiResultCode.Error, Data = "棰勬祴鏁版嵁鑾峰彇澶辫触,鏁版嵁鏉℃棤娉曞尮閰�, 妫�鏌ユ槸鍚﹂娴嬫湇鍔′腑鏂�" };
}
-
+
anaRequest.SpaceFlowOut = new List<double>();
- foreach(var r in water_records)
+ foreach (var r in water_records)
{
- if(r.States == 0)
+ if (r.States == 0)
{
var error_info11 = string.Format("棰勬祴鏁版嵁寮傚父,鏃犳硶杩涜姘翠綅璁＄畻:{0} {1},{2}", r.DayHour, r.LastPredictValue, r.Description);
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , {2}}",
start_timme, end_timme, error_info11));
- return new IStation.Dto.ApiResult<string>() { Code = ApiResultCode.Error, Data = error_info11
+ return new IStation.Dto.ApiResult<string>()
+ {
+ Code = ApiResultCode.Error,
+ Data = error_info11
};
}
- anaRequest.SpaceFlowOut.Add(r.LastPredictValue/10000);
+ anaRequest.SpaceFlowOut.Add(r.LastPredictValue / 10000);
}
}
-
if (!string.IsNullOrEmpty(request.MaxReservoirLevelTime))
anaRequest.MaxLimitWaterBoxTime = request.MaxReservoirLevelTime;
-
-
-
-
//
if (request.StartOpenCount == null)
{
@@ -192,22 +185,19 @@
anaRequest.CurrentWaterBoxLevel = ZyConnectHelper.GetRealReservoirWaterLevel();
}
-
-
-
-
var calcHelper = new IStation.CalcPrjHelper();
AnaPrj defaultPrj = null;
string error_info = calcHelper.Calc(anaRequest, out defaultPrj);
+ LogHelper.Info(error_info);
if (!string.IsNullOrEmpty(error_info) || defaultPrj == null)
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璁＄畻閿欒, 鍘熷洜鏄�:{2} ,Request::: ",
- start_timme, end_timme, error_info)+ JsonHelper.Object2Json( anaRequest));
+ start_timme, end_timme, error_info) + JsonHelper.Object2Json(anaRequest));
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璁＄畻閿欒, 鍘熷洜鏄�:" + error_info };
}
else
{
- IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璁＄畻鎴愬姛", start_timme, end_timme ));
+ IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璁＄畻鎴愬姛", start_timme, end_timme));
}
//淇濆瓨鏂规
@@ -428,7 +418,10 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏈�澶у垏娉垫鏁� 璁剧疆杩囬暱" };
}
model_setting.MaxPumpSwitchCountQ = dto.MaxPumpSwitchCount;
-
+ if (dto.OptSortType >= 2)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "OptSortType 鍙兘璁剧疆 0 鎴栬�� 1, 0浠ｈ〃 鐢ㄧ數閲忔渶灏� 1浠ｈ〃 鐢佃垂鏈�灏�" };
+ }
model_setting.OptSortType = dto.OptSortType;
if (dto.SwitchPumpIgnoreTimes != null)
{
--
Gitblit v1.9.3