Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

lixiaojun

2022-11-23 b5c20e5143555a1bdd450a1e660216b90c93b6f1

 Calculation/IStation.Calculation.Dispatch/general/Calculator.cs

@@ -10,7 +10,7 @@
    /// <summary>
    /// 常规
    /// </summary> 
    public class Calculator4StationGeneral : CalculatorBase, IDispatchAnalyCalculator
    internal class Calculator4StationGeneral : CalculatorBase 
    {
        /// <summary>
        /// 获取当前调度信息
@@ -19,55 +19,19 @@
        /// <param name="StationID"></param>
        /// <param name="error_info"></param>
        /// <returns></returns>
        public IStation.Calculation.DispatchAna.Model.CurrentRecordBundle GetCurrentRecord(long CorpID, long StationID, out string error_info)
        public IStation.Calculation.DispatchAna.Model.CurrentRecordBundle GetCurrentRecord(
            long CorpID, 
            long StationID, 
            out string error_info)
        {
            error_info = null;
            return null;
        }
        /// <summary>
        /// 计算(最优):需要添加实时数据
        /// </summary>
        /// <param name="complex_request_paras">需求参数</param>
        /// <param name="machine_run_status"></param>
        /// <param name="error_info">错误信息</param>
        /// <returns></returns>
        public List<Calculation.DispatchAna.Model.AnaScheme> CalcOptListByPre(
                          IStation.Calculation.DispatchAna.Model.RequestParasComplex complex_request_paras,
                          IStation.Calculation.DispatchAna.Model.MachineRunPara machine_run_status,
                          out string error_info)
        {
            return CalcOptListCore(complex_request_paras, machine_run_status, out error_info);
        }
 

        /// <summary>
        /// 计算(最优):需要添加实时数据
        /// </summary>
        /// <param name="complex_request_paras">需求参数</param>
        /// <param name="machine_run_status"></param>
        /// <param name="error_info">错误信息</param>
        /// <returns></returns>
        public List<Calculation.DispatchAna.Model.AnaScheme> CalcOptListByWhole(
                          IStation.Calculation.DispatchAna.Model.RequestParasComplex complex_request_paras,
                          IStation.Calculation.DispatchAna.Model.MachineRunPara machine_run_status,
                          out string error_info)
        {
            return CalcOptListCore(complex_request_paras, machine_run_status, out error_info);
        }
 

        /// <summary>
        /// 
        /// </summary>
        /// <param name="complex_request_paras"></param>
        /// <param name="openMachineIdList"></param>
        /// <param name="error_info"></param>
        /// <returns></returns>
        public IStation.Calculation.DispatchAna.Model.AnaScheme CalcKeepStatusByWhole(
                            IStation.Calculation.DispatchAna.Model.RequestParasComplex complex_request_paras,
                            List<long> openMachineIdList,
                            out string error_info)
        {
            return CalcKeepStatusByWhole(complex_request_paras, openMachineIdList, out error_info);
        }
   
        /// <summary>
        /// 计算(最优)
        /// </summary>
@@ -117,9 +81,11 @@
 

            List<IStation.Calculation.DispatchAna.Model.MachineDetail> allMachineList = null;
            if (!BuildMachineList(complex_request_paras.CorpID, complex_request_paras.StationID, out allMachineList))
            if (!BuildMachineList( 
                out allMachineList,
                out error_info))
            {
                error_info = "机泵组无法构建,ERROR 70";
                error_info = "机泵组无法构建,ERROR 70,错误信息:" + error_info;
                return null;
            }

@@ -130,7 +96,8 @@
                target_flow,
                water_level,
                target_press,
                complex_request_paras.OutletPipePara[0].TargetFlowRangeMin, complex_request_paras.OutletPipePara[0].TargetFlowRangeMax,
                complex_request_paras.OutletPipePara[0].TargetFlowRangeMin,
                complex_request_paras.OutletPipePara[0].TargetFlowRangeMax,
                allMachineList,
                machine_run_status.MachineRunFilter);

@@ -144,7 +111,7 @@
        /// <param name="openMachineIdList">开泵ID</param>
        /// <param name="error_info">错误信息</param>
        /// <returns></returns>
        public override IStation.Calculation.DispatchAna.Model.AnaScheme CalcKeepStatusCore(
        protected override IStation.Calculation.DispatchAna.Model.AnaScheme CalcKeepStatusCore(
                            IStation.Calculation.DispatchAna.Model.RequestParasComplex requesParas,
                            List<long> openMachineIdList,
                            out string error_info)
@@ -192,9 +159,11 @@
            }

            List<IStation.Calculation.DispatchAna.Model.MachineDetail> allMachineList = null;
            if (!BuildMachineList(requesParas.CorpID, requesParas.StationID, out allMachineList))
            if (!BuildMachineList( 
                out allMachineList,
                out error_info))
            {
                error_info = "ERROR 70";
                error_info = "机泵组无法构建,ERROR 70,错误信息:" + error_info;
                return null;
            }

@@ -203,9 +172,10 @@
            calc_pipe_helper.InitialParas(
                target_flow,
                water_level,
                target_press ,
                requesParas.OutletPipePara[0].TargetFlowRangeMin, requesParas.OutletPipePara[0].TargetFlowRangeMax,
                allMachineList ,null );
                target_press,
                requesParas.OutletPipePara[0].TargetFlowRangeMin,
                requesParas.OutletPipePara[0].TargetFlowRangeMax,
                allMachineList, null);

            return calc_pipe_helper.CalcKeepStatus(openMachineIdList);
        }