冲突

duheng

2025-02-07 938c924c1acee378031e3f68331e50c6d58b1879

冲突

 BLL/IStation.BLL.Connect/AnaPrj.cs

@@ -19,9 +19,8 @@
            public IStation.CalcModel.AnaRequestBase requestBase { get; set; }
            public bool isSubmit { get; set; }
        }

        public class ZyPrjRequest
        {
        {  
            public string StartTime { get; set; }
            public string EndTime { get; set; }
            //public int? StartOpenCount { get; set; } = -1;//已作废
@@ -38,12 +37,14 @@
            public string IsSubmit { get; set; }//计算完,是否推送
            public string IsTemporary { get; set; }//是否是临时算一下(新)
        }

        public static void SavePrj(CalcModel.AnaRequest ana_request, CalcModel.AnaSetting ana_settting, CalcModel.AnaPrj prj, bool isSubmit)
        {
            if (!IStation.BLL.ServiceParas.IsRemote)
            {
                //  IStation.Common.HistoryAnaPrjFileHelper.SavePrj(ana_settting, ana_request == null ? null : new CalcModel.AnaRequestBase(ana_request), prj); return;
                IStation.Common.HistoryAnaPrjFileHelper.SavePrj(ana_settting,
                    true,
                    ana_request == null ? null : new CalcModel.AnaRequestBase(ana_request), prj);
                return;
            }

            if (string.IsNullOrEmpty(ServiceParas.ApiServiceUrl))
@@ -167,30 +168,35 @@
            return ret.Data;
        }

        public static CalcModel.AnaPrj CalcPrj(CalcModel.AnaRequest ana_request, bool isUsePredictRecord, bool isTemp)
        {
        public static CalcModel.AnaPrj CalcPrj(CalcModel.AnaRequest ana_request,bool isUsePredictRecord, bool isTemp )
        { 
            if (string.IsNullOrEmpty(ServiceParas.ApiServiceUrl))
            {
                return null;
            }
 

            string url = string.Format(@"{0}/AnaPrj/Calc", ServiceParas.ApiServiceUrl);

            ZyPrjRequest request = new ZyPrjRequest();
            request.StartTime = ana_request.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
            request.EndTime = ana_request.EndTime.ToString("yyyy-MM-dd HH:mm:ss");
            request.IsTemporary = isTemp.ToString();
            request.IsTemporary  = isTemp.ToString();
            request.IsSubmit = "false";
            if (ana_request.MaxReservoirLevel != null)
                request.MaxReservoirLevel = ana_request.MaxReservoirLevel.ToString();
            if(ana_request.MaxReservoirLevel != null)
            request.MaxReservoirLevel = ana_request.MaxReservoirLevel.ToString();
            request.MaxReservoirLevelTime = ana_request.MaxReservoirLevelTime;
            request.StartReservoirLevel = ana_request.StartReservoirLevel.ToString();
            request.StartOpenPumpIndexArray = ana_request.StartOpenPumpIndexArray;
            if (ana_request.TotalFlowIn != null)
                request.TotalFlowIn = ana_request.TotalFlowIn.ToString();
            if(ana_request.TotalFlowIn != null)
            request.TotalFlowIn = ana_request.TotalFlowIn.ToString();

            if (!isUsePredictRecord)
                request.TotalFlowOut = (ana_request.PerHourFlowOut.Sum() - ana_request.PerHourFlowOut.Last()).ToString();





            string parameterData = (new System.Web.Script.Serialization.JavaScriptSerializer()).Serialize(request);
            //先根据用户请求的uri构造请求地址
@@ -241,11 +247,11 @@
        /// </summary>
        /// <param name="time"></param>
        /// <returns></returns>
        public static CalcModel.ZyStartInfo GetAnaStartPara(DateTime time)
        public static CalcModel.ZyStartInfo GetAnaStartPara(DateTime time )
        {
            if (!ServiceParas.IsRemote)
            {
                return null;
            { 
                return  null;
            }

            if (string.IsNullOrEmpty(ServiceParas.ApiServiceUrl))
@@ -447,14 +453,14 @@
                myResponse.Close();
                return null;
            }
            var ret = (new System.Web.Script.Serialization.JavaScriptSerializer()).Deserialize<IStation.Dto.ApiResult<string>>(returnData);
            var ret = (new System.Web.Script.Serialization.JavaScriptSerializer()).Deserialize<IStation.Dto.ApiResult<string >>(returnData);
            reader.Close();
            myResponse.Close();

            var res_str = ret.Data;
            if (string.IsNullOrEmpty(res_str))
            {
                return null;
                return null ;
            }
            List<int> list = new List<int>();
            foreach (var s in list) { list.Add(Convert.ToInt32(s)); }

 Calc/IStation.Calc.Core/CalcPrj.cs

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Permissions;
using System.Text;
using System.Threading.Tasks;

@@ -24,10 +25,13 @@
                optPrj = null;
                return "数据初始化失败";
            }
            InitialElePrice();

            if(! InitialElePrice())
            {
                optPrj = null;
                return "ElecPrice ä¸ºç©º";
            }
            var calcHelper = GetCalcHelper(anaRequest);

         
            string error_info;
            optPrj = calcHelper.CalcOptPrj(out error_info);

@@ -263,10 +267,16 @@
        /// <summary>
        ///
        /// </summary>
        private void InitialElePrice()
        private bool InitialElePrice()
        {
            var allPrices = IStation.Common.ElecPrice.GetAll();
            if(allPrices == null)
            {
                IStation.LogHelper.Error("ElecPrice ä¸ºç©º");
                return false;
            }
            _elePriceMonthList = allPrices.First().Settings.MonthList;
            return true;
        }

        #endregion åˆå§‹åŒ–

 Calc/IStation.Calc.Core/¼ÆËã»ùÀà/ErQuCalcBaseHelper_³¤½­.cs

@@ -63,7 +63,7 @@
        protected void SetRiverWaterLevels(List<IStation.Model.TimeWaterLevel> riverWaterLevels)
        { 
            this._riverWaterLevels = riverWaterLevels;
            if (this._riverWaterLevels != null)
            if (this._riverWaterLevels != null && this._riverWaterLevels.Count>0)
            {
                _riverWaterLevelStart = this._riverWaterLevels.First().Time;
                _riverWaterLevelEnd = this._riverWaterLevels.Last().Time;

 DAL/IStation.DAL.Paras/³¤½­Ë®Î»/book/TideFromBookHelper.cs

@@ -74,7 +74,43 @@
            error = null;
            return waterLevels长江;
        }
        /// <summary>
        /// è¯»å–
        /// </summary>
        /// <param name="Startday"></param>
        /// <param name="Endday"></param>
        /// <param name="folder"></param>
        /// <returns></returns>
        public static List<Model.TimeWaterLevel> GetByTimeRange(DateTime StartTime, DateTime EndTime, out string error)
        {
       
            DateTime Startday = StartTime.Date;
            DateTime Endday = EndTime.Date.AddDays(1);

            var waterLevels长江 = new List<TimeWaterLevel>();
            for (DateTime currentDate = Startday; currentDate <= Endday; currentDate = currentDate.AddDays(1))
            {
                var list1 = ReadList(currentDate);
                if (list1 != null && list1.Count > 0)
                {
                    for (int h = 0; h < 24; h++)
                    {
                        var t = new DateTime(currentDate.Year, currentDate.Month, currentDate.Day, h, 0, 0);

                        if (t >= StartTime && t <= EndTime)
                            waterLevels长江.Add(new TimeWaterLevel(t, list1[h].Level));
                    }
                }
            }
            error = null;
            return waterLevels长江;
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="day"></param>
        /// <returns></returns>
        private static List<Model.TileLevel> ReadList(DateTime day)
        {
            var list = new List<Model.TileLevel>();

 WebApi/Controllers/OpenPredictController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,95 @@
using IStation.Common;
using IStation.Dto;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using System.Web;
using System.Web.Http; 

namespace IStation.WebApi.Controllers
{
    /// <summary>
    /// ç”¨æ°´é‡é¢„测值 (对外开放)
    /// </summary>
    [RoutePrefix("OpenApi/WaterSupplyPredict")]
    public class OpenPredictController : ApiController
    {
        /// <summary>
        ///  èŽ·å–
        /// </summary>
        /// <param name="day"></param>
        /// <returns></returns>
        [Route("GetByRange")]
        [HttpGet]
        public IStation.Dto.ApiResult GetByRange(string start, string end)
        { 
            DateTime startTime, endTime;
            if (!DateTime.TryParse(start, out startTime))
            {
                return new IStation.Dto.ApiResult<string>("start  å‚数不合理", Dto.ApiResultCode.Error);
            }
            if (!DateTime.TryParse(end, out endTime))
            {
                return new IStation.Dto.ApiResult<string>("end å‚数不合理", Dto.ApiResultCode.Error);
            }

           
         
            IStation.DAL.WaterPredictRecord dal = new DAL.WaterPredictRecord();
            var water_records = dal.GetByHourRangle(startTime, endTime);
  
            if (water_records == null || water_records.Count == 0)
            { 
                return new IStation.Dto.ApiResult<string>() { Code = ApiResultCode.Error, Data = "水位预测数据为空,请先保持水位预测服务正常运行" };
            }

            List<PredictValue> list2 = new List<PredictValue>();

            int offset=0;
            foreach (var r in water_records)
            {
                if (r.States == 0)
                {
                    var error_info11 = string.Format("预测数据异常,无法进行水位计算:{0} {1},{2}", r.DayHour, r.LastPredictValue, r.Description);
 
                    return new IStation.Dto.ApiResult<string>()
                    {
                        Code = ApiResultCode.Error,
                        Data = error_info11
                    };
                }
            
                    list2.Add(new PredictValue(r) {  Time = startTime.AddHours(offset) });
                offset++; 
            }
 
      

 


            return new IStation.Dto.ApiResult<List<PredictValue>>(list2); 
        }


 

        public class PredictValue
        {
            public PredictValue() { }
            public PredictValue(IStation.Model.WaterPredictRecord rhs)
            { 
                this.Value = rhs.LastPredictValue;
            }
            public PredictValue(DateTime time, double level) { this.Time = time; this.Value = level; }
            public DateTime Time { get; set; }
            public double Value { get; set; }
        }



    }
}

 WebApi/Controllers/OpenTideController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,105 @@
using IStation.Common; 
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using System.Web;
using System.Web.Http; 

namespace IStation.WebApi.Controllers
{
    /// <summary>
    /// é•¿æ±ŸTide (对外开放)
    /// </summary>
    [RoutePrefix("OpenApi/Tide")]
    public class OpenTideController : ApiController
    {
        /// <summary>
        ///  èŽ·å–
        /// </summary>
        /// <param name="day"></param>
        /// <returns></returns>
        [Route("GetByRange")]
        [HttpGet]
        public IStation.Dto.ApiResult GetByRange(string start, string end)
        {
            string error;
         
            DateTime startTime, endTime;
            if (!DateTime.TryParse(start, out startTime))
            {
                return new IStation.Dto.ApiResult<string>("start  å‚数不合理", Dto.ApiResultCode.Error);
            }
            if (!DateTime.TryParse(end, out endTime))
            {
                return new IStation.Dto.ApiResult<string>("end å‚数不合理", Dto.ApiResultCode.Error);
            }
            var list = TideFromBookHelper.GetByTimeRange(startTime, endTime, out error);

            if (list == null || list.Count() == 0)
            {
                return new IStation.Dto.ApiResult<string>("获取失败", Dto.ApiResultCode.Error);
            }
            List<TideValue> list2 = new List<TideValue>();
            foreach (var m in list)
            {
                list2.Add(new TideValue(m));
            }

            return new IStation.Dto.ApiResult<List<TideValue>>(list2); 
        }


        /// <summary>
        /// èŽ·å–某日 
        /// </summary>
        /// <param name="day"></param>
        /// <returns></returns>
        [Route("GetByDay")]
        [HttpGet]
        public IStation.Dto.ApiResult GetByDay(string day)
        {
            string error;
         

            DateTime startTime;
            if (!DateTime.TryParse(day, out startTime))
            {
                return new IStation.Dto.ApiResult<string>("day å‚数不合理", Dto.ApiResultCode.Error);
            }
            var list = TideFromBookHelper.GetByDay2(startTime, out error);

            if(list == null || list.Count()==0)
            {
                return new IStation.Dto.ApiResult<string>("获取失败", Dto.ApiResultCode.Error);
            }
            List<TideValue> list2 = new List<TideValue>();
            foreach(var  m in list)
            {
                list2.Add(new TideValue(m));
            }

            return new IStation.Dto.ApiResult<List<TideValue>>(list2);
        }



        public class TideValue
        {
            public TideValue() { }
            public TideValue(Model.TimeWaterLevel rhs)
            {
                this.Time = rhs.Time;
                this.Value = rhs.Level;
            }
            public TideValue(DateTime time, double level) { this.Time = time; this.Value = level; }
            public DateTime Time { get; set; }
            public double Value { get; set; }
        }



    }
}

 WebApi/Controllers/TideController.cs

@@ -16,6 +16,8 @@
    [RoutePrefix("Tide")]
    public class TideController : ApiController
    {


        /// <summary>
        ///  èŽ·å–最近三天 
        /// </summary>
@@ -38,7 +40,6 @@
            else
            {
                list = TideFromBookHelper.GetByDayRange(DateTime.Parse(startday), DateTime.Parse(endday), out error);

            }


@@ -95,9 +96,7 @@
        [HttpPost]
        public IStation.Dto.ApiResult ImportByDay(ImportByDayRequest request)
        {
 
            var ret = TideFromBookHelper.SaveList(DateTime.Parse(request.day), request.level);


            return new IStation.Dto.ApiResult<bool>(ret);
        }

 WebApi/Controllers/ZyPrjController.cs

@@ -94,12 +94,16 @@
                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)
            { 
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "无法获取长江水位数据" };
            }

            #region å–水总量
            double TotalFlowIn = 0;
@@ -120,7 +124,7 @@
            }

            #endregion å–水总量

       
            #region æ°´ä½è¦æ±‚

            if (!string.IsNullOrEmpty(request.MaxReservoirLevelTime))
@@ -275,11 +279,8 @@
                    anaRequest.StartReservoirLevel)
                };
            }
            //bool isTemp = false;
            //if (!string.IsNullOrEmpty(request.IsTemporary))
            //{
            //    isTemp = Convert.ToBoolean(request.IsTemporary);
            //}

            IStation.LogHelper.Info("kashi è®¡ç®—取水总量 ");

            var calcHelper = new IStation.CalcPrjHelper();
            AnaPrj defaultPrj = null;

 WebApi/IStation.ChEr.WebApi.csproj

@@ -238,6 +238,8 @@
    <Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
    <Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
    <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
    <Compile Include="Controllers\OpenPredictController.cs" />
    <Compile Include="Controllers\OpenTideController.cs" />
    <Compile Include="Controllers\ZyPrjController.cs" />
    <Compile Include="Controllers\AnaPrjController.cs" />
    <Compile Include="Controllers\HomeController.cs" />

 WebApi/Logs/Debug/20241021.txt

 WebApi/Logs/Error/20241021.txt

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
2024-10-21 13:39:03,268|UnknowException,Exception:缺少WaterPredictDsPath配置,StackTrace:   åœ¨ IStation.DAL.WaterPredictRecord.CreateConnection(Int32 year) ä½ç½® D:\WorkData\IStation\ChEq\CodeV1.3\DAL\IStation.DAL.Project\DAL\WaterPredictRecord.cs:行号 27
   åœ¨ IStation.DAL.WaterPredictRecord.GetByHourRangle(DateTime start_time, DateTime end_time) ä½ç½® D:\WorkData\IStation\ChEq\CodeV1.3\DAL\IStation.DAL.Project\DAL\WaterPredictRecord.cs:行号 78
   åœ¨ IStation.WebApi.Controllers.ZyPrjController.Calc(ZyPrjRequest request) ä½ç½® D:\WorkData\IStation\ChEq\CodeV1.3\WebApi\Controllers\ZyPrjController.cs:行号 170
   åœ¨ lambda_method(Closure , Object , Object[] )
   åœ¨ System.Web.Http.Controllers.ReflectedHttpActionDescriptor.ActionExecutor.<>c__DisplayClass6_2.<GetExecutor>b__2(Object instance, Object[] methodParameters)
   åœ¨ System.Web.Http.Controllers.ReflectedHttpActionDescriptor.ExecuteAsync(HttpControllerContext controllerContext, IDictionary`2 arguments, CancellationToken cancellationToken)
--- å¼•å‘异常的上一位置中堆栈跟踪的末尾 ---
   åœ¨ System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   åœ¨ System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   åœ¨ System.Web.Http.Controllers.ApiControllerActionInvoker.<InvokeActionAsyncCore>d__1.MoveNext()
--- å¼•å‘异常的上一位置中堆栈跟踪的末尾 ---
   åœ¨ System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   åœ¨ System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   åœ¨ System.Web.Http.Controllers.ActionFilterResult.<ExecuteAsync>d__5.MoveNext()
--- å¼•å‘异常的上一位置中堆栈跟踪的末尾 ---
   åœ¨ System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   åœ¨ System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   åœ¨ System.Web.Http.Controllers.ExceptionFilterResult.<ExecuteAsync>d__6.MoveNext()|

 WebApi/Logs/Info/20241021.txt

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
2024-10-21 13:36:51,791|--------------------------START-----------------------------------------|
2024-10-21 13:36:51,803|Zy Prj Calc Request:  {"StartTime":"2024-10-21 22:00:00","EndTime":"2024-10-22 22:00:00","StartReservoirLevel":null,"StartOpenPumpIndexArray":"","TotalFlowIn":"","TotalFlowOut":"","MaxReservoirLevel":"6.8","MaxReservoirLevelTime":"2024-10-22 09:00:00"}|
2024-10-21 13:39:19,265|--------------------------START-----------------------------------------|
2024-10-21 13:39:19,284|Zy Prj Calc Request:  {"StartTime":"2024-10-21 22:00:00","EndTime":"2024-10-22 22:00:00","StartReservoirLevel":null,"StartOpenPumpIndexArray":"","TotalFlowIn":"","TotalFlowOut":"","MaxReservoirLevel":"6.8","MaxReservoirLevelTime":"2024-10-22 09:00:00"}|
2024-10-21 13:39:23,386|获取水量预测值:  52891,52830,66099,66106,66112,66119,66125,66132,66138,66144,66151,66157,66164,66170,66177,66183,66190,66196,66203,66209,66215,66222,66228,66235 ,  é¢„测值总供水总量:1561396 |
2024-10-21 13:39:23,386| æœªè®¾ç½®å¼€å§‹æ—¶æ°´åº“水位 (Error: StartReservoirLevel is null)|
2024-10-21 13:39:57,087|--------------------------START-----------------------------------------|
2024-10-21 13:39:57,495|Zy Prj Calc Request:  {"StartTime":"2024-10-21 22:00:00","EndTime":"2024-10-22 22:00:00","StartReservoirLevel":null,"StartOpenPumpIndexArray":"","TotalFlowIn":"","TotalFlowOut":"","MaxReservoirLevel":"6.8","MaxReservoirLevelTime":"2024-10-22 09:00:00"}|
2024-10-21 13:40:18,624|获取水量预测值:  52891,52830,66099,66106,66112,66119,66125,66132,66138,66144,66151,66157,66164,66170,66177,66183,66190,66196,66203,66209,66215,66222,66228,66235 ,  é¢„测值总供水总量:1561396 |
2024-10-21 13:40:22,835| æœªè®¾ç½®å¼€å§‹æ—¶æ°´åº“水位 (Error: StartReservoirLevel is null)|
2024-10-21 13:40:45,145|--------------------------START-----------------------------------------|
2024-10-21 13:40:45,145|Zy Prj Calc Request:  {"StartTime":"2024-10-21 22:00:00","EndTime":"2024-10-22 22:00:00","StartReservoirLevel":null,"StartOpenPumpIndexArray":"","TotalFlowIn":"","TotalFlowOut":"","MaxReservoirLevel":"6.8","MaxReservoirLevelTime":"2024-10-22 09:00:00"}|
2024-10-21 13:41:16,702|获取水量预测值:  52891,52830,66099,66106,66112,66119,66125,66132,66138,66144,66151,66157,66164,66170,66177,66183,66190,66196,66203,66209,66215,66222,66228,66235 ,  é¢„测值总供水总量:1561396 |
2024-10-21 13:41:29,983| æœªè®¾ç½®å¼€å§‹æ—¶æ°´åº“水位 (Error: StartReservoirLevel is null)|
2024-10-21 13:41:55,079|--------------------------START-----------------------------------------|
2024-10-21 13:41:55,079|Zy Prj Calc Request:  {"StartTime":"2024-10-21 22:00:00","EndTime":"2024-10-22 22:00:00","StartReservoirLevel":null,"StartOpenPumpIndexArray":"","TotalFlowIn":"","TotalFlowOut":"","MaxReservoirLevel":"6.8","MaxReservoirLevelTime":"2024-10-22 09:00:00"}|
2024-10-21 13:41:55,088|获取水量预测值:  52891,52830,66099,66106,66112,66119,66125,66132,66138,66144,66151,66157,66164,66170,66177,66183,66190,66196,66203,66209,66215,66222,66228,66235 ,  é¢„测值总供水总量:1561396 |
2024-10-21 13:41:58,922| æœªè®¾ç½®å¼€å§‹æ—¶æ°´åº“水位 (Error: StartReservoirLevel is null)|
2024-10-21 13:42:32,108|--------------------------START-----------------------------------------|
2024-10-21 13:42:32,124|Zy Prj Calc Request:  {"StartTime":"2024-10-21 22:00:00","EndTime":"2024-10-22 22:00:00","StartReservoirLevel":"6","StartOpenPumpIndexArray":"","TotalFlowIn":"","TotalFlowOut":"","MaxReservoirLevel":"6.8","MaxReservoirLevelTime":"2024-10-22 09:00:00"}|
2024-10-21 13:42:32,705|获取水量预测值:  52891,52830,66099,66106,66112,66119,66125,66132,66138,66144,66151,66157,66164,66170,66177,66183,66190,66196,66203,66209,66215,66222,66228,66235 ,  é¢„测值总供水总量:1561396 |
2024-10-21 13:43:36,188|-----------------------------END--------------------------------------|

 WebApi/Logs/Tests/20240731.txt