更新预测方案

duheng

2024-05-29 b4189107397fb4e2da2bd9343d0eb85d44918932

 WebApi/ÖÚÒãµ÷¶È/ZyConnectHelper.cs

@@ -301,7 +301,7 @@
        /// <param name="endTime">结束时间</param>
        /// <param name="resolution">时间步长,默认300秒</param>
        /// <returns></returns>
        public static async Task<double> GetTotalWaterByTimeRange_Out(DateTime startTime, DateTime endTime, string resolution = "300s")
        public static async Task<List<RealScadaData>> GetTotalWaterByTimeRange_Out(DateTime startTime, DateTime endTime, string resolution = "300s")
        {
            var tagDict = new Dictionary<string, string>
            {
@@ -322,22 +322,23 @@
            string joinedValues = string.Join(",", tagDict.Values);
            var result = HttpClientHelper.Get<List<DataPoint>>(_GetUrl, startTime.ToString("yyyy-MM-dd"), endTime.ToString("yyyy-MM-dd"), "first", resolution, joinedValues);
            var realScadaDataList = GetScadaData(result);
            double totalWaterSupply = 0;
            if (realScadaDataList != null && realScadaDataList.Any())
            {
                foreach (var r in realScadaDataList)
                {
                    if (r.MonitorRecords == null || !r.MonitorRecords.Any())
                        continue;
                    var rrr = r.MonitorRecords.Where(x => x.Value != null).Select(x => x.Value.Value).ToList();
                    if (rrr == null || !rrr.Any())
                        continue;
            return realScadaDataList;
            /*          double totalWaterSupply = 0;
                      if (realScadaDataList != null && realScadaDataList.Any())
                      {
                          foreach (var r in realScadaDataList)
                          {
                              if (r.MonitorRecords == null || !r.MonitorRecords.Any())
                                  continue;
                              var rrr = r.MonitorRecords.Where(x => x.Value != null).Select(x => x.Value.Value).ToList();
                              if (rrr == null || !rrr.Any())
                                  continue;

                    totalWaterSupply += (rrr.Last() - rrr.First());
                }
            }
                              totalWaterSupply += (rrr.Last() - rrr.First());
                          }
                      }

            return totalWaterSupply;
                      return totalWaterSupply;*/
        }

        /// <summary>
@@ -440,6 +441,43 @@
        }

        /// <summary>
        /// èŽ·å–供水的开机情况
        /// </summary>
        /// <param name="startTime">开始时间</param>
        /// <param name="endTime">结束时间</param>
        /// <param name="resolution">时间步长,默认300秒</param>
        /// <returns></returns>
        public static async Task<List<ZyModel.RealScadaData>> GetPumpOpenStatusDay(DateTime StartTime, DateTime EndTime, string resolution = "300s")
        {
            if (isDebug)
            {
                return null;
            }
            var tagDict = new Dictionary<string, string>
            {
                  { "21#", "二输水21号水泵视图.泵运行" },
                  { "22#", "二输水22号水泵视图.泵运行" },
                  { "23#", "二输水23号水泵视图.泵运行" },
                  { "24#", "二输水24号水泵视图.泵运行" },
                  { "25#", "二输水25号水泵视图.泵运行" },
                  { "26#", "二输水26号水泵视图.泵运行" },
                  { "27#", "二输水27号水泵变频器.运行状态" },
                  { "11#", "一输水泵11号变频单泵.变频器运行" },
                  { "12#", "一输水泵12号变频单泵.变频器运行" },
                  { "13#", "一输水泵13号变频单泵.变频器运行" },
                  { "14#", "一输水泵14号变频单泵.变频器运行" },
                  { "15#", "HF一输水16号工频控制图.16#水泵运行" },
                  { "16#", "一输水泵17号变频单泵.变频器运行" },
                  { "17#", "一输水泵18号变频单泵.变频器运行" },
                  { "18#", "HF长江原水厂ABPLC.6KV配电一输水.0402010201011501003一输水15号泵运行" },
             };
            string joinedValues = string.Join(",", tagDict.Values);
            var result = HttpClientHelper.Get<List<DataPoint>>(_GetUrl, StartTime.ToString("yyyy-MM-dd"), EndTime.ToString("yyyy-MM-dd"), "first", resolution, joinedValues);
            var realScadaDataList = GetScadaData(result);
            return realScadaDataList;
        }

        /// <summary>
        /// èŽ·å–某段时间的用电量
        /// </summary>
        /// <param name="StartTime"></param>