Merge branch 'master' of http://47.103.154.90:83/r/IStation/shys/ChEqCalc.V1.3

tangxu

2024-09-05 e3b3911774962c8f05c76424980aa9f30267d492

Merge branch 'master' of http://47.103.154.90:83/r/IStation/shys/ChEqCalc.V1.3

 WebApi/Controllers/ZyPrjController.cs

@@ -55,7 +55,7 @@
        [Route("Calc")]
        [HttpPost]
        public IStation.Dto.ApiResult Calc([FromBody] ZyPrjRequest request)
        { 
        {
            if (request == null)
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "request is null" };
@@ -71,8 +71,6 @@
            //
            IStation.LogHelper.Info("--------------------------START-----------------------------------------");
            IStation.LogHelper.Info(string.Format("Zy Prj Calc Request:  {0}", JsonHelper.Object2Json(request)));
 


            DateTime start_timme = DateTime.Now;
            DateTime end_timme = DateTime.Now;
@@ -109,7 +107,7 @@
            {
                double TotalFlowIn = 0;
                if (!double.TryParse(request.TotalFlowIn, out TotalFlowIn))
                { 
                {
                    return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "请输入数字型取水总量,接受到的输入值是:" + request.TotalFlowIn };
                }
                if (TotalFlowIn < 10000)
@@ -153,7 +151,7 @@
                double TotalFlowIn = 0;
                if (!double.TryParse(request.TotalFlowIn, out TotalFlowIn))
                {
                    return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "请输入数字型取水总量,接受到的输入值是:"+ request.TotalFlowIn };
                    return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "请输入数字型取水总量,接受到的输入值是:" + request.TotalFlowIn };
                }
            }

@@ -202,14 +200,15 @@
                    TotalFlowOutPrecid += r.LastPredictValue;
                    anaRequest.PerHourFlowOut.Add(r.LastPredictValue);//计算中用吨
                }
                IStation.LogHelper.Info(string.Format("  èŽ·å–水量预测值:  {0}   ", string.Join(",",anaRequest.PerHourFlowOut)));
                IStation.LogHelper.Info(string.Format("  èŽ·å–水量预测值:  {0}   ", string.Join(",", anaRequest.PerHourFlowOut)));

                #endregion ç”¨é¢„测值
            }
            else
            {
                if (!double.TryParse(request.TotalFlowOut, out TotalFlowOut))
                { 
                    return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "注意供水总量输入参数无法识别,参数是:"+ request.TotalFlowOut };
                {
                    return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "注意供水总量输入参数无法识别,参数是:" + request.TotalFlowOut };
                }
                if (TotalFlowOut < 10000)
                {
@@ -230,10 +229,10 @@
            #endregion ä¾›æ°´é‡

            //开始时的开机状态
            List<int> StartOpenPumpIndexArray = new List<int>();    
            if (!string.IsNullOrEmpty(request.StartOpenPumpIndexArray  ))
            List<int> StartOpenPumpIndexArray = new List<int>();
            if (!string.IsNullOrEmpty(request.StartOpenPumpIndexArray))
            {
                var sss = request.StartOpenPumpIndexArray.Split(','); 
                var sss = request.StartOpenPumpIndexArray.Split(',');
                foreach (var item in sss)
                {
                    if (int.TryParse(item, out int index))
@@ -282,17 +281,17 @@
            string error_info = calcHelper.Calc(anaRequest, out defaultPrj);

            if (!string.IsNullOrEmpty(error_info) || defaultPrj == null)
            { 
            {
                IStation.LogHelper.Info(string.Format("Zy Prj  è®¡ç®—错误:  \r\n {0}  ", error_info));
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "计算错误, åŽŸå› æ˜¯:" + error_info };
            }
            else
            { 
              //  IStation.LogHelper.Info(string.Format("Zy Prj  è®¡ç®—成功:  \r\n {0}  ",  JsonHelper.Object2Json(defaultPrj)));
            {
                //  IStation.LogHelper.Info(string.Format("Zy Prj  è®¡ç®—成功:  \r\n {0}  ",  JsonHelper.Object2Json(defaultPrj)));
            }
            IStation.LogHelper.Info("-----------------------------END--------------------------------------");

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

            //
@@ -478,6 +477,7 @@
                foreach (var bt in defaultPrj.PumpSwitchs)
                {
                    ZyDto.SubmitPrjSwitchInfo dto_item = new ZyDto.SubmitPrjSwitchInfo();
                    dto_item.Index = bt.Index;
                    dto_item.GroupID = bt.GroupID;//分组ID
                    dto_item.PumpIndex = bt.PumpIndex;//泵角标
                    dto_item.Time = bt.Time.ToString("yyyy-MM-dd HH:mm:ss");//时间
@@ -569,7 +569,7 @@
            dto_setting.OptSortType = model_setting.OptSortType;
            dto_setting.SwitchPumpMinuteSpace = model_setting.SwitchPumpMinuteSpace;

            dto_setting.OpenPumpIndexSequence = IStation.Dto.ZyPrjAnaSetting.ListToString( model_setting.OpenPumpIndexSequence);
            dto_setting.OpenPumpIndexSequence = IStation.Dto.ZyPrjAnaSetting.ListToString(model_setting.OpenPumpIndexSequence);
            dto_setting.ClosePumpIndexSequence = IStation.Dto.ZyPrjAnaSetting.ListToString(model_setting.ClosePumpIndexSequence);
            dto_setting.OptimalPumpIndexSequence = IStation.Dto.ZyPrjAnaSetting.ListToString(model_setting.OptimalPumpIndexSequence);

@@ -595,14 +595,12 @@
                    model_setting.UnablePumpIndexArray = overhallStatus.ToArray();
                    dto_setting.UnablePumpIndexArray = string.Join(",", overhallStatus);
                    IStation.Common.AnaSetting.SaveSetting(model_setting);
                } 
                }
            }
            catch(Exception ex)
            catch (Exception ex)
            {
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "无法链接工控服务器,错误原因:" + ex.Message};
                return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "无法链接工控服务器,错误原因:" + ex.Message };
            }



            if (model_setting.SwitchPumpIgnoreTimes != null)
            {
@@ -857,12 +855,13 @@

            return new IStation.Dto.ApiResult<List<int>>(overhallStatus);
        }
        private string BuildSequenceFromDto(string  sequenceDto, out int[] sequenceDs)

        private string BuildSequenceFromDto(string sequenceDto, out int[] sequenceDs)
        {
            sequenceDs = null;
            if (string.IsNullOrEmpty(sequenceDto))
                return null;
 

            List<int> list = new List<int>();
            if (!string.IsNullOrEmpty(sequenceDto))
            {
@@ -880,10 +879,10 @@
                }
            }

            return BuildSequenceFromDto(list,out sequenceDs);
            return BuildSequenceFromDto(list, out sequenceDs);
        }
        
        private string BuildSequenceFromDto(List<int>  sequenceDto, out int[] sequenceDs)

        private string BuildSequenceFromDto(List<int> sequenceDto, out int[] sequenceDs)
        {
            sequenceDs = null;
            if (sequenceDto == null || sequenceDto.Count() == 0)

 WebApi/IStation.ChEr.WebApi.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress>true</Use64BitIISExpress>
    <IISExpressSSLPort>44318</IISExpressSSLPort>

 WebApi/Logs/Debug/20240805.txt

 WebApi/Logs/Error/20240805.txt

 WebApi/Logs/Info/20240805.txt

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
2024-08-05 11:39:31,358|调用------GetLastHistoryRecord接口|
2024-08-05 11:46:18,549|调用------GetLastHistoryRecord接口|
2024-08-05 14:53:47,566| api GetHistoryByDay 2024-08-05    format: 2024/8/5 0:00:00  |
2024-08-05 14:53:57,980| api GetHistoryByDay 2024-08-05    format: 2024/8/5 0:00:00  |
2024-08-05 14:57:19,302|--------------------------START-----------------------------------------|
2024-08-05 14:57:19,310|Zy Prj Calc Request:  {"StartTime":"2024-08-05 15:00","EndTime":"2024-08-05 16:00","StartReservoirLevel":"5.7","StartOpenPumpIndexArray":"","TotalFlowIn":"150000","TotalFlowOut":"90000","MaxReservoirLevel":"","MaxReservoirLevelTime":""}|
2024-08-05 14:57:22,948|Zy Prj  è®¡ç®—错误:  
 æœªæ‰¾åˆ°åˆé€‚的调度方案  |

 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|2024-08-02T11:04:12.2446801Z||;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|2024-08-14T02:18:45.7227462Z||;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>
@@ -100,16 +100,16 @@
      <publishTime>04/17/2020 04:38:56</publishTime>
    </File>
    <File Include="bin/IStation.AutoMapper.dll">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.AutoMapper.pdb">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Calc.Core.dll">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:43</publishTime>
    </File>
    <File Include="bin/IStation.Calc.Core.pdb">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:43</publishTime>
    </File>
    <File Include="bin/IStation.Calc.ErQu.dll">
      <publishTime>03/13/2024 12:32:32</publishTime>
@@ -118,61 +118,61 @@
      <publishTime>03/13/2024 12:32:32</publishTime>
    </File>
    <File Include="bin/IStation.Calc.Model.dll">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.Calc.Model.pdb">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.Core.dll">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Core.pdb">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.DAL.Paras.dll">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.DAL.Paras.pdb">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.DAL.Project.dll">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:42</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>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.Entity.Basic.dll">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/05/2024 11:41:15</publishTime>
    </File>
    <File Include="bin/IStation.Entity.Basic.pdb">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/05/2024 11:41:15</publishTime>
    </File>
    <File Include="bin/IStation.Entity.Core.dll">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Entity.Core.pdb">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Log.dll">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:41</publishTime>
    </File>
    <File Include="bin/IStation.Log.pdb">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:41</publishTime>
    </File>
    <File Include="bin/IStation.MemoryCache.dll">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.MemoryCache.pdb">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Model.Basic.dll">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.Model.Basic.pdb">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.Model.Config.dll">
      <publishTime>03/13/2024 12:32:32</publishTime>
@@ -181,58 +181,58 @@
      <publishTime>03/13/2024 12:32:32</publishTime>
    </File>
    <File Include="bin/IStation.Model.Core.dll">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:41</publishTime>
    </File>
    <File Include="bin/IStation.Model.Core.pdb">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:41</publishTime>
    </File>
    <File Include="bin/IStation.Model.Curve.dll">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.Model.Curve.pdb">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:42</publishTime>
    </File>
    <File Include="bin/IStation.Model.Monitor.dll">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Model.Monitor.pdb">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Newtonsoft.dll">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:40</publishTime>
    </File>
    <File Include="bin/IStation.Newtonsoft.pdb">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:40</publishTime>
    </File>
    <File Include="bin/IStation.Settings.dll">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:40</publishTime>
    </File>
    <File Include="bin/IStation.Settings.pdb">
      <publishTime>08/02/2024 19:04:08</publishTime>
      <publishTime>08/14/2024 10:18:40</publishTime>
    </File>
    <File Include="bin/IStation.SnowflakeId.dll">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.SnowflakeId.pdb">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Unit.dll">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Unit.pdb">
      <publishTime>08/02/2024 17:48:00</publishTime>
      <publishTime>08/05/2024 11:34:36</publishTime>
    </File>
    <File Include="bin/IStation.Untity.dll">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:41</publishTime>
    </File>
    <File Include="bin/IStation.Untity.pdb">
      <publishTime>08/02/2024 19:04:09</publishTime>
      <publishTime>08/14/2024 10:18:41</publishTime>
    </File>
    <File Include="bin/IStation.WebApi.dll">
      <publishTime>08/02/2024 19:04:10</publishTime>
      <publishTime>08/14/2024 10:18:44</publishTime>
    </File>
    <File Include="bin/IStation.WebApi.pdb">
      <publishTime>08/02/2024 19:04:10</publishTime>
      <publishTime>08/14/2024 10:18:44</publishTime>
    </File>
    <File Include="bin/log4net.dll">
      <publishTime>03/25/2024 09:57:26</publishTime>

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

@@ -25,6 +25,7 @@

        public List<SubmitPrjSwitchInfo> Switchs { get; set; }
    }

    internal class SubmitPrjBlockTime
    {
        public int StartSwitchGroupID { get; set; }//开始时对应的SwitchID
@@ -34,23 +35,30 @@
        public List<int> OpenPumpIndexs { get; set; }
        public List<SubmitPrjTime> Records { get; set; }
    }

    public class SubmitPrjSwitchInfo
    {
        public SubmitPrjSwitchInfo() { }
        public SubmitPrjSwitchInfo()
        { }

        //
        public int Index { get; set; }

        public int GroupID { get; set; }//分组ID
        public int PumpIndex { get; set; }//泵角标
        public string  Time { get; set; }//时间
        public int SwitchType { get; set; }//1 å¼€æœº 0 å…³æœº 
        public string Time { get; set; }//时间
        public int SwitchType { get; set; }//1 å¼€æœº 0 å…³æœº
    }

    internal class SubmitPrjTime
    {
        public SubmitPrjTime() { }
        public SubmitPrjTime()
        { }

        public SubmitPrjTime(IStation.CalcModel.AnaPrjPointTime rhs)
        {
            this.Time = rhs.Time; 
 
            this.Time = rhs.Time;

            this.RealFlow = rhs.RealFlow;
            this.SumMoney = rhs.SumMoney;
            this.RealPower = rhs.RealPower;
@@ -61,20 +69,20 @@
            this.OpenPumpCount = rhs.OpenPumpCount;
            this.WaterLevelC = rhs.WaterLevelC;
        }

        public DateTime Time { get; set; }//时间
        public int OpenPumpCount { get; set; }//开泵数量

 
        public double RealFlow { get; set; }//瞬时值, ä¸è€ƒè™‘时间段
        public double RealPower { get; set; }//瞬时值, ä¸è€ƒè™‘时间段

        public double SumFlow { get; set; }//流量 , è€ƒè™‘时间段
        public double SumPower { get; set; }//用电量 , è€ƒè™‘时间段
        public double SumMoney { get; set; }//费电 , è€ƒè™‘时间段
 

        //public double WaterLevelQ { get; set; }//前池液位 
        //public double WaterLevelQ { get; set; }//前池液位
        public double WaterLevelH { get; set; }//水库液位

        public double WaterLevelC { get; set; }//长江水位
    }
}
}