修改报错

duheng

2024-03-26 c14e9e6b31bc808a7defa271b3dd140b6dd67c74

修改报错

 DAL/IStation.DAL.Paras/IStation.DAL.Paras.csproj

@@ -45,7 +45,7 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="PumpHistoryDataFileHelper.cs" />
    <Compile Include="泵运行参数\PumpHistoryDataFileHelper.cs" />
    <Compile Include="Pump\Product.cs" />
    <Compile Include="分析配置\AnaSetting.cs" />
    <Compile Include="历史调度方案\HistoryAnaPrjFileHelper.cs" />

 DAL/IStation.DAL.Paras/PumpHistoryDataFileHelper.cs

ÎļþÒÑɾ³ý

 DAL/IStation.DAL.Paras/±ÃÔËÐвÎÊý/PumpHistoryDataFileHelper.cs

@@ -13,20 +13,85 @@

        public class RunParasData 
        {
            public DateTime Day { get; set; }
            /// <summary>
            /// æ³µè¿è¡ŒçŠ¶æ€
            /// </summary>
            public List<(DateTime,DateTime,int )>   TimeRunParas { get; set; }
            public List<RunParasBlock>   Blocks { get; set; }
            /// <summary>
            /// å–水量
            /// </summary>
            public  List<double> Water { get; set; }
            public double FlowIn { get; set; }
            /// <summary>
            /// ç”¨ç”µé‡
            /// </summary>
            public List<double> Electric { get; set; }
        }
            public double Electric { get; set; }

            /// <summary>
            /// ç”¨ç”µé‡
            /// </summary>
            public double Money { get; set; }
        }
        public class RunParasBlock
        { 
            public DateTime StartTime { get; set; }

            public DateTime EndTime { get; set; }

            public double FlowIn1 { get; set; }

            public double FlowIn2 { get; set; }

            public double FlowIn3 { get; set; }

            public double FlowIn4 { get; set; }

            public double FlowIn5 { get; set; }

            /// <summary>
            /// ç”¨ç”µé‡
            /// </summary>
            public double Electric1 { get; set; }
            /// <summary>
            /// ç”µè´¹
            /// </summary>
            public double Money1 { get; set; }
            /// <summary>
            /// ç”¨ç”µé‡
            /// </summary>
            public double Electric2 { get; set; }
            /// <summary>
            /// ç”µè´¹
            /// </summary>
            public double Money2 { get; set; }

            /// <summary>
            /// ç”¨ç”µé‡
            /// </summary>
            public double Electric3 { get; set; }
            /// <summary>
            /// ç”µè´¹
            /// </summary>
            public double Money3 { get; set; }

            /// <summary>
            /// ç”¨ç”µé‡
            /// </summary>
            public double Electric4 { get; set; }
            /// <summary>
            /// ç”µè´¹
            /// </summary>
            public double Money4 { get; set; }

            /// <summary>
            /// ç”¨ç”µé‡
            /// </summary>
            public double Electric5 { get; set; }
            /// <summary>
            /// ç”µè´¹
            /// </summary>
            public double Money5 { get; set; }
        }
        /// <summary>
        /// åˆå§‹æ–¹æ³•èŽ·å–所有数据
        /// </summary>
@@ -48,9 +113,9 @@
            List<RunParasData> runParasDatas = new List<RunParasData>();
            runParasDatas.Add(new RunParasData
            {
                TimeRunParas = PumpIsOpen,
                /*TimeRunParas = PumpIsOpen,
                Water = doublesWater,
                Electric = doublesEle
                Electric = doublesEle*/
            });
            return runParasDatas;
        }
@@ -70,14 +135,16 @@
            System.IO.StreamReader sr = new System.IO.StreamReader(fs, Encoding.GetEncoding("gb2312"));
            string tempText;
            List<Model.PumpWater> pumpISopenlist = new List<Model.PumpWater>();
            for (int i = 0; i < totalLines; i++)
            for (int i = 0; i < totalLines-1; i++)
            {
                tempText = sr.ReadLine();
                string[] arr = tempText.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
                var pumpISopen = new Model.PumpWater
                try
                {
                    Tag = arr[1],
                    Values = new List<Model.Water>
                    var pumpISopen = new Model.PumpWater
                    {
                        Tag = arr[1],
                        Values = new List<Model.Water>
                    {
                        new Model.Water
                        {
@@ -85,8 +152,15 @@
                            SingleWater =Convert.ToDouble( arr[2])
                        }
                     }
                };
                pumpISopenlist.Add(pumpISopen);


                    };
                    pumpISopenlist.Add(pumpISopen);
                }
                catch 
                {
                    var a = i;
                }
            }
            fs.Close();
            return pumpISopenlist;

 WebApi/Controllers/PumpRunController.cs

@@ -30,7 +30,7 @@
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day æ ¼å¼ä¸æ­£ç¡®" };
            }
            Dto.PumpRunParasDays pumpRunParasDay = new Dto.PumpRunParasDays();
            var PumpState = await ZyConnectHelper.GetPumpOpenStatusBySingleDay(d,d);
            var PumpState = await ZyConnectHelper.GetPumpOpenStatusBySingleDay(d);
            //    var totalWater = await ZyConnectHelper.GetTotalWaterByDayRange_In(startday, startday);
            //   pumpRunParasDay.TotalWater = totalWater;
         //   var PumpTotalElecty = await ZyConnectHelper.GetPumpTotalElectricity(startday, startday);
@@ -44,7 +44,7 @@
            return new IStation.Dto.ApiResult<Dto.PumpRunParasDays>(pumpRunParasDay) { Code = ApiResultCode.Success, Message = "Success" };
        }

        /// <summary>
    /*    /// <summary>
        /// 
        /// </summary>
        /// <param name="day"></param>
@@ -66,7 +66,7 @@
            var history = Common.PumpHistoryDataFileHelper.GetHistoryData(d);
            return new IStation.Dto.ApiResult<List<RunParasData>>(history) { Code = ApiResultCode.Success, Message = "Success" };
        }

*/




 WinFrmUI/IStation.WinFrmUI.Basic/IStation.WinFrmUI.Basic.csproj

@@ -428,7 +428,6 @@
    <EmbeddedResource Include="ElecPrice\ViewElecPriceByDayDlg.resx">
      <DependentUpon>ViewElecPriceByDayDlg.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\licenses.licx" />
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>

 WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj

@@ -315,6 +315,7 @@
    <EmbeddedResource Include="PrjItemSpanTime\SetPrjItemSpanTimeDlg.resx">
      <DependentUpon>SetPrjItemSpanTimeDlg.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\licenses.licx" />
    <EmbeddedResource Include="RangeCtrl\RunTimeRangePanel.resx">
      <DependentUpon>RunTimeRangePanel.cs</DependentUpon>
    </EmbeddedResource>

 WinFrmUI/IStation.WinFrmUI.Monitor/SearchHistoryData.cs

@@ -89,10 +89,10 @@
            int year = Convert.ToInt32(spinEditYear.Text);
            int month = Convert.ToInt32(comboBoxMonth.Text);
            int day = listBoxDay.SelectedIndex + 1;
            var Project = IStation.BLL.AnaPrj.GetPrj(new DateTime(year, month, day));
          //  var Project = IStation.BLL.AnaPrj.GetPrj(new DateTime(year, month, day));
                
            OneHistoryPumpParas = bll.GetByHistoryOneData(new DateTime(year, month, day).AddDays(-365), out string error);   //调用运行参数Api
             this.resultChartControl1.SetBindingData();
          //   this.resultChartControl1.SetBindingData();
            var historydata = new HistoryDataAPiHelper();

        }