From 752223f279965b562e3d086b78f01efb55925ae4 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 30 四月 2025 16:32:23 +0800
Subject: [PATCH] 11
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 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/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
similarity index 75%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
rename to project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
index d143926..8aec54b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
@@ -7,10 +7,13 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Core.HttpContextUser;
+using WIDESEAWCS_Core;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_TelescopicService;
+using WIDESEAWCS_ISystemServices;
namespace WIDESEAWCS_Tasks
{
@@ -19,83 +22,87 @@
{
private readonly IAlarmResetHsyServer _alarmResetHsyServer;
+ private readonly ISys_UserService _UserService;
WebSocketServer _webSocketServer;
- public AlarmResetJob(WebSocketServer webSocketServer, IAlarmResetHsyServer alarmResetHsyServer)
+
+ public AlarmResetJob(WebSocketServer webSocketServer, IAlarmResetHsyServer alarmResetHsyServer, ISys_UserService UserService)
{
_webSocketServer = webSocketServer;
_alarmResetHsyServer = alarmResetHsyServer;
+ _UserService = UserService;
}
public Task Execute(IJobExecutionContext context)
{
try
{
+
//鑾峰彇璁惧鍙�
// 鑾峰彇璁惧閰嶇疆
OtherDevice serialPortDevice = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams");
if (serialPortDevice!=null)
{
//棣栧厛瑕佷竴鐩磋锛屽鏋滃彂鐢熶簡鏁呴殰瑕佸啓鍒癬alarmResetHsyServer涓褰曚笅鏉ュ苟涓旂粰鍒板墠绔暟鎹�
- if (serialPortDevice.DeviceName=="宸︽眹宸漃LC")
+ //宸lc
+
+ if (serialPortDevice.DeviceCode == "SSG001")
{
- //宸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)
+ Console.WriteLine($"{serialPortDevice.DeviceName}:鍗′綇鎶ヨ{leftPLcstuck}锛屽叾浠栨姤璀leftPLcOher}");
+ if (leftPLcstuck == true && leftPLcOher == false)
//if (leftPLcOher == false)
{
- string text = "浼哥缉鍗′綇鎶ヨ";
+ string text = "杞ㄩ亾涓�锛氫几缂╁崱浣忔姤璀�";
//鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
}
if (leftPLcOher == true && leftPLcstuck == false)
{
- string text = "鍏朵粬鏁呴殰鎶ヨ";
+ string text = "杞ㄩ亾涓�锛氬叾浠栨晠闅滄姤璀�";
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
}
if (leftPLcstuck == true && leftPLcOher == true)//濡傛灉鎶ヨ浜�
{
- string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ鍜屽叾浠栨晠闅滄姤璀�";
+ string text = "杞ㄩ亾涓�锛氭姤璀︿几缂╁崱浣忔姤璀﹀拰鍏朵粬鏁呴殰鎶ヨ";
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
}
+
var alrt = _alarmResetHsyServer.GetWebSocketInfo();
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
}
- else if (serialPortDevice.DeviceName == "鍙虫眹宸漃LC")
+ else if (serialPortDevice.DeviceCode == "SSG002")
{
//鍙硃lc
var rightPLcSuck = serialPortDevice.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
var rightPLcOher = serialPortDevice.Communicator.Read<bool>("M105");//鍏朵粬鎶ヨ
- Console.WriteLine($"鍙砅LC:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}");
+ Console.WriteLine($"{serialPortDevice.DeviceName}:鍗′綇鎶ヨ{rightPLcSuck}锛屽叾浠栨姤璀rightPLcOher}");
if (rightPLcSuck == true && rightPLcOher == false)
{
- string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ";
+ string text = "杞ㄩ亾涓�锛氭姤璀︿几缂╁崱浣忔姤璀�";
//鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
// _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
}
if (rightPLcOher == true && rightPLcSuck == false)
{
- string text = "鍏朵粬鏁呴殰鎶ヨ";
+ string text = "杞ㄩ亾涓�锛氬叾浠栨晠闅滄姤璀�";
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
}
if (rightPLcSuck == true && rightPLcOher == true)//濡傛灉鎶ヨ浜�
{
- string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ鍜屽叾浠栨晠闅滄姤璀�";
+ string text = "杞ㄩ亾涓�锛氭姤璀︿几缂╁崱浣忔姤璀﹀拰鍏朵粬鏁呴殰鎶ヨ";
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);//娣诲姞鏁版嵁
-
-
}
var alrt = _alarmResetHsyServer.GetWebSocketInfo();
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));
- }
+ }
+
}
}
catch (Exception ex)
--
Gitblit v1.9.3