修改供水量只取24条

duheng

2025-02-11 0e57c17412761fc2f46566a8f32fd5c62e636366

修改供水量只取24条

 WebApi/Controllers/ZyPrjController.cs

@@ -94,21 +94,22 @@
                IStation.LogHelper.Error(string.Format("ZyPrjRequest Time:{0}-{1} 时间范围错误,不能超过24小时", start_timme, end_timme));
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "时间范围错误,不能超过24小时" };
            }
   

            IStation.CalcModel.AnaRequest anaRequest = new AnaRequest();
            anaRequest.CalcOptType = (eCalcOptType)IStation.AnaGlobalParas.Setting.OptSortType;
            anaRequest.StartTime = start_timme;
            anaRequest.EndTime = end_timme;
            anaRequest.WaterLevels长江 = GetTide3Day(_tideSouce, start_timme);
            if(anaRequest.WaterLevels长江 ==null || anaRequest.WaterLevels长江.Count()==0)
            { 
            if (anaRequest.WaterLevels长江 == null || anaRequest.WaterLevels长江.Count() == 0)
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "无法获取长江水位数据" };
            }

            #region 取水总量

            double TotalFlowIn = 0;
            if (!string.IsNullOrEmpty(request.TotalFlowIn) && !string.IsNullOrWhiteSpace(request.TotalFlowIn))
            { 
            {
                if (!double.TryParse(request.TotalFlowIn, out TotalFlowIn))
                {
                    return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "请输入数字型取水总量,接受到的输入值是:" + request.TotalFlowIn };
@@ -124,7 +125,7 @@
            }

            #endregion 取水总量
       

            #region 水位要求

            if (!string.IsNullOrEmpty(request.MaxReservoirLevelTime))
@@ -151,7 +152,7 @@
                {
                    return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "请输入取水总量或水位要求" };
                }
              

                if (TotalFlowIn < 1000)
                {
                    return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "请输入取水总量,接受到的输入值是:" + request.TotalFlowIn };
@@ -169,6 +170,7 @@
            if (string.IsNullOrEmpty(request.TotalFlowOut) || string.IsNullOrWhiteSpace(request.TotalFlowOut))
            {//用预测值
                #region 用预测值

                anaRequest.PerHourFlowOut = new List<double>();
                IStation.DAL.WaterPredictRecord dal = new DAL.WaterPredictRecord();
                var water_records = dal.GetByHourRangle(start_timme, end_timme);
@@ -204,10 +206,11 @@
                    anaRequest.PerHourFlowOut.Add(r.LastPredictValue);//计算中用吨
                }
                IStation.LogHelper.Info(
                    string.Format("获取水量预测值:  {0} ,  预测值总供水总量:{1} ", 
                    string.Format("获取水量预测值:  {0} ,  预测值总供水总量:{1} ",
                    string.Join(",", anaRequest.PerHourFlowOut), TotalFlowOut预测值的供水总量));
                FlowTotalOut需求 = TotalFlowOut预测值的供水总量;
                isPredictRecord = true ;
                isPredictRecord = true;

                #endregion 用预测值
            }
            else
@@ -232,7 +235,7 @@
                anaRequest.PerHourFlowOut = list;

                FlowTotalOut需求 = TotalFlowOut手动输入需求;
                isPredictRecord = false ;
                isPredictRecord = false;
            }

            #endregion 供水量
@@ -297,13 +300,12 @@
            }
            IStation.LogHelper.Info("-----------------------------END--------------------------------------");

            //保存方案 
            //保存方案
            var ret = Common.HistoryAnaPrjFileHelper.SavePrj(IStation.AnaGlobalParas.Setting, isPredictRecord, anaRequest, defaultPrj);

            //
            var dto_prj = ToPrjDto(defaultPrj);
            dto_prj.FlowTotalOut = FlowTotalOut需求;


            //推送:代码保留
            //if (!string.IsNullOrEmpty(request.IsSubmit) && Convert.ToBoolean(request.IsSubmit))
@@ -314,10 +316,8 @@
            //    });
            //}


            //IStation.LogHelper.Info(string.Format(" 产生计算方案:{0}", dto_prj.schemeID));
            //IStation.LogHelper.Info(string.Format("Zy Prj  计算成功:  \r\n {0}  ", JsonHelper.Object2Json(dto_prj)));


            return new IStation.Dto.ApiResult<IStation.ZyDto.SubmitPrj>(dto_prj) { Code = ApiResultCode.Success };
        }
@@ -417,8 +417,6 @@
            }
        }



        /// <summary>
        ///  获取某一天,最近一条
        /// </summary>
@@ -437,7 +435,6 @@
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 格式不正确" };
            }
            

            IStation.CalcModel.AnaRequestBase requestBase = null;
            var prj = Common.HistoryAnaPrjFileHelper.GetByCreateDay(d, out requestBase);
@@ -450,7 +447,7 @@
                    var sumFlow = (from x in requestBase.PerHourFlowOut select x).Sum();
                    dto_prj.FlowTotalOut = sumFlow;
                }
                if(dto_prj.Switchs != null)
                if (dto_prj.Switchs != null)
                {
                    var switch2 = from x in dto_prj.Switchs orderby x.Time select x;
                    int index = 1;
@@ -487,15 +484,15 @@
                IStation.LogHelper.Info(" api GetLastHistoryRecord is null ");
                return null;
            }
       

            IStation.CalcModel.AnaRequestBase requestBase = null;
            var prj = Common.HistoryAnaPrjFileHelper.GetByStartTime(record.StartTime, out requestBase);
            if (prj != null)
            { 
            {
                var dto_prj = ToPrjDto(prj);
                if (requestBase != null && requestBase.PerHourFlowOut != null)
                {
                    var sumFlow = (from x in requestBase.PerHourFlowOut select x).Sum();
                    var sumFlow = (from x in requestBase.PerHourFlowOut.Take(24) select x).Sum();
                    dto_prj.FlowTotalOut = sumFlow;
                }
                if (dto_prj.Switchs != null)
@@ -514,8 +511,8 @@
            else
            {
                IStation.LogHelper.Info(string.Format(
                    " api GetLastHistoryRecord is null (未找到项目) LastRecord 信息: ID:{0}, StartTime:{1}, EndTime:{2}", 
                    record.ID, 
                    " api GetLastHistoryRecord is null (未找到项目) LastRecord 信息: ID:{0}, StartTime:{1}, EndTime:{2}",
                    record.ID,
                    record.StartTime, record.EndTime));
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Alert, Message = "未找到项目" };
            }
@@ -541,9 +538,9 @@
            IStation.CalcModel.AnaRequestBase requestBase = null;
            var prj = Common.HistoryAnaPrjFileHelper.GetByStartTime(record.StartTime, out requestBase);
            if (prj != null)
            { 
            {
                var dto_prj = ToPrjDto(prj);
                if (requestBase != null && requestBase.PerHourFlowOut != null )
                if (requestBase != null && requestBase.PerHourFlowOut != null)
                {
                    var sumFlow = (from x in requestBase.PerHourFlowOut select x).Sum();
                    dto_prj.FlowTotalOut = sumFlow;
@@ -570,7 +567,6 @@
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Alert, Message = "未找到项目" };
            }
        }


        /// <summary>
        ///
@@ -1069,8 +1065,8 @@
                }
            }
            if (defaultPrj.MaxWaterLevelH <= 0)
            {        
                double maxHeight = 0;               
            {
                double maxHeight = 0;
                DateTime maxHeightTime = defaultPrj.StartTime;
                if (defaultPrj.BlockTimes != null)
                {
@@ -1096,10 +1092,10 @@
                defaultPrj.MaxWaterLevelH = maxHeight;
                defaultPrj.MaxWaterLevelTime = maxHeightTime;
            }
   
            if(defaultPrj.MaxWaterLevelTime> defaultPrj.StartTime)
            dto_prj.MaxWaterLevelH = string.Format("{0:N2}  ({1})",  Math.Round( defaultPrj.MaxWaterLevelH,2) ,
                defaultPrj.MaxWaterLevelTime.ToString("HH:mm"));

            if (defaultPrj.MaxWaterLevelTime > defaultPrj.StartTime)
                dto_prj.MaxWaterLevelH = string.Format("{0:N2}  ({1})", Math.Round(defaultPrj.MaxWaterLevelH, 2),
                    defaultPrj.MaxWaterLevelTime.ToString("HH:mm"));
            else
                dto_prj.MaxWaterLevelH = string.Format("{0:N2} ", Math.Round(defaultPrj.MaxWaterLevelH, 2));

@@ -1129,6 +1125,5 @@
        }

        #endregion 换算成DTO

    }
}

 WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project>
  <PropertyGroup>
    <_PublishTargetUrl>D:\WorkData\IStation\ChEqCalc.V1.3\WebApi\bin\app.publish\</_PublishTargetUrl>
    <History>True|2025-02-11T02:11:32.2422260Z||;True|2024-12-19T09:49:10.3281962+08:00||;False|2024-12-19T09:37:03.3265256+08:00||;True|2024-10-10T09:33:48.7974649+08:00||;True|2024-10-10T09:33:34.6731387+08:00||;True|2024-09-11T11:27:08.7956442+08:00||;True|2024-09-05T10:18:53.0434478+08:00||;True|2024-08-14T22:45:35.9591782+08:00||;True|2024-08-14T10:18:45.7227462+08:00||;True|2024-08-14T09:52:06.8611902+08:00||;True|2024-08-02T19:04:12.2446801+08:00||;True|2024-07-24T10:24:40.0144852+08:00||;True|2024-07-24T10:20:59.9022005+08:00||;True|2024-07-09T13:15:49.8828357+08:00||;True|2024-07-09T13:10:26.0051847+08:00||;True|2024-07-03T13:16:09.3448505+08:00||;True|2024-06-17T20:21:42.5898298+08:00||;True|2024-06-13T10:29:57.3049924+08:00||;True|2024-05-29T22:55:40.8917081+08:00||;True|2024-05-29T22:53:51.8888824+08:00||;True|2024-05-29T21:24:14.2935182+08:00||;True|2024-05-29T21:15:26.4176230+08:00||;True|2024-05-29T20:21:23.2652363+08:00||;True|2024-05-20T22:19:25.6819845+08:00||;True|2024-05-20T22:17:16.3228686+08:00||;True|2024-05-20T22:09:43.8419388+08:00||;True|2024-05-20T20:47:30.7123496+08:00||;False|2024-05-20T20:46:44.8172532+08:00||;True|2024-05-17T09:19:12.0003732+08:00||;True|2024-05-13T16:34:26.1798389+08:00||;True|2024-05-13T15:25:51.2634210+08:00||;True|2024-05-13T15:06:06.6614778+08:00||;True|2024-05-13T14:05:16.2224051+08:00||;True|2024-04-12T11:21:29.5845897+08:00||;True|2024-04-12T11:05:57.4077528+08:00||;True|2024-04-12T09:48:11.6556767+08:00||;True|2024-04-07T14:56:11.5899311+08:00||;True|2024-03-13T13:43:30.5799100+08:00||;True|2024-03-13T13:36:27.8330849+08:00||;True|2024-03-13T13:28:52.4054628+08:00||;True|2024-03-13T13:09:48.3039075+08:00||;True|2024-03-13T13:06:59.6509464+08:00||;True|2024-03-13T12:56:44.3509382+08:00||;True|2024-03-13T12:43:04.0436634+08:00||;False|2024-03-13T12:42:49.1037427+08:00||;False|2024-03-13T12:42:25.1444775+08:00||;True|2024-03-13T12:34:29.4082591+08:00||;True|2024-03-13T12:32:39.1414007+08:00||;True|2024-03-13T12:27:13.0387359+08:00||;True|2024-03-13T12:24:15.2859267+08:00||;</History>
    <History>True|2025-02-11T05:59:40.0280878Z||;True|2025-02-11T13:40:08.0910878+08:00||;True|2025-02-11T10:11:32.2422260+08:00||;True|2024-12-19T09:49:10.3281962+08:00||;False|2024-12-19T09:37:03.3265256+08:00||;True|2024-10-10T09:33:48.7974649+08:00||;True|2024-10-10T09:33:34.6731387+08:00||;True|2024-09-11T11:27:08.7956442+08:00||;True|2024-09-05T10:18:53.0434478+08:00||;True|2024-08-14T22:45:35.9591782+08:00||;True|2024-08-14T10:18:45.7227462+08:00||;True|2024-08-14T09:52:06.8611902+08:00||;True|2024-08-02T19:04:12.2446801+08:00||;True|2024-07-24T10:24:40.0144852+08:00||;True|2024-07-24T10:20:59.9022005+08:00||;True|2024-07-09T13:15:49.8828357+08:00||;True|2024-07-09T13:10:26.0051847+08:00||;True|2024-07-03T13:16:09.3448505+08:00||;True|2024-06-17T20:21:42.5898298+08:00||;True|2024-06-13T10:29:57.3049924+08:00||;True|2024-05-29T22:55:40.8917081+08:00||;True|2024-05-29T22:53:51.8888824+08:00||;True|2024-05-29T21:24:14.2935182+08:00||;True|2024-05-29T21:15:26.4176230+08:00||;True|2024-05-29T20:21:23.2652363+08:00||;True|2024-05-20T22:19:25.6819845+08:00||;True|2024-05-20T22:17:16.3228686+08:00||;True|2024-05-20T22:09:43.8419388+08:00||;True|2024-05-20T20:47:30.7123496+08:00||;False|2024-05-20T20:46:44.8172532+08:00||;True|2024-05-17T09:19:12.0003732+08:00||;True|2024-05-13T16:34:26.1798389+08:00||;True|2024-05-13T15:25:51.2634210+08:00||;True|2024-05-13T15:06:06.6614778+08:00||;True|2024-05-13T14:05:16.2224051+08:00||;True|2024-04-12T11:21:29.5845897+08:00||;True|2024-04-12T11:05:57.4077528+08:00||;True|2024-04-12T09:48:11.6556767+08:00||;True|2024-04-07T14:56:11.5899311+08:00||;True|2024-03-13T13:43:30.5799100+08:00||;True|2024-03-13T13:36:27.8330849+08:00||;True|2024-03-13T13:28:52.4054628+08:00||;True|2024-03-13T13:09:48.3039075+08:00||;True|2024-03-13T13:06:59.6509464+08:00||;True|2024-03-13T12:56:44.3509382+08:00||;True|2024-03-13T12:43:04.0436634+08:00||;False|2024-03-13T12:42:49.1037427+08:00||;False|2024-03-13T12:42:25.1444775+08:00||;True|2024-03-13T12:34:29.4082591+08:00||;True|2024-03-13T12:32:39.1414007+08:00||;True|2024-03-13T12:27:13.0387359+08:00||;True|2024-03-13T12:24:15.2859267+08:00||;</History>
    <LastFailureDetails />
  </PropertyGroup>
  <ItemGroup>
@@ -106,10 +106,10 @@
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Calc.Core.dll">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:05</publishTime>
    </File>
    <File Include="bin/IStation.Calc.Core.pdb">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:05</publishTime>
    </File>
    <File Include="bin/IStation.Calc.ErQu.dll">
      <publishTime>03/13/2024 12:32:32</publishTime>
@@ -118,10 +118,10 @@
      <publishTime>03/13/2024 12:32:32</publishTime>
    </File>
    <File Include="bin/IStation.Calc.Model.dll">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:04</publishTime>
    </File>
    <File Include="bin/IStation.Calc.Model.pdb">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:04</publishTime>
    </File>
    <File Include="bin/IStation.Core.dll">
      <publishTime>08/05/2024 11:34:36</publishTime>
@@ -130,19 +130,19 @@
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.DAL.Paras.dll">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:04</publishTime>
    </File>
    <File Include="bin/IStation.DAL.Paras.pdb">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:04</publishTime>
    </File>
    <File Include="bin/IStation.DAL.Project.dll">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:04</publishTime>
    </File>
    <File Include="bin/IStation.DAL.Project.dll.config">
      <publishTime>07/25/2024 11:43:38</publishTime>
    </File>
    <File Include="bin/IStation.DAL.Project.pdb">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:04</publishTime>
    </File>
    <File Include="bin/IStation.Entity.Basic.dll">
      <publishTime>08/05/2024 11:41:15</publishTime>
@@ -157,10 +157,10 @@
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Log.dll">
      <publishTime>02/11/2025 10:11:28</publishTime>
      <publishTime>02/11/2025 13:40:02</publishTime>
    </File>
    <File Include="bin/IStation.Log.pdb">
      <publishTime>02/11/2025 10:11:28</publishTime>
      <publishTime>02/11/2025 13:40:02</publishTime>
    </File>
    <File Include="bin/IStation.MemoryCache.dll">
      <publishTime>08/05/2024 11:34:36</publishTime>
@@ -169,10 +169,10 @@
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Model.Basic.dll">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:04</publishTime>
    </File>
    <File Include="bin/IStation.Model.Basic.pdb">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:04</publishTime>
    </File>
    <File Include="bin/IStation.Model.Config.dll">
      <publishTime>03/13/2024 12:32:32</publishTime>
@@ -181,16 +181,16 @@
      <publishTime>03/13/2024 12:32:32</publishTime>
    </File>
    <File Include="bin/IStation.Model.Core.dll">
      <publishTime>02/11/2025 10:11:28</publishTime>
      <publishTime>02/11/2025 13:40:03</publishTime>
    </File>
    <File Include="bin/IStation.Model.Core.pdb">
      <publishTime>02/11/2025 10:11:28</publishTime>
      <publishTime>02/11/2025 13:40:03</publishTime>
    </File>
    <File Include="bin/IStation.Model.Curve.dll">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:03</publishTime>
    </File>
    <File Include="bin/IStation.Model.Curve.pdb">
      <publishTime>02/11/2025 10:11:29</publishTime>
      <publishTime>02/11/2025 13:40:03</publishTime>
    </File>
    <File Include="bin/IStation.Model.Monitor.dll">
      <publishTime>08/05/2024 11:34:36</publishTime>
@@ -199,16 +199,16 @@
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Newtonsoft.dll">
      <publishTime>02/11/2025 10:11:27</publishTime>
      <publishTime>02/11/2025 13:40:02</publishTime>
    </File>
    <File Include="bin/IStation.Newtonsoft.pdb">
      <publishTime>02/11/2025 10:11:27</publishTime>
      <publishTime>02/11/2025 13:40:02</publishTime>
    </File>
    <File Include="bin/IStation.Settings.dll">
      <publishTime>02/11/2025 10:11:28</publishTime>
      <publishTime>02/11/2025 13:40:02</publishTime>
    </File>
    <File Include="bin/IStation.Settings.pdb">
      <publishTime>02/11/2025 10:11:28</publishTime>
      <publishTime>02/11/2025 13:40:02</publishTime>
    </File>
    <File Include="bin/IStation.SnowflakeId.dll">
      <publishTime>08/05/2024 11:34:36</publishTime>
@@ -223,16 +223,16 @@
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Untity.dll">
      <publishTime>02/11/2025 10:11:28</publishTime>
      <publishTime>02/11/2025 13:40:03</publishTime>
    </File>
    <File Include="bin/IStation.Untity.pdb">
      <publishTime>02/11/2025 10:11:28</publishTime>
      <publishTime>02/11/2025 13:40:03</publishTime>
    </File>
    <File Include="bin/IStation.WebApi.dll">
      <publishTime>02/11/2025 10:11:31</publishTime>
      <publishTime>02/11/2025 14:04:09</publishTime>
    </File>
    <File Include="bin/IStation.WebApi.pdb">
      <publishTime>02/11/2025 10:11:31</publishTime>
      <publishTime>02/11/2025 14:04:09</publishTime>
    </File>
    <File Include="bin/log4net.dll">
      <publishTime>03/25/2024 09:57:26</publishTime>