From 1dcc7b63a20daad7c7060f18878d8e8dbaad02de Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 28 四月 2025 16:41:31 +0800
Subject: [PATCH] 解决冲突
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 111 +++++++++++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 56 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
index 56ae66b..d143926 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
@@ -17,12 +17,14 @@
[DisallowConcurrentExecution]
public class AlarmResetJob : JobBase, IJob
{
- private WebSocketServer _webSocketContext;
- private readonly AlarmResetHsyServer _alarmResetHsyServer;
+
+ private readonly IAlarmResetHsyServer _alarmResetHsyServer;
+ WebSocketServer _webSocketServer;
- public AlarmResetJob(WebSocketServer webSocketServer, AlarmResetHsyServer alarmResetHsyServer)
+
+ public AlarmResetJob(WebSocketServer webSocketServer, IAlarmResetHsyServer alarmResetHsyServer)
{
- _webSocketContext = webSocketServer;
+ _webSocketServer = webSocketServer;
_alarmResetHsyServer = alarmResetHsyServer;
}
@@ -39,64 +41,61 @@
if (serialPortDevice.DeviceName=="宸︽眹宸漃LC")
{
//宸lc
- //var leftPLcstuck = serialPortDevice.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
- //var leftPLcOher = serialPortDevice.Communicator.Read<bool>("M105"); //鍏朵粬鎶ヨ //榛樿鏄痜alse
- //Console.WriteLine($"宸LC:鍗′綇鎶ヨ{leftPLcstuck}锛屽叾浠栨姤璀leftPLcOher}");
-
- // if (leftPLcstuck == true&&leftPLcOher==false)
- // {
- // string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ";
- // //鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
- // var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
- // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
- // }
- // if (leftPLcOher == true&&leftPLcstuck==false) {
- // string text = "鍏朵粬鏁呴殰鎶ヨ";
- // _alarmResetHsyServer.AddAlarmHsy(text, leftPLcOher);
- // var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
- // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
- // }
- // if (leftPLcstuck == true && leftPLcOher == true)//濡傛灉鎶ヨ浜�
- // {
- // string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ鍜屽叾浠栨晠闅滄姤璀�";
- // _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
- // var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
- // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
+ var leftPLcstuck = serialPortDevice.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
+ var leftPLcOher = serialPortDevice.Communicator.Read<bool>("M105"); //鍏朵粬鎶ヨ //榛樿鏄痜alse
+ Console.WriteLine($"宸LC:鍗′綇鎶ヨ{leftPLcstuck}锛屽叾浠栨姤璀leftPLcOher}");
- //}
+ if(leftPLcstuck == true && leftPLcOher == false)
+ //if (leftPLcOher == false)
+ {
+ string text = "浼哥缉鍗′綇鎶ヨ";
+ //鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
+
+ }
+ if (leftPLcOher == true && leftPLcstuck == false)
+ {
+ string text = "鍏朵粬鏁呴殰鎶ヨ";
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
+
+ }
+ if (leftPLcstuck == true && leftPLcOher == true)//濡傛灉鎶ヨ浜�
+ {
+ string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ鍜屽叾浠栨晠闅滄姤璀�";
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
+
+ }
+ var alrt = _alarmResetHsyServer.GetWebSocketInfo();
+ _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
}
else if (serialPortDevice.DeviceName == "鍙虫眹宸漃LC")
{
//鍙硃lc
- //var rightPLcSuck = serialPortDevice.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
- //var rightPLcOher = serialPortDevice.Communicator.Read<bool>("M105");//鍏朵粬鎶ヨ
- //Console.WriteLine($"鍙砅LC:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}");
- //if (rightPLcSuck == true&& rightPLcOher==false)
- //{
- // string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ";
- // //鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
- // var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
- // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
- //}
- //if (rightPLcOher == true&& rightPLcSuck==false)
- //{
- // string text = "鍏朵粬鏁呴殰鎶ヨ";
- // _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
- // var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
- // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
- //}
- //if (rightPLcSuck == true && rightPLcOher == true)//濡傛灉鎶ヨ浜�
- //{
- // string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ鍜屽叾浠栨晠闅滄姤璀�";
- // _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
- // var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
- // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
+ var rightPLcSuck = serialPortDevice.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
+ var rightPLcOher = serialPortDevice.Communicator.Read<bool>("M105");//鍏朵粬鎶ヨ
+ Console.WriteLine($"鍙砅LC:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}");
+ if (rightPLcSuck == true && rightPLcOher == false)
+ {
+ string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ";
+ //鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
+ // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
+ }
+ if (rightPLcOher == true && rightPLcSuck == false)
+ {
+ string text = "鍏朵粬鏁呴殰鎶ヨ";
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
+ }
+ if (rightPLcSuck == true && rightPLcOher == true)//濡傛灉鎶ヨ浜�
+ {
+ string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ鍜屽叾浠栨晠闅滄姤璀�";
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);//娣诲姞鏁版嵁
+
- //}
- }
-
-
-
+ }
+ var alrt = _alarmResetHsyServer.GetWebSocketInfo();
+ _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));
+ }
}
}
catch (Exception ex)
--
Gitblit v1.9.3