From 445654a6c64af95c0a241792ddcb547bce51555e Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期三, 24 七月 2024 10:50:30 +0800
Subject: [PATCH] 添加检修状态返回
---
Library/Newtonsoft.Json.dll | 0
WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj | 1
WebApi/众毅调度/ZyConnectHelper.cs | 56 +++++++++++++--------------
WebApi/Controllers/ZyPrjController.cs | 21 ++++++++++
WinFrmUI/IStation.WinFrmUI.River/IStation.WinFrmUI.River.csproj | 1
5 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/Library/Newtonsoft.Json.dll b/Library/Newtonsoft.Json.dll
index 341d08f..7af125a 100644
--- a/Library/Newtonsoft.Json.dll
+++ b/Library/Newtonsoft.Json.dll
Binary files differ
diff --git a/WebApi/Controllers/ZyPrjController.cs b/WebApi/Controllers/ZyPrjController.cs
index 99b3bb8..4a7446e 100644
--- a/WebApi/Controllers/ZyPrjController.cs
+++ b/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>();
diff --git "a/WebApi/\344\274\227\346\257\205\350\260\203\345\272\246/ZyConnectHelper.cs" "b/WebApi/\344\274\227\346\257\205\350\260\203\345\272\246/ZyConnectHelper.cs"
index 9e023a6..cf20228 100644
--- "a/WebApi/\344\274\227\346\257\205\350\260\203\345\272\246/ZyConnectHelper.cs"
+++ "b/WebApi/\344\274\227\346\257\205\350\260\203\345\272\246/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>
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj b/WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj
index 1a2cf6d..694ce6d 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj
+++ b/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>
diff --git a/WinFrmUI/IStation.WinFrmUI.River/IStation.WinFrmUI.River.csproj b/WinFrmUI/IStation.WinFrmUI.River/IStation.WinFrmUI.River.csproj
index c3428bd..e12078f 100644
--- a/WinFrmUI/IStation.WinFrmUI.River/IStation.WinFrmUI.River.csproj
+++ b/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>
--
Gitblit v1.9.3