From 97270e48e35dbce006263f6dc5fa6b6d8f81d0f5 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期五, 02 八月 2024 10:44:48 +0800
Subject: [PATCH] 123
---
WebApi/Controllers/ZyPrjController.cs | 584 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 492 insertions(+), 92 deletions(-)
diff --git a/WebApi/Controllers/ZyPrjController.cs b/WebApi/Controllers/ZyPrjController.cs
index 6cc8eae..4509d18 100644
--- a/WebApi/Controllers/ZyPrjController.cs
+++ b/WebApi/Controllers/ZyPrjController.cs
@@ -16,8 +16,6 @@
using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
-using System.Web.UI.WebControls;
-using System.Web.UI.WebControls.WebParts;
namespace IStation.ZyDto
{
@@ -28,14 +26,16 @@
public string StartTime { get; set; }
public string EndTime { get; set; }
- public int? StartOpenCount { get; set; } = -1;
+ //public int? StartOpenCount { get; set; } = -1;//宸蹭綔搴�
+
+ public string StartReservoirLevel { get; set; }//寮�濮嬫按搴撴按浣�(鍙┖):鍗曚綅m
+ public string StartOpenPumpIndexArray { get; set; }//寮�濮嬫満娉靛紑鏈虹姸鎬�(涓嶅彲绌�)
public string TotalFlowIn { get; set; }//鍙栨按鎬婚噺 (鍗曚綅 鍚�)
- public string StartReservoirLevel { get; set; }//寮�濮嬫按搴撴按浣�(鍙┖):鍗曚綅m
+ public string TotalFlowOut { get; set; }//渚涙按鎬婚噺 (鍗曚綅 鍚�) 涓嶈緭鍏ュ氨鐢ㄩ娴嬪��
+
public string MaxReservoirLevel { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒�(鍙┖):鍗曚綅m
public string MaxReservoirLevelTime { get; set; }//鏈�楂樻按搴撴按浣嶉檺鍒舵椂闂�(鍙┖) 鏃堕棿鏍煎紡
-
- public string IsSubmit { get; set; }//璁＄畻瀹�,鏄惁鎺ㄩ��
}
}
@@ -55,8 +55,7 @@
[Route("Calc")]
[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" };
@@ -69,6 +68,11 @@
{
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;
@@ -97,25 +101,16 @@
anaRequest.CalcOptType = (eCalcOptType)IStation.AnaGlobalParas.Setting.OptSortType;
anaRequest.StartTime = start_timme;
anaRequest.EndTime = end_timme;
- anaRequest.WaterLevels闀挎睙 = GetTide3Day(start_timme);
+ anaRequest.WaterLevels闀挎睙 = GetTide3Day(_tideSouce, 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));
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ュ彇姘存�婚噺鎴栨按浣嶈姹�" };
- }
- }
- else
+ #region 鍙栨按鎬婚噺
+
+ 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)
{
@@ -126,12 +121,57 @@
anaRequest.TotalFlowIn = TotalFlowIn;
}
- if (!string.IsNullOrEmpty(request.MaxReservoirLevel))
+
+ #endregion 鍙栨按鎬婚噺
+
+ #region 姘翠綅瑕佹眰
+
+ if (!string.IsNullOrEmpty(request.MaxReservoirLevelTime))
{
- anaRequest.MaxLimitWaterBoxLevel = Convert.ToDouble(request.MaxReservoirLevel);
+ anaRequest.MaxReservoirLevelTime = request.MaxReservoirLevelTime;
+ }
+
+ if (!string.IsNullOrEmpty(request.MaxReservoirLevel) && !string.IsNullOrWhiteSpace(request.MaxReservoirLevel))
+ {
+ double MaxReservoirLevel = 0;
+ if (!double.TryParse(request.MaxReservoirLevel, out MaxReservoirLevel))
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ュ悎鐞嗙殑姘翠綅瑕佹眰鍊�" };
+ }
+ if (MaxReservoirLevel < 1 || MaxReservoirLevel > 10)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "璇疯緭鍏ュ悎鐞嗙殑姘翠綅瑕佹眰鍊�" };
+ }
+ anaRequest.MaxReservoirLevel = MaxReservoirLevel;
+ }
+ else
+ {
+ if (string.IsNullOrEmpty(request.TotalFlowIn) || string.IsNullOrWhiteSpace(request.TotalFlowIn))
+ {
+ 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) || 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);
- LogHelper.Info(water_records.Count.ToString());
+ //LogHelper.Info(water_records.Count.ToString());
if (water_records == null)
{
IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 姘翠綅棰勬祴鏁版嵁涓虹┖,璇峰厛淇濇寔姘翠綅棰勬祴鏈嶅姟姝ｅ父杩愯",
@@ -146,7 +186,6 @@
return new IStation.Dto.ApiResult<string>() { Code = ApiResultCode.Error, Data = "棰勬祴鏁版嵁鑾峰彇澶辫触,鏁版嵁鏉℃棤娉曞尮閰�, 妫�鏌ユ槸鍚﹂娴嬫湇鍔′腑鏂�" };
}
- anaRequest.SpaceFlowOut = new List<double>();
foreach (var r in water_records)
{
if (r.States == 0)
@@ -160,64 +199,223 @@
Data = error_info11
};
}
- anaRequest.SpaceFlowOut.Add(r.LastPredictValue / 10000);
+ TotalFlowOutPrecid += r.LastPredictValue;
+ anaRequest.PerHourFlowOut.Add(r.LastPredictValue);//璁＄畻涓敤鍚�
}
- }
- if (!string.IsNullOrEmpty(request.MaxReservoirLevelTime))
- anaRequest.MaxLimitWaterBoxTime = request.MaxReservoirLevelTime;
- //
- if (request.StartOpenCount == null)
- {
- anaRequest.StartOpenCount = -1;
+ IStation.LogHelper.Info(string.Format(" 鑾峰彇姘撮噺棰勬祴鍊�: {0} ", string.Join(",",anaRequest.PerHourFlowOut)));
+ #endregion 鐢ㄩ娴嬪��
}
else
{
- anaRequest.StartOpenCount = request.StartOpenCount.Value;
+ if (!double.TryParse(request.TotalFlowOut, out TotalFlowOut))
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "娉ㄦ剰渚涙按鎬婚噺杈撳叆鍙傛暟鏃犳硶璇嗗埆,鍙傛暟鏄�:"+ request.TotalFlowOut };
+ }
+ if (TotalFlowOut < 10000)
+ {
+ IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 娉ㄦ剰鍙栨按鎬婚噺鍗曚綅鏄惃,褰撳墠鍙傛暟鍙傛暟杩囧皬",
+ start_timme, end_timme));
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "娉ㄦ剰渚涙按鎬婚噺鍗曚綅鏄惃,褰撳墠鍙傛暟鍙傛暟杩囧皬" };
+ }
+ //TotalFlowOut = TotalFlowOut / 10000;//璁＄畻涓敤鍚�
+ List<double> list = new List<double>();
+ 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));
+ }
+ anaRequest.PerHourFlowOut = list;
}
+ #endregion 渚涙按閲�
+
+ //寮�濮嬫椂鐨勫紑鏈虹姸鎬�
+ List<int> StartOpenPumpIndexArray = new List<int>();
+ if (!string.IsNullOrEmpty(request.StartOpenPumpIndexArray ))
+ {
+ 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 = StartOpenPumpIndexArray;
+
//闄堣姘村簱姘翠綅
- if (!string.IsNullOrEmpty(request.StartReservoirLevel))
+ if (string.IsNullOrEmpty(request.StartReservoirLevel))
{
- anaRequest.CurrentWaterBoxLevel = Convert.ToDouble(request.StartReservoirLevel);
+ IStation.LogHelper.Info(" 鏈缃紑濮嬫椂姘村簱姘翠綅 (Error: StartReservoirLevel is null)");
+ return new IStation.Dto.ApiResult<string>() { Code = ApiResultCode.Error, Data = "鏈缃紑濮嬫椂姘村簱姘翠綅 (Error: StartReservoirLevel is null) " };
}
- else
+ anaRequest.StartReservoirLevel = Convert.ToDouble(request.StartReservoirLevel);
+ if (anaRequest.StartReservoirLevel < 2)
{
- anaRequest.CurrentWaterBoxLevel = ZyConnectHelper.GetRealReservoirWaterLevel();
+ IStation.LogHelper.Info(string.Format(" 璁剧疆寮�濮嬫椂姘村簱姘翠綅鐨勬暟鎹繃灏� (Error: StartReservoirLevel is {0}})",
+ anaRequest.StartReservoirLevel));
+ return new IStation.Dto.ApiResult<string>()
+ {
+ Code = ApiResultCode.Error,
+ Data = string.Format(" 璁剧疆寮�濮嬫椂姘村簱姘翠綅鐨勬暟鎹繃灏� (Error: StartReservoirLevel is {0}})",
+ anaRequest.StartReservoirLevel)
+ };
}
+ //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));
+ {
+ 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--------------------------------------");
- //淇濆瓨鏂规
+ //淇濆瓨鏂规
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 鎺ㄩ��
- if (!string.IsNullOrEmpty(request.IsSubmit) && Convert.ToBoolean(request.IsSubmit))
- {
- Task.Run(() =>
- {
- _ = ZyProjectHelper.SubmitPrj(defaultPrj);
- });
- }
+ //if (!string.IsNullOrEmpty(request.IsSubmit) && Convert.ToBoolean(request.IsSubmit))
+ //{
+ // Task.Run(() =>
+ // {
+ // _ = ZyProjectHelper.SubmitPrj(defaultPrj);
+ // });
+ //}
#endregion 鎺ㄩ��
+ // IStation.LogHelper.Info(string.Format(" 浜х敓璁＄畻鏂规:{0}", dto_prj.schemeID));
+
return new IStation.Dto.ApiResult<IStation.ZyDto.SubmitPrj>(dto_prj) { Code = ApiResultCode.Success };
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍒濆姘翠綅,鍜屽綋鏃剁殑寮�鏈虹姸鎬�
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ [Route("GetAnaStartPara")]
+ [HttpGet]
+ public IStation.Dto.ApiResult GetAnaStartPara(string AnaStartTime)
+ {
+ if (string.IsNullOrEmpty(AnaStartTime)) { return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" }; }
+
+ try
+ {
+ DateTime last_end_time;
+ if (!DateTime.TryParse(AnaStartTime, out last_end_time))
+ {
+ 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)
+ {
+ IStation.LogHelper.Info(string.Format("GetAnaStartPara 鏈壘鍒皗0}缁撴潫鐨勫垎鏋愰」鐩�", AnaStartTime));
+ 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)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = string.Format("鍦ㄩ」鐩腑, 鏈壘鍒皗0}鐨勬按搴撴按浣嶆暟鎹�", DateTime.Now) };
+ }
+
+ var new_yuce = near_pt.WaterLevelH;//鏄ㄥぉ棰勬祴姘翠綅
+ double now_level = ZyConnectHelper.GetRealReservoirWaterLevel();//瀹炴椂姘翠綅
+ if (prj.BlockTimes == null || prj.BlockTimes.Count() == 0)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鍦ㄩ」鐩腑, BlockTimes鍊间负绌�" };
+ }
+ if (prj.BlockTimes.Last().PointTimes == null || prj.BlockTimes.Last().PointTimes.Count() == 0)
+ {
+ 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);
+ if (lz_pt != null)
+ {
+ 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));
+
+ 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);
+ }
}
#region 鎹㈢畻鎴怐TO
@@ -232,34 +430,59 @@
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.Items = new List<ZyDto.SubmitPrjItem>();
- foreach (var bt in defaultPrj.BlockTimes)
+ dto_prj.BlockTimes = new List<ZyDto.SubmitPrjBlockTime>();
+ double maxHeight = 0;
+ if (defaultPrj.BlockTimes != null)
{
- if (bt.OpenPumpCount == 0)
- continue;
- ZyDto.SubmitPrjItem dto_item = new ZyDto.SubmitPrjItem();
- dto_item.StartTime = bt.StartTime;
- dto_item.EndTime = bt.EndTime;
- dto_item.OpenPumpCount = bt.OpenPumpCount;
- dto_item.OpenPumpIndexs = IStation.AnaGlobalParas.Setting.GetOpenPumpIndexArrays(bt.OpenPumpCount);
- dto_prj.Items.Add(dto_item);
- }
- if (defaultPrj.PointTimes != null)
- {
- dto_prj.Records = new List<SubmitPrjTime>();
- foreach (var bt in defaultPrj.PointTimes)
+ foreach (var bt in defaultPrj.BlockTimes)
{
- dto_prj.Records.Add(new SubmitPrjTime(bt));
+ if (bt.OpenPumpIndexs == null)
+ continue;
+ ZyDto.SubmitPrjBlockTime dto_item = new ZyDto.SubmitPrjBlockTime();
+ dto_item.StartTime = bt.StartTime;
+ dto_item.EndTime = bt.EndTime;
+ dto_item.OpenPumpCount = bt.OpenPumpIndexs.Count;
+ dto_item.OpenPumpIndexs = bt.OpenPumpIndexs;
+ dto_item.StartSwitchGroupID = bt.StartSwitchGroupID;
+
+ if (bt.PointTimes != null)
+ {
+ 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));
+ }
+ }
+
+ dto_prj.BlockTimes.Add(dto_item);
}
}
+ dto_prj.MaxWaterLevelH = maxHeight;
+ 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.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_prj.Switchs.Add(dto_item);
+ }
+ }
+
return dto_prj;
}
@@ -283,8 +506,10 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
}
+ IStation.LogHelper.Info(string.Format(" api GetHistoryByDay {0} format: {1} ", day, d));
+
IStation.CalcModel.AnaRequestBase requestBase = null;
- var prj = Common.HistoryAnaPrjFileHelper.GetByDay(d, out requestBase);
+ var prj = Common.HistoryAnaPrjFileHelper.GetByCreateDay(d, out requestBase);
if (prj != null)
{
@@ -336,9 +561,44 @@
IStation.Dto.ZyPrjAnaSetting dto_setting = new ZyPrjAnaSetting();
dto_setting.MinOpenTimeMinute = model_setting.MinOpenTimeMinute;
dto_setting.MinSwitchTimeMinute = model_setting.MinSwitchTimeMinute;
- dto_setting.MaxPumpSwitchCount = model_setting.MaxPumpSwitchCountQ;
+ dto_setting.MaxPumpSwitchCount = model_setting.MaxPumpSwitchCount;
dto_setting.OptSortType = model_setting.OptSortType;
- dto_setting.OpenPumpIndexs = model_setting.OpenPumpIndexs;
+ dto_setting.SwitchPumpMinuteSpace = model_setting.SwitchPumpMinuteSpace;
+
+ 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)
{
@@ -371,6 +631,8 @@
}
}
+ IStation.LogHelper.Info("ZyPrj GetSetting : Content: " + JsonHelper.Object2Json(dto_setting));
+
return new IStation.Dto.ApiResult<IStation.Dto.ZyPrjAnaSetting>(dto_setting);
}
@@ -388,7 +650,9 @@
return new IStation.Dto.ApiResult<bool>(false);
}
var model_setting = IStation.AnaGlobalParas.Setting;
- IStation.LogHelper.Info("ZyPrj SaveSetting");
+
+ IStation.LogHelper.Info("ZyPrj SaveSetting : Content: " + JsonHelper.Object2Json(dto));
+
if (dto.MinOpenTimeMinute < 5)
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏈�灏戝紑娉垫椂闂� 璁剧疆杩囧皯" };
@@ -417,7 +681,7 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏈�澶у垏娉垫鏁� 璁剧疆杩囬暱" };
}
- model_setting.MaxPumpSwitchCountQ = dto.MaxPumpSwitchCount;
+ model_setting.MaxPumpSwitchCount = dto.MaxPumpSwitchCount;
if (dto.OptSortType >= 2)
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "OptSortType 鍙兘璁剧疆 0 鎴栬�� 1, 0浠ｈ〃 鐢ㄧ數閲忔渶灏� 1浠ｈ〃 鐢佃垂鏈�灏�" };
@@ -511,32 +775,168 @@
}
}
- if (dto.OpenPumpIndexs != null)
+ if (!string.IsNullOrEmpty(dto.OpenPumpIndexSequence))
{
- List<int> penPumpIndexs = new List<int>();
- foreach (var ind in dto.OpenPumpIndexs)
+ int[] new_set_sequence;
+ var error = BuildSequenceFromDto(dto.OpenPumpIndexSequence, out new_set_sequence);
+ if (!string.IsNullOrEmpty(error))
{
- if (ind < 0 || ind > 5)
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "寮�娉甸『搴� " + error };
+ }
+
+ model_setting.OpenPumpIndexSequence = new_set_sequence;
+ }
+
+ 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;
+ }
+
+ 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;
+ }
+
+ //妫�淇姸鎬�, 鐩存帴璇籗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));
+ }
+
+ /// <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))
{
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏈烘车寮�娉甸『搴忚缃弬鏁颁笉鍚堢悊" };
+ list.Add(index);
}
else
{
- penPumpIndexs.Add(ind);
+ return " 璁剧疆鍙傛暟涓嶅悎鐞�,鏈烘车搴忓彿鏈夐潪鏁板瓧";
}
}
- if (penPumpIndexs.Distinct().Count() != 5)
- {
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "鏈烘车寮�娉甸『搴忚缃弬鏁颁笉鍚堢悊" };
- }
- model_setting.OpenPumpIndexs = penPumpIndexs.ToArray();
}
- return new IStation.Dto.ApiResult<bool>(IStation.Common.AnaSetting.SaveSetting(model_setting));
+
+ return BuildSequenceFromDto(list,out sequenceDs);
+ }
+
+ private string BuildSequenceFromDto(List<int> sequenceDto, out int[] sequenceDs)
+ {
+ sequenceDs = null;
+ if (sequenceDto == null || sequenceDto.Count() == 0)
+ return null;
+ List<int> penPumpIndexs = new List<int>();
+ foreach (var ind in sequenceDto)
+ {
+ if (ind < 0)
+ {
+ return " 璁剧疆鍙傛暟涓嶅悎鐞�,鏈烘车搴忓彿鏈夎礋鏁�";
+ }
+ else if (ind > 5)
+ {
+ return " 璁剧疆鍙傛暟涓嶅悎鐞�,鏈烘车搴忓彿瓒呰繃5";
+ }
+ else
+ {
+ penPumpIndexs.Add(ind);
+ }
+ }
+ if (penPumpIndexs.Distinct().Count() != 5)
+ {
+ return " 璁剧疆鍙傛暟涓嶅悎鐞�";
+ }
+
+ if (penPumpIndexs.Contains(5))
+ {//琛ㄧず鐣岄潰浠�1 2 3 4 5
+ List<int> penPumpIndexs1 = new List<int>();
+ foreach (var p in penPumpIndexs)
+ {
+ penPumpIndexs1.Add(p - 1);
+ }
+ sequenceDs = penPumpIndexs1.ToArray();
+ }
+ else
+ {
+ sequenceDs = penPumpIndexs.ToArray();
+ }
+ return null;
+ }
+
+ private int[] BuildSequenceToDto(int[] sequenceDs)
+ {
+ if (sequenceDs == null || sequenceDs.Length == 0) return null;
+
+ List<int> sequenceDto = new List<int>();
+
+ foreach (var sequence in sequenceDs)
+ {
+ sequenceDto.Add(sequence + 1);
+ }
+ return sequenceDto.ToArray();
}
private Model.eTideSouce _tideSouce = Model.eTideSouce.Book;
- private List<Model.TimeWaterLevel> GetTide3Day(DateTime calc_day)
+ public static List<Model.TimeWaterLevel> GetTide3Day(Model.eTideSouce tideSouce, DateTime calc_day)
{
DateTime _rangDay1, _rangDay2, _rangDay3;
string error1, error2, error3;
@@ -559,9 +959,9 @@
_rangDay2 = calc_day;
_rangDay3 = calc_day.AddDays(1);
}
- waterLevels闀挎睙1 = TideHelper.GetByDay(_tideSouce, _rangDay1, out error1);
- waterLevels闀挎睙2 = TideHelper.GetByDay(_tideSouce, _rangDay2, out error2);
- waterLevels闀挎睙3 = TideHelper.GetByDay(_tideSouce, _rangDay3, out error3);
+ waterLevels闀挎睙1 = TideHelper.GetByDay(tideSouce, _rangDay1, out error1);
+ waterLevels闀挎睙2 = TideHelper.GetByDay(tideSouce, _rangDay2, out error2);
+ waterLevels闀挎睙3 = TideHelper.GetByDay(tideSouce, _rangDay3, out error3);
List<Model.TimeWaterLevel> timeValues = new List<Model.TimeWaterLevel>();
if (waterLevels闀挎睙1 != null)
--
Gitblit v1.9.3