IStation/shys/ChEqCalc.V1.3.git

			@@ -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,17 +93,11 @@
			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))
			{
			@@ -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 );
			LogHelper.Info(water_records.Count.ToString());
			if (water_records == null)
			{
			IStation.LogHelper.Info(string.Format("Zy Prj Time:{0}-{1} , 水位预测数据为空,请先保持水位预测服务正常运行",
			@@ -159,19 +154,17 @@
			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);
			}
			}

			if (!string.IsNullOrEmpty(request.MaxReservoirLevelTime))
			anaRequest.MaxLimitWaterBoxTime = request.MaxReservoirLevelTime;




			//
			if (request.StartOpenCount == null)
			{
			@@ -192,13 +185,10 @@
			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::: ",
			@@ -431,7 +421,6 @@
			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)