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 | 343 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 241 insertions(+), 102 deletions(-)
diff --git a/WebApi/Controllers/ZyPrjController.cs b/WebApi/Controllers/ZyPrjController.cs
index 7b466d1..558f085 100644
--- a/WebApi/Controllers/ZyPrjController.cs
+++ b/WebApi/Controllers/ZyPrjController.cs
@@ -15,7 +15,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Web;
-using System.Web.Http;
+using System.Web.Http;
namespace IStation.ZyDto
{
@@ -29,16 +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; }//鏈�楂樻按搴撴按浣嶉檺鍒舵椂闂�(鍙┖) 鏃堕棿鏍煎紡
-
- public string IsSubmit { get; set; }//璁＄畻瀹�,鏄惁鎺ㄩ��
- public string IsTemporary { get; set; }//鏄惁鏄复鏃剁畻涓�涓�(鏂�)
}
}
@@ -59,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" };
@@ -72,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 +102,13 @@
anaRequest.WaterLevels闀挎睙 = GetTide3Day(_tideSouce, start_timme);
#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)
{
@@ -120,16 +118,18 @@
}
anaRequest.TotalFlowIn = TotalFlowIn;
- }
- #endregion
+ }
- #region 姘翠綅瑕佹眰
+ #endregion 鍙栨按鎬婚噺
+
+ #region 姘翠綅瑕佹眰
+
if (!string.IsNullOrEmpty(request.MaxReservoirLevelTime))
{
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))
@@ -144,19 +144,28 @@
}
else
{
- if (string.IsNullOrEmpty(request.TotalFlowIn))
- {
- IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�",
- start_timme, end_timme));
+ if (string.IsNullOrEmpty(request.TotalFlowIn) || string.IsNullOrWhiteSpace(request.TotalFlowIn))
+ {
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�" };
}
- }
- #endregion
+ double TotalFlowIn = 0;
+ if (!double.TryParse(request.TotalFlowIn, out TotalFlowIn))
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ユ暟瀛楀瀷鍙栨按鎬婚噺,鎺ュ彈鍒扮殑杈撳叆鍊兼槸:" + request.TotalFlowIn };
+ }
+ }
+
+ #endregion 姘翠綅瑕佹眰
#region 渚涙按閲�
- if (string.IsNullOrEmpty(request.TotalFlowOut))
+
+ double TotalFlowOut = 0;
+ double TotalFlowOutPrecid = 0;//棰勬祴鍊肩殑渚涙按鎬婚噺
+
+ if (string.IsNullOrEmpty(request.TotalFlowOut) || string.IsNullOrWhiteSpace(request.TotalFlowOut))
{//鐢ㄩ娴嬪��
#region 鐢ㄩ娴嬪��
+
anaRequest.PerHourFlowOut = new List<double>();
IStation.DAL.WaterPredictRecord dal = new DAL.WaterPredictRecord();
var water_records = dal.GetByHourRangle(start_timme, end_timme);
@@ -188,18 +197,18 @@
Data = error_info11
};
}
- anaRequest.PerHourFlowOut.Add(r.LastPredictValue );//璁＄畻涓敤鍚�
+ TotalFlowOutPrecid += r.LastPredictValue;
+ anaRequest.PerHourFlowOut.Add(r.LastPredictValue);//璁＄畻涓敤鍚�
}
- #endregion
+ IStation.LogHelper.Info(string.Format(" 鑾峰彇姘撮噺棰勬祴鍊�: {0} ", string.Join(",", anaRequest.PerHourFlowOut)));
+
+ #endregion 鐢ㄩ娴嬪��
}
else
{
- double TotalFlowOut = 0;
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)
{
@@ -212,22 +221,36 @@
var count = (end_timme - start_timme).TotalHours;
for (var d = start_timme; d <= end_timme; d = d.AddHours(1))
{
- list.Add(Math.Round( TotalFlowOut / count,1));
+ list.Add(Math.Round(TotalFlowOut / count, 1));
}
anaRequest.PerHourFlowOut = list;
- }
- #endregion
+ }
+ #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))
@@ -247,38 +270,40 @@
anaRequest.StartReservoirLevel)
};
}
- bool isTemp = false;
- if (!string.IsNullOrEmpty(request.IsTemporary))
- {
- isTemp = Convert.ToBoolean(request.IsTemporary);
- }
-
+ //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);
-
+
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--------------------------------------");
//淇濆瓨鏂规
- if (!isTemp)
- {
- var ret = Common.HistoryAnaPrjFileHelper.SavePrj(IStation.AnaGlobalParas.Setting, anaRequest, defaultPrj);
- }
-
+ var ret = Common.HistoryAnaPrjFileHelper.SavePrj(IStation.AnaGlobalParas.Setting, anaRequest, defaultPrj);
+ //
var dto_prj = ToPrjDto(defaultPrj);
+ if (TotalFlowOutPrecid > 1)
+ {
+ dto_prj.FlowTotalOut = Math.Round(TotalFlowOutPrecid / 10000, 1);
+ }
+ else
+ {
+ dto_prj.FlowTotalOut = TotalFlowOut;
+ }
#region 鎺ㄩ��
@@ -292,7 +317,7 @@
#endregion 鎺ㄩ��
- IStation.LogHelper.Info(string.Format(" 浜х敓璁＄畻鏂规:{0}", dto_prj.schemeID));
+ // IStation.LogHelper.Info(string.Format(" 浜х敓璁＄畻鏂规:{0}", dto_prj.schemeID));
return new IStation.Dto.ApiResult<IStation.ZyDto.SubmitPrj>(dto_prj) { Code = ApiResultCode.Success };
}
@@ -316,8 +341,6 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
}
-
-
IStation.CalcModel.AnaRequestBase requestBase;
var prj = Common.HistoryAnaPrjFileHelper.GetByEndTime澶т簬(last_end_time, out requestBase);
if (prj == null)
@@ -326,15 +349,12 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = string.Format("鏈壘鍒皗0}缁撴潫鐨勫垎鏋愰」鐩�", AnaStartTime) };
}
-
-
IStation.CalcModel.ZyStartInfo zyStartInfo = new IStation.CalcModel.ZyStartInfo();
//zyStartInfo.OpenPumpStatus = prj.EndTimeOpenPumpStatus;
if (prj.EndTimeOpenPumpStatus != null && prj.EndTimeOpenPumpStatus.Count > 0)
{
zyStartInfo.OpenPumpStatus = string.Join(",", prj.EndTimeOpenPumpStatus);
}
-
var near_pt = prj.NearPointTime(DateTime.Now);
if (near_pt == null)
@@ -353,24 +373,47 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鍦ㄩ」鐩腑, 鏈�鍚庝竴涓� BlockTime鐨� PointTimes 灞炴�у�间负绌�" };
}
var lz = prj.BlockTimes.Last().PointTimes.Last().WaterLevelH;
- var lz_pt = prj.FindPointTime(last_end_time);
+ var lz_pt = prj.FindPointTime(last_end_time);
if (lz_pt != null)
{
- lz = lz_pt.WaterLevelH;
+ lz = lz_pt.WaterLevelH;
}
double start_yuce = lz + now_level - new_yuce;
+ IStation.LogHelper.Info(string.Format("GetAnaStartPara StartTime {0} Level: {1},{2},{3} ,{4} ", AnaStartTime, lz, now_level, new_yuce, start_yuce));
- IStation.LogHelper.Info(string.Format("GetAnaStartPara StartTime {0} Level: {1},{2},{3} ,{4} ", AnaStartTime, lz , now_level , new_yuce, start_yuce));
-
- zyStartInfo.ReservoirWaterLevel = Math.Round( start_yuce,3);
+ zyStartInfo.ReservoirWaterLevel = Math.Round(start_yuce, 3);
return new IStation.Dto.ApiResult<IStation.CalcModel.ZyStartInfo>(zyStartInfo) { Code = ApiResultCode.Success };
}
catch (Exception ex)
{
IStation.LogHelper.Error("GetAnaStartPara line 277", ex);
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = string.Format("鍦ㄩ」鐩腑, 鎺ュ彛鎶ラ敊: {0} ", ex.Message) };
+ }
+ }
+
+ /// <summary>
+ /// 纭璋冨害鏂规
+ /// </summary>
+ /// <param name="ana"></param>
+ /// <returns></returns>
+ [Route("ConfirmSchemeByID")]
+ [HttpPost]
+ public IStation.Dto.ApiResult ConfirmSchemeByID(string ID)
+ {
+ 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);
+ else
+ {
+ IStation.LogHelper.Info(string.Format(" ConfirmSchemeByID error ID:{0}, reason:{1}", ID, info));
+ return new IStation.Dto.ApiResult<bool>(false);
}
}
@@ -386,17 +429,22 @@
defaultPrj.ID = $"{time.Year}{time.Month}{time.Day}{time.Hour}{time.Minute}{time.Second}";
}
dto_prj.schemeID = defaultPrj.ID;
+ dto_prj.schemeName = defaultPrj.Name;
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.FlowTotalIn = Math.Round(defaultPrj.SumFlow, 0);
dto_prj.PowerTotal = Math.Round(defaultPrj.SumPower, 0);
dto_prj.MoneyTotal = Math.Round(defaultPrj.SumMoney, 0);
dto_prj.BlockTimes = new List<ZyDto.SubmitPrjBlockTime>();
- if(defaultPrj.BlockTimes != null)
+ 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)
@@ -413,6 +461,7 @@
dto_item.Records = new List<SubmitPrjTime>();
foreach (var bt2 in bt.PointTimes)
{
+ maxHeight = Math.Max(maxHeight, bt2.WaterLevelH);
dto_item.Records.Add(new SubmitPrjTime(bt2));
}
}
@@ -420,29 +469,28 @@
dto_prj.BlockTimes.Add(dto_item);
}
}
-
-
+ dto_prj.MaxWaterLevelH = maxHeight;
+ dto_prj.StartWaterLevelH = startHeight;
dto_prj.Switchs = new List<SubmitPrjSwitchInfo>();
- if(defaultPrj.PumpSwitchs != null)
+ 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");//鏃堕棿
- dto_item.SwitchType = bt.SwitchType;///1 寮�鏈� 0 鍏虫満
+ dto_item.SwitchType = bt.SwitchType;///1 寮�鏈� 0 鍏虫満
dto_prj.Switchs.Add(dto_item);
}
}
-
return dto_prj;
}
#endregion 鎹㈢畻鎴怐TO
-
/// <summary>
/// 鑾峰彇鏌愪竴澶�,鏈�杩戜竴鏉�
@@ -462,8 +510,7 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
}
- // IStation.LogHelper.Info(string.Format(" api GetHistoryByDay {0} format: {1} ", day,d));
-
+ IStation.LogHelper.Info(string.Format(" api GetHistoryByDay {0} format: {1} ", day, d));
IStation.CalcModel.AnaRequestBase requestBase = null;
var prj = Common.HistoryAnaPrjFileHelper.GetByCreateDay(d, out requestBase);
@@ -478,7 +525,6 @@
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Alert, Message = "鏈壘鍒伴」鐩�" };
}
}
-
/// <summary>
/// 鑾峰彇鏈�杩戜竴鏉�
@@ -507,7 +553,6 @@
}
}
-
/// <summary>
///
/// </summary>
@@ -524,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.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.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)
{
@@ -565,7 +635,6 @@
IStation.LogHelper.Info("ZyPrj GetSetting : Content: " + JsonHelper.Object2Json(dto_setting));
-
return new IStation.Dto.ApiResult<IStation.Dto.ZyPrjAnaSetting>(dto_setting);
}
@@ -580,11 +649,11 @@
{
if (dto == null)
{
- return new IStation.Dto.ApiResult<bool>(false);
+ return new IStation.Dto.ApiResult<bool>(false) { Message = "鍏ュ弬涓虹┖" };
}
var model_setting = IStation.AnaGlobalParas.Setting;
- IStation.LogHelper.Info("ZyPrj SaveSetting : Content: "+JsonHelper.Object2Json(dto));
+ IStation.LogHelper.Info("ZyPrj SaveSetting : Content: " + JsonHelper.Object2Json(dto));
if (dto.MinOpenTimeMinute < 5)
{
@@ -605,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)
{
@@ -707,49 +781,113 @@
});
}
}
-
- if (dto.OpenPumpIndexSequence != null)
+
+ if (!string.IsNullOrEmpty(dto.OpenPumpIndexSequence))
{
int[] new_set_sequence;
var error = BuildSequenceFromDto(dto.OpenPumpIndexSequence, out new_set_sequence);
- if (!string.IsNullOrEmpty(error)) {
-
+ if (!string.IsNullOrEmpty(error))
+ {
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "寮�娉甸『搴� " + error };
}
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);
if (!string.IsNullOrEmpty(error))
{
-
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鍏虫车椤哄簭 " + error };
}
- model_setting.ClosePumpIndexSequence = new_set_sequence;
+ 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);
if (!string.IsNullOrEmpty(error))
{
-
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璋冨害娉典紭鍏堝害椤哄簭 " + error };
}
- model_setting.OptimalPumpIndexSequence = new_set_sequence;
+ model_setting.OptimalPumpIndexSequence = new_set_sequence;
}
+
+ //妫�淇姸鎬�, 鐩存帴璇籗CADA绯荤粺
+ //if (dto.UnablePumpIndexArray != null && dto.UnablePumpIndexArray.Count()>0)
+ //{
+ // if (dto.UnablePumpIndexArray.Count() > 2)
+ // {
+ // return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "妫�淇车鏁伴噺涓嶈兘瓒呰繃2鍙� " };
+ // }
+ // if (dto.UnablePumpIndexArray.Contains(5))
+ // {
+ // List<int> penPumpIndexs1 = new List<int>();
+ // foreach (var p in dto.UnablePumpIndexArray)
+ // {
+ // penPumpIndexs1.Add(p - 1);
+ // }
+ // model_setting.UnablePumpIndexArray = penPumpIndexs1.ToArray();
+ // }
+ // else
+ // {
+ // model_setting.UnablePumpIndexArray = dto.UnablePumpIndexArray;
+ // }
+ // model_setting.Check_Optimal_UnablePumpIndexArray();
+ //}
+ //else
+ //{
+ // model_setting.UnablePumpIndexArray = null;
+ //}
return new IStation.Dto.ApiResult<bool>(IStation.Common.AnaSetting.SaveSetting(model_setting));
}
- private string BuildSequenceFromDto(int[] sequenceDto, out int[] sequenceDs)
+ /// <summary>
+ ///鑾峰彇鏈烘车妫�淇姸鎬�
+ /// </summary>
+ /// <returns></returns>
+ [Route("SynOverhaulStatus")]
+ [HttpGet]
+ public IStation.Dto.ApiResult SynOverhaulStatus()
+ {
+ 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;
+
+ 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)
@@ -763,7 +901,7 @@
}
else if (ind > 5)
{
- return " 璁剧疆鍙傛暟涓嶅悎鐞�,鏈烘车搴忓彿瓒呰繃5" ;
+ return " 璁剧疆鍙傛暟涓嶅悎鐞�,鏈烘车搴忓彿瓒呰繃5";
}
else
{
@@ -772,7 +910,7 @@
}
if (penPumpIndexs.Distinct().Count() != 5)
{
- return " 璁剧疆鍙傛暟涓嶅悎鐞�" ;
+ return " 璁剧疆鍙傛暟涓嶅悎鐞�";
}
if (penPumpIndexs.Contains(5))
@@ -786,26 +924,27 @@
}
else
{
- sequenceDs = penPumpIndexs.ToArray();
+ sequenceDs = penPumpIndexs.ToArray();
}
return null;
}
private int[] BuildSequenceToDto(int[] sequenceDs)
{
- if(sequenceDs == null || sequenceDs.Length == 0) return null;
+ if (sequenceDs == null || sequenceDs.Length == 0) return null;
- List<int > sequenceDto = new List<int>();
+ List<int> sequenceDto = new List<int>();
foreach (var sequence in sequenceDs)
{
- sequenceDto.Add(sequence+1);
+ sequenceDto.Add(sequence + 1);
}
return sequenceDto.ToArray();
}
+
private Model.eTideSouce _tideSouce = Model.eTideSouce.Book;
- public static List<Model.TimeWaterLevel> GetTide3Day(Model.eTideSouce tideSouce, DateTime calc_day)
+ public static List<Model.TimeWaterLevel> GetTide3Day(Model.eTideSouce tideSouce, DateTime calc_day)
{
DateTime _rangDay1, _rangDay2, _rangDay3;
string error1, error2, error3;
--
Gitblit v1.9.3