From e08f18c84c96ca794407f4fcb737b26fa76c0a1f Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 11 六月 2024 09:35:03 +0800
Subject: [PATCH] 改了配置类
---
WebApi/Controllers/ZyPrjController.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/WebApi/Controllers/ZyPrjController.cs b/WebApi/Controllers/ZyPrjController.cs
index f4bce48..2496055 100644
--- a/WebApi/Controllers/ZyPrjController.cs
+++ b/WebApi/Controllers/ZyPrjController.cs
@@ -29,7 +29,7 @@
//public int? StartOpenCount { get; set; } = -1;//宸蹭綔搴�
public string StartReservoirLevel { get; set; }//寮�濮嬫按搴撴按浣�(鍙┖):鍗曚綅m
- public List<int> StartOpenPumpIndexArray { get; set; }//寮�濮嬫満娉靛紑鏈虹姸鎬�
+ public List<int> StartOpenPumpIndexArray { get; set; }//寮�濮嬫満娉靛紑鏈虹姸鎬�(鏂�)
public string TotalFlowIn { get; set; }//鍙栨按鎬婚噺 (鍗曚綅 鍚�)
@@ -37,6 +37,7 @@
public string MaxReservoirLevelTime { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒舵椂闂�(鍙┖) 鏃堕棿鏍煎紡
public string IsSubmit { get; set; }//璁＄畻瀹�,鏄惁鎺ㄩ��
+ public string IsTemporary { get; set; }//鏄惁鏄复鏃剁畻涓�涓�(鏂�)
}
}
@@ -195,17 +196,23 @@
anaRequest.CurrentWaterBoxLevel)
};
}
-
+ bool isTemp = false;
+ if (!string.IsNullOrEmpty(request.IsTemporary))
+ {
+ isTemp = Convert.ToBoolean(request.IsTemporary);
+ }
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));
+ var er = string.Format("Zy Prj Time:{0}-{1} , 璁＄畻閿欒, 鍘熷洜鏄�:{2} ,Request::: {3}",
+ start_timme, end_timme, error_info, JsonHelper.Object2Json(anaRequest));
+
+ IStation.LogHelper.Info(er);
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璁＄畻閿欒, 鍘熷洜鏄�:" + error_info };
}
else
@@ -214,7 +221,11 @@
}
//淇濆瓨鏂规
- var ret = Common.HistoryAnaPrjFileHelper.SavePrj(IStation.AnaGlobalParas.Setting, anaRequest, defaultPrj);
+ if (!isTemp)
+ {
+ var ret = Common.HistoryAnaPrjFileHelper.SavePrj(IStation.AnaGlobalParas.Setting, anaRequest, defaultPrj);
+ }
+
var dto_prj = ToPrjDto(defaultPrj);
--
Gitblit v1.9.3