添加检修状态返回

tangxu

2024-07-24 445654a6c64af95c0a241792ddcb547bce51555e

添加检修状态返回

 Library/Newtonsoft.Json.dll

Binary files differ

 WebApi/Controllers/ZyPrjController.cs

@@ -553,11 +553,30 @@
            dto_setting.OpenPumpIndexSequence = model_setting.OpenPumpIndexSequence;
            dto_setting.ClosePumpIndexSequence = model_setting.ClosePumpIndexSequence;
            dto_setting.OptimalPumpIndexSequence = model_setting.OptimalPumpIndexSequence;
            dto_setting.UnablePumpIndexArray = model_setting.UnablePumpIndexArray;

            //dto_setting.OpenPumpIndexSequence = BuildSequenceToDto(model_setting.OpenPumpIndexSequence);
            //dto_setting.ClosePumpIndexSequence = BuildSequenceToDto(model_setting.ClosePumpIndexSequence);
            //dto_setting.OptimalPumpIndexSequence = BuildSequenceToDto(model_setting.OptimalPumpIndexSequence);

            //检修泵的角标, 0 è¡¨ç¤º1号泵 1 è¡¨ç¤ºäºŒå·æ³µ ä¸ºç©º,表示没有检修
            var overhallStatus = ZyConnectHelper.GetOverhaulStatus();
            if(overhallStatus == null || overhallStatus.Count == 0)
            {
                if(model_setting.UnablePumpIndexArray != null)
                {
                    model_setting.UnablePumpIndexArray = null;
                    IStation.Common.AnaSetting.SaveSetting(model_setting);
                } 
            }
            else
            {
                model_setting.UnablePumpIndexArray = overhallStatus.ToArray();
                IStation.Common.AnaSetting.SaveSetting(model_setting);
            }
            dto_setting.UnablePumpIndexArray = model_setting.UnablePumpIndexArray;



            if (model_setting.SwitchPumpIgnoreTimes != null)
            {
                dto_setting.SwitchPumpIgnoreTimes = new List<ZyPrjAnaSetting.TimeRangeZy>();

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

@@ -906,64 +906,62 @@
            var statuslist = new List<int>();
            string url = $"{ZyApiUrl}dataController/getCurrentJsonDataOfRedis/义维模型";
            var data = HttpClientHelper.Get(url);
            var first = GetValsValue(data, "10191", 0);  //二取水一号泵检修
            if (first != null)
              //二取水一号泵检修
            if (GetValsValue(data, "10191", 0))
            {
                statuslist.AddRange(first);
                statuslist.Add (0);
            }
            var second = GetValsValue(data, "10192", 1);  //二取水二号泵检修
            if (second != null)
             //二取水二号泵检修
            if (GetValsValue(data, "10192", 1))
            {
                statuslist.AddRange(second);
                statuslist.Add (1);
            }
            var thirdly = GetValsValue(data, "10193", 2);  //二取水三号泵检修
            if (thirdly != null)
             //二取水三号泵检修
            if (GetValsValue(data, "10193", 2))
            {
                statuslist.AddRange(thirdly);
                statuslist.Add (2);
            }
            var fourthly = GetValsValue(data, "10194", 3);  //二取水四号泵检修
            if (fourthly != null)
             //二取水四号泵检修
            if (GetValsValue(data, "10194", 3))
            {
                statuslist.AddRange(fourthly);
                statuslist.Add(3);
            }
            var fifth = GetValsValue(data, "10195", 4);  //二取水五号泵检修
            if (fifth != null)
              //二取水五号泵检修
            if (GetValsValue(data, "10195", 4))
            {
                statuslist.AddRange(fifth);
            }
            if (statuslist.Count < 0)
            {
                return null;
                statuslist.Add(4);
            }
            return statuslist;
        }

        //获取机泵检修状态
        private static List<int> GetValsValue(Dictionary<string, Dictionary<string, string>> data, string pumptag, int sign)
        private static bool GetValsValue(Dictionary<string, Dictionary<string, string>> data, string pumptag, int sign)
        {
            if (data == null)
                return null;
                return false ;
            if (!data.ContainsKey(pumptag))
                return null;
                return false;
            var valuelist = new List<int>();
            var scada = data[pumptag];
            if (!scada.ContainsKey("vals"))
                return null;
                return false;
            var vals = scada["vals"];
            if (int.TryParse(vals, out int value))
            {
                LogHelper.Info("当前泵角标为:" + sign + "-----状态为:" + value);
            { 
                if (value == 1)
                {
                    valuelist.Add(sign);
                    return valuelist;
                    return true;
                }
                else
                {
                    return null;
                    return false ;
                }
            }
            return null;
            else
            {
                LogHelper.Info("Error: å½“前泵角标为:" + sign + ", çŠ¶æ€æ— æ³•è¯»å–-----状态为:" + vals);
            }
            return false ;
        }

        /// <summary>

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

@@ -315,7 +315,6 @@
    <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.River/IStation.WinFrmUI.River.csproj

@@ -247,7 +247,6 @@
    <EmbeddedResource Include="Hydrology\LocationPictureDlg.resx">
      <DependentUpon>LocationPictureDlg.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\licenses.licx" />
    <EmbeddedResource Include="RiverWaterLevelMainPage2.resx">
      <DependentUpon>RiverWaterLevelMainPage2.cs</DependentUpon>
    </EmbeddedResource>