From b9c76ce85e533250cd36de670146530f970859e7 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 01 八月 2025 11:29:49 +0800
Subject: [PATCH] 修改伸缩杆接口
---
项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
index 5a33a27..486d13f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs"
@@ -34,38 +34,54 @@
_UserService = UserService;
}
+ // 澧炴坊鐨勫瓧鍏歌窡韪姤璀︿负姣忎釜瑁呯疆 Quartz 榛樿姣忔璋冨害浠诲姟鏃朵細閲嶆柊鍒涘缓
+ private static readonly Dictionary<string, bool> _leftAlarmStates = new Dictionary<string, bool>() //鍔犻攣
+ {
+ ["M109"] = false,//浼烘湇鎶ヨ
+ ["M111"] = false,//鍏朵粬鎶ヨ
+ ["M110"] = false,//鎬ュ仠鎶ヨ
+ ["M120"] = false,//闅滅鎶ヨ
+ };
+ private static readonly Dictionary<string, bool> _rightAlarmStates = new Dictionary<string, bool>()
+ {
+ ["M109"] = false,//浼烘湇鎶ヨ
+ ["M111"] = false,//鍏朵粬鎶ヨ
+ ["M110"] = false,//鎬ュ仠鎶ヨ
+ ["M120"] = false,//闅滅鎶ヨ
+ };
+
public Task Execute(IJobExecutionContext context)
{
- //try
- //{
+ try
+ {
- // //鑾峰彇璁惧鍙�
- // // 鑾峰彇鍏ㄩ儴璁惧閰嶇疆
- // OtherDevice serialPortDevice = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams");
+ //鑾峰彇璁惧鍙�
+ // 鑾峰彇鍏ㄩ儴璁惧閰嶇疆
+ //OtherDevice serialPortDevice = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams");
- // if (serialPortDevice!=null)
- // {
- // HandleAlarm(serialPortDevice);
- // }
-
+ //if (serialPortDevice != null)
+ //{
+ // HandleAlarm(serialPortDevice);
+ //}
- // var alarmInfo = _alarmResetHsyServer.GetWebSocketInfo();
- // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alarmInfo));
+ //鍙
+ var alarmInfo = _alarmResetHsyServer.GetWebSocketInfo();
+ _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alarmInfo));
- //}
- //catch (Exception ex)
- //{
+ }
+ catch (Exception ex)
+ {
- // Console.WriteLine("閿欒淇℃伅锛�" + ex.Message);
- // Console.WriteLine(ex.StackTrace);
- //}
+ Console.WriteLine("閿欒淇℃伅锛�" + ex.Message);
+ Console.WriteLine(ex.StackTrace);
+ }
return Task.CompletedTask;
}
private void HandleAlarm(OtherDevice device)
{
try
{
- var stuck = device.Communicator.Read<bool>("M109"); //浼哥缉鏉嗘姤璀�//榛樿鏄痜alse
+ var stuck = device.Communicator.Read<bool>("M109"); //浼哥缉鏉嗕己鏈嶆姤璀�//榛樿鏄痜alse
var other = device.Communicator.Read<bool>("M111"); //鍏朵粬鎶ヨ //榛樿鏄痜alse
var scram = device.Communicator.Read<bool>("M110");//鎬ュ仠鎶ヨ//榛樿鏄痜alse
var stop = device.Communicator.Read<bool>("M120");//閬囧埌闅滅鍋滄鎶ヨ
@@ -95,22 +111,19 @@
return;
}
- if (stuck && !other)
+ if (stuck && !_leftAlarmStates["M109"])
{
- var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}:浼哥缉鏉嗕己鏈嶆姤璀�", stuck);
- Console.WriteLine($"{location}:浼哥缉鏉嗕己鏈嶆姤璀�", stuck);
+ var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}:鍗′綇鎶ヨ", stuck);
+ Console.WriteLine($"{location}:鍗′綇鎶ヨ", stuck);
}
- if (!stuck && other)
+
+ if (other)
{
var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}锛氬叾浠栨姤璀�", other);
Console.WriteLine($"{location}锛氬叾浠栨姤璀�", other);
}
- if (stuck && other)
- {
- var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}锛氫几缂╂潌浼烘湇鎶ヨ鍜屽叾浠栨姤璀�", other);
- Console.WriteLine($"{location}锛氫几缂╂潌浼烘湇鎶ヨ鍜屽叾浠栨姤璀�", other);
- }
- if (scram&& !stuck && !other)
+
+ if (scram)
{
var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}:鎬ュ仠鎶ヨ", scram);
}
--
Gitblit v1.9.3