From 25beb2c84d65c3f77361a5add4de3eeb172d37f1 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 05 九月 2024 10:23:41 +0800
Subject: [PATCH] 对切换泵时间间隔进行赋值
---
WebApi/Controllers/ZyPrjController.cs | 170 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 118 insertions(+), 52 deletions(-)
diff --git a/WebApi/Controllers/ZyPrjController.cs b/WebApi/Controllers/ZyPrjController.cs
index 0ad0b02..558f085 100644
--- a/WebApi/Controllers/ZyPrjController.cs
+++ b/WebApi/Controllers/ZyPrjController.cs
@@ -29,15 +29,13 @@
//public int? StartOpenCount { get; set; } = -1;//宸蹭綔搴�
public string StartReservoirLevel { get; set; }//寮�濮嬫按搴撴按浣�(鍙┖):鍗曚綅m
- public List<int> StartOpenPumpIndexArray { get; set; }//寮�濮嬫満娉靛紑鏈虹姸鎬�(鏂�)
+ public string StartOpenPumpIndexArray { get; set; }//寮�濮嬫満娉靛紑鏈虹姸鎬�(涓嶅彲绌�)
public string TotalFlowIn { get; set; }//鍙栨按鎬婚噺 (鍗曚綅 鍚�)
public string TotalFlowOut { get; set; }//渚涙按鎬婚噺 (鍗曚綅 鍚�) 涓嶈緭鍏ュ氨鐢ㄩ娴嬪��
public string MaxReservoirLevel { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒�(鍙┖):鍗曚綅m
public string MaxReservoirLevelTime { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒舵椂闂�(鍙┖) 鏃堕棿鏍煎紡
-
-
}
}
@@ -58,7 +56,6 @@
[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" };
@@ -71,6 +68,9 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "EndTime is null" };
}
+ //
+ IStation.LogHelper.Info("--------------------------START-----------------------------------------");
+ IStation.LogHelper.Info(string.Format("Zy Prj Calc Request: {0}", JsonHelper.Object2Json(request)));
DateTime start_timme = DateTime.Now;
DateTime end_timme = DateTime.Now;
@@ -103,14 +103,12 @@
#region 鍙栨按鎬婚噺
- if (!string.IsNullOrEmpty(request.TotalFlowIn))
+ if (!string.IsNullOrEmpty(request.TotalFlowIn) && !string.IsNullOrWhiteSpace(request.TotalFlowIn))
{
double TotalFlowIn = 0;
if (!double.TryParse(request.TotalFlowIn, out TotalFlowIn))
{
- IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 娉ㄦ剰鍙栨按鎬婚噺鍗曚綅鏄惃,褰撳墠鍙傛暟鍙傛暟杩囧皬",
- start_timme, end_timme));
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "娉ㄦ剰鍙栨按鎬婚噺鍗曚綅鏄惃,褰撳墠鍙傛暟鍙傛暟杩囧皬" };
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ユ暟瀛楀瀷鍙栨按鎬婚噺,鎺ュ彈鍒扮殑杈撳叆鍊兼槸:" + request.TotalFlowIn };
}
if (TotalFlowIn < 10000)
{
@@ -131,7 +129,7 @@
anaRequest.MaxReservoirLevelTime = request.MaxReservoirLevelTime;
}
- if (!string.IsNullOrEmpty(request.MaxReservoirLevel))
+ if (!string.IsNullOrEmpty(request.MaxReservoirLevel) && !string.IsNullOrWhiteSpace(request.MaxReservoirLevel))
{
double MaxReservoirLevel = 0;
if (!double.TryParse(request.MaxReservoirLevel, out MaxReservoirLevel))
@@ -146,21 +144,25 @@
}
else
{
- if (string.IsNullOrEmpty(request.TotalFlowIn))
+ if (string.IsNullOrEmpty(request.TotalFlowIn) || string.IsNullOrWhiteSpace(request.TotalFlowIn))
{
- IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�",
- start_timme, end_timme));
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�" };
+ }
+ double TotalFlowIn = 0;
+ if (!double.TryParse(request.TotalFlowIn, out TotalFlowIn))
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ユ暟瀛楀瀷鍙栨按鎬婚噺,鎺ュ彈鍒扮殑杈撳叆鍊兼槸:" + request.TotalFlowIn };
}
}
#endregion 姘翠綅瑕佹眰
#region 渚涙按閲�
+
double TotalFlowOut = 0;
double TotalFlowOutPrecid = 0;//棰勬祴鍊肩殑渚涙按鎬婚噺
- if (string.IsNullOrEmpty(request.TotalFlowOut))
+ if (string.IsNullOrEmpty(request.TotalFlowOut) || string.IsNullOrWhiteSpace(request.TotalFlowOut))
{//鐢ㄩ娴嬪��
#region 鐢ㄩ娴嬪��
@@ -198,16 +200,15 @@
TotalFlowOutPrecid += r.LastPredictValue;
anaRequest.PerHourFlowOut.Add(r.LastPredictValue);//璁＄畻涓敤鍚�
}
+ IStation.LogHelper.Info(string.Format(" 鑾峰彇姘撮噺棰勬祴鍊�: {0} ", string.Join(",", anaRequest.PerHourFlowOut)));
#endregion 鐢ㄩ娴嬪��
}
else
- {
+ {
if (!double.TryParse(request.TotalFlowOut, out TotalFlowOut))
{
- IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 娉ㄦ剰鍙栨按鎬婚噺鍗曚綅鏄惃,褰撳墠鍙傛暟鍙傛暟杩囧皬",
- start_timme, end_timme));
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "娉ㄦ剰渚涙按鎬婚噺鍗曚綅鏄惃,褰撳墠鍙傛暟鍙傛暟杩囧皬" };
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "娉ㄦ剰渚涙按鎬婚噺杈撳叆鍙傛暟鏃犳硶璇嗗埆,鍙傛暟鏄�:" + request.TotalFlowOut };
}
if (TotalFlowOut < 10000)
{
@@ -228,13 +229,28 @@
#endregion 渚涙按閲�
//寮�濮嬫椂鐨勫紑鏈虹姸鎬�
- if (request.StartOpenPumpIndexArray == null)
+ List<int> StartOpenPumpIndexArray = new List<int>();
+ if (!string.IsNullOrEmpty(request.StartOpenPumpIndexArray))
{
- IStation.LogHelper.Info(" 鏈缃紑濮嬫椂鏈烘车寮�鍋滅姸鎬� (Error: StartOpenPumpIndexArray is null)");
- return new IStation.Dto.ApiResult<string>() { Code = ApiResultCode.Error, Data = "鏈缃紑濮嬫椂鏈烘车寮�鍋滅姸鎬� (Error: StartOpenPumpIndexArray is null)" };
+ var sss = request.StartOpenPumpIndexArray.Split(',');
+ foreach (var item in sss)
+ {
+ if (int.TryParse(item, out int index))
+ {
+ if (index < 0 || index > 4)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "寮�濮嬫椂鐨勫紑鏈虹姸鎬�,鏈烘车瑙掓爣瑕佹眰涓嶈秴杩�4" };
+ }
+ StartOpenPumpIndexArray.Add(index);
+ }
+ else
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "寮�濮嬫椂鐨勫紑鏈虹姸鎬�,鍙傛暟涓嶆纭�" };
+ }
+ }
}
anaRequest.IsKnownStartOpenPump = true;
- anaRequest.StartOpenPumpIndexArray = request.StartOpenPumpIndexArray;
+ anaRequest.StartOpenPumpIndexArray = StartOpenPumpIndexArray;
//闄堣姘村簱姘翠綅
if (string.IsNullOrEmpty(request.StartReservoirLevel))
@@ -266,24 +282,21 @@
if (!string.IsNullOrEmpty(error_info) || defaultPrj == null)
{
- 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);
+ IStation.LogHelper.Info(string.Format("Zy Prj 璁＄畻閿欒: \r\n {0} ", error_info));
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 璁＄畻鎴愬姛: \r\n {0} ", JsonHelper.Object2Json(defaultPrj)));
}
+ IStation.LogHelper.Info("-----------------------------END--------------------------------------");
- //淇濆瓨鏂规
- //defaultPrj.Name
+ //淇濆瓨鏂规
var ret = Common.HistoryAnaPrjFileHelper.SavePrj(IStation.AnaGlobalParas.Setting, anaRequest, defaultPrj);
//
var dto_prj = ToPrjDto(defaultPrj);
- if(TotalFlowOutPrecid > 1)
+ if (TotalFlowOutPrecid > 1)
{
dto_prj.FlowTotalOut = Math.Round(TotalFlowOutPrecid / 10000, 1);
}
@@ -389,22 +402,20 @@
[HttpPost]
public IStation.Dto.ApiResult ConfirmSchemeByID(string ID)
{
- if (string.IsNullOrEmpty(ID) || ID=="string")
+ if (string.IsNullOrEmpty(ID) || ID == "string")
{
return new IStation.Dto.ApiResult<bool>(false);
}
var dal = new IStation.DAL.AnaProject();
- var info = dal.SetConfirmStatusByID(ID );
- if(string.IsNullOrEmpty(info) )
- return new IStation.Dto.ApiResult<bool >(true );
+ var info = dal.SetConfirmStatusByID(ID);
+ if (string.IsNullOrEmpty(info))
+ return new IStation.Dto.ApiResult<bool>(true);
else
{
IStation.LogHelper.Info(string.Format(" ConfirmSchemeByID error ID:{0}, reason:{1}", ID, info));
- return new IStation.Dto.ApiResult<bool>(false );
+ return new IStation.Dto.ApiResult<bool>(false);
}
-
}
-
#region 鎹㈢畻鎴怐TO
@@ -429,8 +440,11 @@
dto_prj.BlockTimes = new List<ZyDto.SubmitPrjBlockTime>();
double maxHeight = 0;
+ double startHeight = 0;
+
if (defaultPrj.BlockTimes != null)
{
+ startHeight = defaultPrj.BlockTimes.First().ReservoirStartHeight;
foreach (var bt in defaultPrj.BlockTimes)
{
if (bt.OpenPumpIndexs == null)
@@ -456,12 +470,14 @@
}
}
dto_prj.MaxWaterLevelH = maxHeight;
+ dto_prj.StartWaterLevelH = startHeight;
dto_prj.Switchs = new List<SubmitPrjSwitchInfo>();
if (defaultPrj.PumpSwitchs != null)
{
foreach (var bt in defaultPrj.PumpSwitchs)
{
ZyDto.SubmitPrjSwitchInfo dto_item = new ZyDto.SubmitPrjSwitchInfo();
+ dto_item.Index = bt.Index;
dto_item.GroupID = bt.GroupID;//鍒嗙粍ID
dto_item.PumpIndex = bt.PumpIndex;//娉佃鏍�
dto_item.Time = bt.Time.ToString("yyyy-MM-dd HH:mm:ss");//鏃堕棿
@@ -553,13 +569,38 @@
dto_setting.OptSortType = model_setting.OptSortType;
dto_setting.SwitchPumpMinuteSpace = model_setting.SwitchPumpMinuteSpace;
- dto_setting.OpenPumpIndexSequence = model_setting.OpenPumpIndexSequence;
- dto_setting.ClosePumpIndexSequence = model_setting.ClosePumpIndexSequence;
- dto_setting.OptimalPumpIndexSequence = model_setting.OptimalPumpIndexSequence;
- dto_setting.UnablePumpIndexArray = model_setting.UnablePumpIndexArray;
+ dto_setting.OpenPumpIndexSequence = IStation.Dto.ZyPrjAnaSetting.ListToString(model_setting.OpenPumpIndexSequence);
+ dto_setting.ClosePumpIndexSequence = IStation.Dto.ZyPrjAnaSetting.ListToString(model_setting.ClosePumpIndexSequence);
+ dto_setting.OptimalPumpIndexSequence = IStation.Dto.ZyPrjAnaSetting.ListToString(model_setting.OptimalPumpIndexSequence);
+
//dto_setting.OpenPumpIndexSequence = BuildSequenceToDto(model_setting.OpenPumpIndexSequence);
//dto_setting.ClosePumpIndexSequence = BuildSequenceToDto(model_setting.ClosePumpIndexSequence);
//dto_setting.OptimalPumpIndexSequence = BuildSequenceToDto(model_setting.OptimalPumpIndexSequence);
+
+ //妫�淇车鐨勮鏍�, 0 琛ㄧず1鍙锋车 1 琛ㄧず浜屽彿娉� 涓虹┖,琛ㄧず娌℃湁妫�淇�
+ try
+ {
+ var overhallStatus = ZyConnectHelper.GetOverhaulStatus();
+ if (overhallStatus == null || overhallStatus.Count == 0)
+ {
+ if (model_setting.UnablePumpIndexArray != null)
+ {
+ dto_setting.UnablePumpIndexArray = "";
+ model_setting.UnablePumpIndexArray = null;
+ IStation.Common.AnaSetting.SaveSetting(model_setting);
+ }
+ }
+ else
+ {
+ model_setting.UnablePumpIndexArray = overhallStatus.ToArray();
+ dto_setting.UnablePumpIndexArray = string.Join(",", overhallStatus);
+ IStation.Common.AnaSetting.SaveSetting(model_setting);
+ }
+ }
+ catch (Exception ex)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏃犳硶閾炬帴宸ユ帶鏈嶅姟鍣�,閿欒鍘熷洜:" + ex.Message };
+ }
if (model_setting.SwitchPumpIgnoreTimes != null)
{
@@ -608,7 +649,7 @@
{
if (dto == null)
{
- return new IStation.Dto.ApiResult<bool>(false);
+ return new IStation.Dto.ApiResult<bool>(false) { Message = "鍏ュ弬涓虹┖" };
}
var model_setting = IStation.AnaGlobalParas.Setting;
@@ -633,6 +674,11 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏈�灏戝垏娉垫椂闂� 璁剧疆杩囬暱" };
}
model_setting.MinSwitchTimeMinute = dto.MinSwitchTimeMinute;
+ if (dto.SwitchPumpMinuteSpace < 2 || dto.SwitchPumpMinuteSpace > 30)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鍒囨崲娉垫椂闂撮棿闅� 璁剧疆涓嶅悎鐞�" };
+ }
+ model_setting.SwitchPumpMinuteSpace = dto.SwitchPumpMinuteSpace;
if (dto.MaxPumpSwitchCount < 1)
{
@@ -736,7 +782,7 @@
}
}
- if (dto.OpenPumpIndexSequence != null)
+ if (!string.IsNullOrEmpty(dto.OpenPumpIndexSequence))
{
int[] new_set_sequence;
var error = BuildSequenceFromDto(dto.OpenPumpIndexSequence, out new_set_sequence);
@@ -746,11 +792,9 @@
}
model_setting.OpenPumpIndexSequence = new_set_sequence;
-
-
}
- if (dto.ClosePumpIndexSequence != null)
+ if (!string.IsNullOrEmpty(dto.ClosePumpIndexSequence))// if (dto.ClosePumpIndexSequence != null)
{
int[] new_set_sequence;
var error = BuildSequenceFromDto(dto.ClosePumpIndexSequence, out new_set_sequence);
@@ -762,7 +806,7 @@
model_setting.ClosePumpIndexSequence = new_set_sequence;
}
- if (dto.OptimalPumpIndexSequence != null)
+ if (!string.IsNullOrEmpty(dto.OptimalPumpIndexSequence))// if (dto.OptimalPumpIndexSequence != null)
{
int[] new_set_sequence;
var error = BuildSequenceFromDto(dto.OptimalPumpIndexSequence, out new_set_sequence);
@@ -791,7 +835,7 @@
// model_setting.UnablePumpIndexArray = penPumpIndexs1.ToArray();
// }
// else
- // {
+ // {
// model_setting.UnablePumpIndexArray = dto.UnablePumpIndexArray;
// }
// model_setting.Check_Optimal_UnablePumpIndexArray();
@@ -804,9 +848,8 @@
return new IStation.Dto.ApiResult<bool>(IStation.Common.AnaSetting.SaveSetting(model_setting));
}
-
/// <summary>
- ///
+ ///鑾峰彇鏈烘车妫�淇姸鎬�
/// </summary>
/// <returns></returns>
[Route("SynOverhaulStatus")]
@@ -815,13 +858,36 @@
{
var overhallStatus = ZyConnectHelper.GetOverhaulStatus();//妫�淇车鐨勮鏍�, 0 琛ㄧず1鍙锋车 1 琛ㄧず浜屽彿娉� 涓虹┖,琛ㄧず娌℃湁妫�淇�
-
-
return new IStation.Dto.ApiResult<List<int>>(overhallStatus);
}
+ private string BuildSequenceFromDto(string sequenceDto, out int[] sequenceDs)
+ {
+ sequenceDs = null;
+ if (string.IsNullOrEmpty(sequenceDto))
+ return null;
- private string BuildSequenceFromDto(int[] sequenceDto, out int[] sequenceDs)
+ List<int> list = new List<int>();
+ if (!string.IsNullOrEmpty(sequenceDto))
+ {
+ var sss = sequenceDto.Split(',');
+ foreach (var item in sss)
+ {
+ if (int.TryParse(item, out int index))
+ {
+ list.Add(index);
+ }
+ else
+ {
+ return " 璁剧疆鍙傛暟涓嶅悎鐞�,鏈烘车搴忓彿鏈夐潪鏁板瓧";
+ }
+ }
+ }
+
+ return BuildSequenceFromDto(list, out sequenceDs);
+ }
+
+ private string BuildSequenceFromDto(List<int> sequenceDto, out int[] sequenceDs)
{
sequenceDs = null;
if (sequenceDto == null || sequenceDto.Count() == 0)
--
Gitblit v1.9.3