计划返回值, 增加状态信息

tangxu

2022-11-03 e32f35f3850e3209f15d81b0b41117764febc6e2

计划返回值, 增加状态信息

 Application/IStation.Application.OpenApi/shys/plan/PlanAna_ShysController.cs

@@ -102,7 +102,7 @@
                } 
                else
                {
                    vmList.Add(new PlanAnaDto() { factory=sg_factoryId, name="", Error = error_info });
                    vmList.Add(new PlanAnaDto() { factory=sg_factoryId, name="", error = error_info });
                }
            }
            return vmList;
@@ -196,16 +196,19 @@
            vmItem.factory = sg_factoryId;
            vmItem.name = station.Name;
            vmItem.values = new List<List<double>>();
            vmItem.valueinfo = new List<string>();
            for (int i = 1; i <= 12; i++)
            {
                var result = resultList.Find(t => t.Month == i);
                if (result == null)
                {
                    vmItem.values.Add(new List<double>() { 0, 0, 0 });
                    vmItem.valueinfo.Add("数据为空");
                }
                else
                {
                    vmItem.values.Add(new List<double>() { result.Qt, result.Dt, result.WP });
                    vmItem.valueinfo.Add(result.Info);
                }
            }
            error_info = null;

 Application/IStation.Application.OpenApi/shys/plan/dto/PlanAnaDto.cs

@@ -27,9 +27,14 @@
        public List<List<double>> values { get; set; }

        /// <summary>
        /// 12个月数据数
        /// </summary>
        public List<string> valueinfo { get; set; }

        /// <summary>
        /// é”™è¯¯ä¿¡æ¯
        /// </summary>
        public  string Error { get; set; }
        public string error { get; set; }
    }
  
}

 Application/IStation.Application.OpenApi/shys/plan/dto/output/MonthCalcuResult.cs

@@ -31,6 +31,9 @@
        /// </summary>
        public double WP { get; set; }


        /// <summary>
        /// 
        /// </summary>
        public string Info { get; set; }
    }
}

 Application/IStation.Application.OpenApi/shys/plan/helper/PlanAnaBaseCalculator.cs

@@ -111,6 +111,8 @@
                monthSum.Qt = Math.Round(daySum.Qt * dayNumber, 1);
                monthSum.Dt = Math.Round(daySum.Dt * dayNumber, 2);
                monthSum.WP = Math.Round(daySum.WP, 3);
                monthSum.Info = daySum.Info;

                monthRecordList.Add(monthSum);
            }
            error_info = null;

 Application/IStation.Application.OpenApi/shys/plan/shys/ShysHelper.cs

@@ -51,7 +51,7 @@


            //_dict.Add(6, new StationInfo(4, new IStation.Calculation.shys严桥泵站()));//NG æ²¡æœ‰æµé‡æ•°æ®, æ²¡æœ‰å‡ºå£æ¶²ä½æ•°æ®
            //_dict.Add(10, new StationInfo(10, new IStation.Calculation.shys金海泵站()));//NG ç®¡è·¯ä¸€ è¿›å£åŽ‹åŠ›:0.1259MPa,出口压力:0.2135MPa,约8.8m扬程,流量要求:11596, æ³µé¢å®šæ‰¬ç¨‹ä¸º47m,变频也无法得到如此低的扬程

            //_dict.Add(12, new StationInfo(15, new IStation.Calculation.shys陈行一输()));//NG æ²¡æœ‰æä¾› _0402010503030202003 ä¸‰å·ç®¡å‡ºå£æµé‡å€¼
            //_dict.Add(7, new StationInfo(6, new IStation.Calculation.shys临江1号泵房())); //NG æ²¡æœ‰æä¾› æµé‡ ,无法计算

@@ -60,7 +60,7 @@

#if (DEBUG)


            _dict.Add(10, new StationInfo(10, new IStation.Calculation.shys金海泵站()));

#else
            _dict.Add(10, new StationInfo(10, new IStation.Calculation.shys金海泵站()));// OK ç¬¬ä¸‰æ‰¹  æ›²çº¿å»¶é•¿, ä¸”需要增加出口压力才能计算

 Calculation/IStation.Calculation.Dispatch/Model/AnaScheme.cs

@@ -62,6 +62,16 @@
        /// 
        /// </summary>
        public List<AnaSchemeItem> Items { get; set; }

        /// <summary>
        ///  ç»“论可信度 1 æ­£å¸¸  2 æé«˜äº†æ‰¬ç¨‹
        /// </summary>
        public int ResultStatus { get; set; } = 1;

        /// <summary>
        /// ç»“论可信度信息
        /// </summary>
        public string ResultStatusInfo { get; set; }
        /// <summary>
        /// 
        /// </summary>

 Calculation/IStation.Calculation.Dispatch/Model/DaySumData.cs

@@ -11,8 +11,6 @@
    /// </summary>
    public class DaySumData
    {
 

        /// <summary>
        /// ä¾›æ°´é‡ m³
        /// </summary>
@@ -28,6 +26,9 @@
        /// </summary>
        public double WP { get; set; }


        /// <summary>
        /// 
        /// </summary>
        public string Info { get; set; }
    }
}

 Calculation/IStation.Calculation.Dispatch/base/CalculatorOptAnaBase.cs

@@ -119,6 +119,10 @@
                //汇总
                sum.Qt = sum.Qt + opt_anaScheme.TotalWrkQ;
                sum.Dt = sum.Dt + opt_anaScheme.TotalWrkP;

                //
                if(!string.IsNullOrEmpty(opt_anaScheme.ResultStatusInfo))
                sum.Info = opt_anaScheme.ResultStatusInfo;
            }
            sum.WP = CalculateWP(sum.Dt, sum.Qt);
            return sum;

 Calculation/IStation.Calculation.Dispatch/custom/shys/station/½ðº£±ÃÕ¾/OptAna.cs

@@ -158,7 +158,8 @@

            double totalQ = 0, totalH = 0, totalP = 0;
            int pipe_count = 0;

            int ResultStatus = 1;
            string ResultStatusInfo = null;
            IStation.Calculation.DispatchAna.Model.AnaScheme pipe1_result = null;
            List<IStation.Calculation.DispatchAna.Model.AnaScheme> pipe1_results = null;
            if (pipe1_TargetFlow > 50)
@@ -179,6 +180,8 @@
                        break;
                    }
                    outlet_press_calc = outlet_press_calc * 1.05;
                    ResultStatus = 2;
                    ResultStatusInfo = "提高了一号出口管液位参数";
                }
                if (pipe1_results == null || pipe1_results.Count() == 0)
                {
@@ -194,10 +197,12 @@
            }
            IStation.Calculation.DispatchAna.Model.AnaScheme pipe2_result = null;
            List<IStation.Calculation.DispatchAna.Model.AnaScheme> pipe2_results = null;
         
            if (pipe2_TargetFlow > 50)
            {
                double outlet_press_calc = pipe2_TargetPess;
                for (int i = 0; i < 5; i++)
                int i = 0;
                for (  i = 0; i < 5; i++)
                {//扬程过低,算不出来就增加出口压力 
                    calc_pipe2_helper.InitialParas(
                        pipe2_TargetFlow,
@@ -211,7 +216,9 @@
                    {
                        break;
                    }
                    ResultStatus = 2;
                    outlet_press_calc = outlet_press_calc * 1.05;
                    ResultStatusInfo = "提高了二号出口管液位参数";
                }
                if (pipe2_results == null || pipe2_results.Count() == 0)
                {
@@ -220,6 +227,7 @@
                    return null;
                }
                pipe2_result = pipe2_results[0];
  
                totalQ += pipe2_result.TotalWrkQ;
                totalP += pipe2_result.TotalWrkP;
                totalH += pipe2_result.TotalWrkH;
@@ -246,7 +254,9 @@
                    {
                        break;
                    }
                    ResultStatus = 2;
                    outlet_press_calc = outlet_press_calc * 1.05;
                    ResultStatusInfo = "提高了三号出口管液位参数";
                }
                if (pipe3_results == null || pipe3_results.Count() == 0)
                {
@@ -281,7 +291,8 @@
            if (pipe3_result.Items != null && pipe3_result.Items.Count > 0)
                plan.Items.AddRange(pipe3_result.Items);


            plan.ResultStatus = ResultStatus;
            plan.ResultStatusInfo = ResultStatusInfo;
            return new List<Model.AnaScheme>() { plan };   
        }