From 70900e697720bfe657bbf28067caeeb03bfdbf8f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 07 六月 2025 18:57:09 +0800
Subject: [PATCH] 更新伸缩杆的自动和手动接口的提示修改和完善
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
index 7e96004..1d08638 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
@@ -64,24 +64,23 @@
var leftPLcNowAdd = devices.Value.left.Communicator.Read<float>("D80");
Console.WriteLine($"{devices.Value.left.DeviceName}:鍗′綇鎶ヨ{leftPLcstuck1}锛屽叾浠栨姤璀leftPLcOher1}");
if (leftPLcstuck1 == true && leftPLcOher1 == false)
- //if (leftPLcOher == false)
{
string text = $"杞ㄩ亾{deid}锛氫几缂╁崱浣忔姤璀�";
//鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid,text, leftPLcstuck1);
}
if (leftPLcstuck1 == false && leftPLcOher1 == true)
{
string text = $"杞ㄩ亾{deid}锛氬叾浠栨晠闅滄姤璀�";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftPLcstuck1);
}
if (leftPLcstuck1 == true && leftPLcOher1 == true)//濡傛灉鎶ヨ浜�
{
string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀﹀拰鍏朵粬鏁呴殰鎶ヨ";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, leftPLcstuck1);
}
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new
{
@@ -93,7 +92,7 @@
catch (Exception)
{
string text = $"杞ㄩ亾{deid}锛氬乏PLC鏈繛鎺�";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, false);//娣诲姞鏁版嵁
+ //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false);//娣诲姞鏁版嵁
}
try
@@ -102,25 +101,25 @@
{
//鍙硃lc
var rightPLcSuck = devices.Value.right.Communicator.Read<bool>("M109"); //鍗′綇鎶ヨ
- var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M110");//鍏朵粬鎶ヨ
+ var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M111");//鍏朵粬鎶ヨ
var rightPLcNowAdd = devices.Value.right.Communicator.Read<float>("D80");
Console.WriteLine($"{devices.Value.right.DeviceName}:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}");
if (rightPLcSuck == true && rightPLcOher == false)
{
string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀�";
//鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcSuck);
// _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
}
if (rightPLcOher == false && rightPLcSuck == true)
{
string text = $"杞ㄩ亾{deid}锛氬叾浠栨晠闅滄姤璀�";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcOher);
}
if (rightPLcSuck == true && rightPLcOher == true)//濡傛灉鎶ヨ浜�
{
string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀﹀拰鍏朵粬鏁呴殰鎶ヨ";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);//娣诲姞鏁版嵁
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, rightPLcOher);//娣诲姞鏁版嵁
}
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(new {
device="鍙砅lc",
@@ -132,9 +131,9 @@
catch (Exception)
{
string text = $"杞ㄩ亾{deid}锛氬彸PLC鏈繛鎺�";
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, false);//娣诲姞鏁版嵁
+ //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false);//娣诲姞鏁版嵁
}
- var alrt = _alarmResetHsyServer.GetWebSocketInfo();
+ var alrt = _alarmResetHsyServer.GetWebSocketInfo(deid);
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));
}
--
Gitblit v1.9.3