tangxu
2024-06-12 16ad5cbeb4ef90fcce13458e13acc324d592106c
Calc/IStation.Calc.Core/¼ÆËã»ùÀà/ErQuCalcBaseHelper_Ë®¿â.cs
@@ -14,7 +14,7 @@
   
        protected List<double> _reservoirSpaceFlowOutList = null;//排水流量时间分配(万方)
        protected List<double> _perHourFlowOutList  = null;//供水流量时间分配(吨)
        //protected List<double?> _reservoirMinLimitHours = null;
        //protected List<double?> _reservoirMaxLimitHours = null;
@@ -27,8 +27,8 @@
            //    _area水库面积 = list水库面积.First().Area; 
            //}
      
            this._reservoirSpaceFlowOutList = anaRequest.SpaceFlowOut;
            this._perHourFlowOutList = anaRequest.PerHourFlowOut;
            //this._reservoirMinLimitHours = anaRequest.ReservoirMinLimitHours;
            //this._reservoirMaxLimitHours = anaRequest.ReservoirMaxLimitHours;
 
@@ -42,8 +42,8 @@
        /// </summary>
        private void CalcReservoirTimeData()
        { 
            if (this._reservoirSpaceFlowOutList == null ||
                this._reservoirSpaceFlowOutList.Count() == 0)
            if (this._perHourFlowOutList == null ||
                this._perHourFlowOutList.Count() == 0)
                return;
    
@@ -54,20 +54,20 @@
            int inx_hour = 0; 
            double flowTotal = 0;
            int i = 0;
            double flow_space = _reservoirSpaceFlowOutList[0] / time_count;
            double flow_space = _perHourFlowOutList[0] / time_count;
            for (var time = _calStartTime; time < this._calEndTime; time = time.AddMinutes(this._calcSpaceMinute))
            { 
                if (time.Hour != last_hour)
                {
                    last_hour = time.Hour;
                    inx_hour++; 
                    if (inx_hour > _reservoirSpaceFlowOutList.Count)
                    if (inx_hour > _perHourFlowOutList.Count)
                    {
                        flow_space = 0;
                    }
                    else
                    {
                        flow_space = _reservoirSpaceFlowOutList[inx_hour] / time_count;
                        flow_space = _perHourFlowOutList[inx_hour] / time_count;
                    }
                }
                //if (time.Minute == 0)
@@ -83,7 +83,7 @@
                //}
                flowTotal = flowTotal + flow_space;
                _timeList[i+1].ReservoirDropFlowTotal = flowTotal * 10000;
                _timeList[i+1].ReservoirDropFlowTotal = flowTotal ;
                i++; 
            }
            //if (_reservoirMinLimitHours != null && _reservoirMinLimitHours.Last() != null)