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++) double outlet_press_calc = pipe2_TargetPess; 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 }; }
