From cdf20a4525a2ff9f6fe2c1e9b69fa2854c5848fd Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期二, 27 五月 2025 17:17:03 +0800
Subject: [PATCH] 巨石
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs | 102 +++++++++++++++++++++++++++------------------------
1 files changed, 54 insertions(+), 48 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs
index 7945429..730049f 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/process/DeviceProcess.cs
@@ -28,7 +28,7 @@
//3A 00 01 00 01 05 73 00 02 01 01 B8
//鍙� //2A 00 01 00 01 05 73 00 02 01 01 A8
- if (data.Substring(0, 2) == "3A")
+ if (data.Substring(0, 2) == "3a")
{
//鏁版嵁搴忓彿
data = data.Substring(16, 2);
@@ -39,7 +39,7 @@
bool result = false;
if (data.Equals("01"))
{
- var reservoirs = Settings.ReservoirAreas.Where(s => s.areaName == "RGV搴撳尯").FirstOrDefault();
+ var reservoirs = Settings.ReservoirAreas.Where(s => s.areaName == "绔嬪簱鍏ュ簱鍖�).FirstOrDefault();
result = TaskProcess.tcpOffline(loc, reservoirs.areaCode);
}
else if (data.Equals("02"))
@@ -64,7 +64,7 @@
}
//2A 00 01 00 01 05 73 00 02 01 01 A8
// 杈撳叆鐨勫崄鍏繘鍒跺瓧绗︿覆鏁扮粍
- string[] hexValues = { "2A", "00", "01", "00", "01", "05", "73", "00", "02", data, "01" };
+ string[] hexValues = { "2a", "00", "01", "00", "01", "05", "73", "00", "02", data, "01" };
// 璁＄畻鎬诲拰
int sum = hexValues.Sum(hex => Convert.ToInt32(hex, 16));
string returndata = hexValues.ToString() + sum;
@@ -74,54 +74,60 @@
}
}
//rgv瀹夊叏浜や簰
- else if (data.Substring(0, 4) == "3F00")
+ else if (data.Substring(0, 4) == "3f00")
{
- //鏃犱俊鍙蜂笉绠�- if (data.Trim() != "3F00102030400D0A")
- {
+ ////鏃犱俊鍙蜂笉绠�+ //if (data.Trim() != "3f001020304050600d0a")
+ //{
LogHelper.Info($"RGV瀹夊叏浜や簰鎺ユ敹淇″彿{data}");
- var reservoirs = Settings.SafeInteractions.Where(s => s.ip == ip).FirstOrDefault();
- //1鍏佽鍗歌揣 2鍗歌揣瀹屾垚纭
- string datastr = "";
- if (reservoirs.pointCode == "RGV1")
- {
- datastr = data.Substring(5, 1);
- }
- else if (reservoirs.pointCode == "RGV2")
- {
- datastr = data.Substring(7, 1);
- }
- else if (reservoirs.pointCode == "RGV3")
- {
- datastr = data.Substring(9, 1);
- }
- else if (reservoirs.pointCode == "RGV4")
- {
- datastr = data.Substring(11, 1);
- }
+ rgvSafeInteraction = data.Substring(4,12);
+ //var reservoirs = Settings.SafeInteractions.Where(s => s.ip == ip).FirstOrDefault();
+ ////1鍏佽鍗歌揣 2鍗歌揣瀹屾垚纭
+ //string datastr = "";
+ //switch (reservoirs.pointCode)
+ //{
+ // case "RGV1":
+ // datastr = data.Substring(5, 1);
+ // break;
+ // case "RGV2":
+ // datastr = data.Substring(7, 1);
+ // break;
+ // case "RGV3":
+ // datastr = data.Substring(9, 1);
+ // break;
+ // case "RGV4":
+ // datastr = data.Substring(11, 1);
+ // break;
+ // case "RGV5":
+ // datastr = data.Substring(13, 1);
+ // break;
+ // case "RGV6":
+ // datastr = data.Substring(15, 1);
+ // break;
+ //}
- //鎺ュ彈淇″彿瀛樺埌鍐呭瓨
- if (rgvSafeInteraction != null)
- {
- //string杞垚list
- var jsonList = JsonConvert.DeserializeObject<List<SafeInteraction>>(rgvSafeInteraction);
- var list = jsonList.Where(s => s.ip == ip).First();
- if (list != null)
- {
- //涓嶄负绌哄氨鍏堝垹鍐嶅姞涓�- jsonList.Remove(list);
- }
- jsonList.Add(new SafeInteraction { ip = ip, data = datastr });
- rgvSafeInteraction = JsonConvert.SerializeObject(jsonList);
- }
- else
- {
- //绗竴娆¤繘
- var safeInteractions = new List<SafeInteraction>{new SafeInteraction { ip = ip, data = datastr }};
- rgvSafeInteraction = JsonConvert.SerializeObject(safeInteractions);
- }
- LogHelper.Info($"RGV瀹夊叏浜や簰 瀛樺叆鍐呭瓨鍙傛暟{rgvSafeInteraction}");
- }
+ ////鎺ュ彈淇″彿瀛樺埌鍐呭瓨
+ //if (rgvSafeInteraction != null)
+ //{
+ // //string杞垚list
+ // var jsonList = JsonConvert.DeserializeObject<List<SafeInteraction>>(rgvSafeInteraction);
+ // var list = jsonList.Where(s => s.ip == ip).First();
+ // if (list != null)
+ // {
+ // //涓嶄负绌哄氨鍏堝垹鍐嶅姞涓�+ // jsonList.Remove(list);
+ // }
+ // jsonList.Add(new SafeInteraction { ip = ip, data = datastr });
+ // rgvSafeInteraction = JsonConvert.SerializeObject(jsonList);
+ //}
+ //else
+ //{
+ // //绗竴娆¤繘
+ // var safeInteractions = new List<SafeInteraction>{new SafeInteraction { ip = ip, data = datastr }};
+ // rgvSafeInteraction = JsonConvert.SerializeObject(safeInteractions);
+ //}
+ //LogHelper.Info($"RGV瀹夊叏浜や簰 瀛樺叆鍐呭瓨鍙傛暟{rgvSafeInteraction}");
+ //}
}
--
Gitblit v1.9.1