From dce06906b2757824ad6ecfd02c1ff04ee8e9ad20 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 08 五月 2025 14:19:19 +0800
Subject: [PATCH] 1111
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs | 181 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 171 insertions(+), 10 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 d143926..f7cda63 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"
@@ -11,6 +11,11 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_TelescopicService;
+<<<<<<< Updated upstream:椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
+=======
+using WIDESEAWCS_ISystemServices;
+using WIDESEAWCS_Core.Helper;
+>>>>>>> Stashed changes:project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
namespace WIDESEAWCS_Tasks
{
@@ -28,16 +33,113 @@
_alarmResetHsyServer = alarmResetHsyServer;
}
+ /// <summary>
+ /// 杩欎釜鍒版椂鍊欐牴鎹幇鍦烘儏鍐垫潵閰嶇疆锛岃澶囧彿鍜岀幇鍦烘儏鍐垫潵瀹氥��
+ /// 涓�涓建閬撲咯涓猵lc
+ /// </summary>
+ /// <param name="context"></param>
+ /// <returns></returns>
+ //public Task Execute(IJobExecutionContext context)
+ //{
+ // try
+ // {
+
+ // //鑾峰彇璁惧鍙�
+ // // 鑾峰彇璁惧閰嶇疆
+ // OtherDevice serialPortDevice = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams");
+ // if (serialPortDevice!=null)
+ // {
+ // //棣栧厛瑕佷竴鐩磋锛屽鏋滃彂鐢熶簡鏁呴殰瑕佸啓鍒癬alarmResetHsyServer涓褰曚笅鏉ュ苟涓旂粰鍒板墠绔暟鎹�
+ // //宸lc
+
+ // if (serialPortDevice.DeviceCode == "SSG001")
+ // {
+ // var leftPLcstuck = serialPortDevice.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
+ // var leftPLcOher = serialPortDevice.Communicator.Read<bool>("M105"); //鍏朵粬鎶ヨ //榛樿鏄痜alse
+ // Console.WriteLine($"{serialPortDevice.DeviceName}:鍗′綇鎶ヨ{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.DeviceCode == "SSG002")
+ // {
+ // //鍙硃lc
+ // var rightPLcSuck = serialPortDevice.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
+ // var rightPLcOher = serialPortDevice.Communicator.Read<bool>("M105");//鍏朵粬鎶ヨ
+ // Console.WriteLine($"{serialPortDevice.DeviceName}:鍗′綇鎶ヨ{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)
+ // {
+
+ // Console.WriteLine("閿欒淇℃伅锛�" + ex.Message);
+ // Console.WriteLine(ex.StackTrace);
+ // }
+ // return Task.CompletedTask;
+ //}
+
+
public Task Execute(IJobExecutionContext context)
{
try
{
+<<<<<<< Updated upstream:椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
+=======
+
+>>>>>>> Stashed changes:project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
//鑾峰彇璁惧鍙�
// 鑾峰彇璁惧閰嶇疆
- OtherDevice serialPortDevice = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams");
- if (serialPortDevice!=null)
+ //OtherDevice serialPortDevice = (OtherDevice)context.JobDetail.JobDataMap.Get("JobParams");
+ if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid))
+ {
+ Console.WriteLine("閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�");
+ }
+ var devices = GetDevicesByDeptId(deid);
+ if (devices != null)
{
//棣栧厛瑕佷竴鐩磋锛屽鏋滃彂鐢熶簡鏁呴殰瑕佸啓鍒癬alarmResetHsyServer涓褰曚笅鏉ュ苟涓旂粰鍒板墠绔暟鎹�
+<<<<<<< Updated upstream:椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
if (serialPortDevice.DeviceName=="宸︽眹宸漃LC")
{
//宸lc
@@ -49,18 +151,36 @@
//if (leftPLcOher == false)
{
string text = "浼哥缉鍗′綇鎶ヨ";
- //鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
-
- }
- if (leftPLcOher == true && leftPLcstuck == false)
+=======
+
+ //宸lc
+ var leftPLcstuck1 = devices.Value.left.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
+ var leftPLcOher1 = devices.Value.left.Communicator.Read<bool>("M105"); //鍏朵粬鎶ヨ //榛樿鏄痜alse
+ Console.WriteLine($"{devices.Value.left.DeviceName}:榛樿鏄痜alse锛岀幇鍦ㄥ崱浣忔姤璀﹀�硷細{leftPLcstuck1}锛岀幇鍦ㄥ叾浠栨姤璀﹀�硷細{leftPLcOher1}");
+ if (leftPLcstuck1 == true && leftPLcOher1 == false)
+ //if (leftPLcOher1 == false)
{
+ string text =$"杞ㄩ亾{deid}锛氫几缂╁崱浣忔姤璀�";
+>>>>>>> Stashed changes:project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
+ //鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+
+ }
+ if (leftPLcstuck1 == true && leftPLcOher1 == false)
+ {
+<<<<<<< Updated upstream:椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
string text = "鍏朵粬鏁呴殰鎶ヨ";
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
+=======
+ string text = $"杞ㄩ亾{deid}锛氬叾浠栨晠闅滄姤璀�";
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+
+>>>>>>> Stashed changes:project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
}
- if (leftPLcstuck == true && leftPLcOher == true)//濡傛灉鎶ヨ浜�
+ if (leftPLcstuck1 == true && leftPLcOher1 == true)//濡傛灉鎶ヨ浜�
{
+<<<<<<< Updated upstream:椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ鍜屽叾浠栨晠闅滄姤璀�";
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
@@ -77,26 +197,52 @@
if (rightPLcSuck == true && rightPLcOher == false)
{
string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ";
+=======
+ string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀﹀拰鍏朵粬鏁呴殰鎶ヨ";
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck1);
+ }
+
+ //鍙硃lc
+ var rightPLcSuck = devices.Value.right.Communicator.Read<bool>("M104"); //鍗′綇鎶ヨ
+ var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M105");//鍏朵粬鎶ヨ
+ Console.WriteLine($"{devices.Value.right.DeviceName}::榛樿鏄痜alse锛岀幇鍦ㄥ崱浣忔姤璀﹀�硷細{rightPLcSuck}锛�:鐜板湪鍏朵粬鎶ヨ鍊硷細{rightPLcOher}");
+ if (rightPLcSuck == true && rightPLcOher == false)
+ {
+ string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀�";
+>>>>>>> Stashed changes:project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
//鎶ヨ浜嗗湪杩欒皟鐢ㄦ坊鍔犳柟娉曪紝骞朵紶缁欏墠绔�
- var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
- // _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver杩欑鍙兘浼犵粰鍓嶇json鏍煎紡
+ var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcSuck);
+
}
if (rightPLcOher == true && rightPLcSuck == false)
{
+<<<<<<< Updated upstream:椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
string text = "鍏朵粬鏁呴殰鎶ヨ";
+=======
+ string text = $"杞ㄩ亾{deid}锛氬叾浠栨晠闅滄姤璀�";
+>>>>>>> Stashed changes:project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
}
if (rightPLcSuck == true && rightPLcOher == true)//濡傛灉鎶ヨ浜�
{
+<<<<<<< Updated upstream:椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
string text = "鎶ヨ浼哥缉鍗′綇鎶ヨ鍜屽叾浠栨晠闅滄姤璀�";
+=======
+ string text = $"杞ㄩ亾{deid}锛氭姤璀︿几缂╁崱浣忔姤璀﹀拰鍏朵粬鏁呴殰鎶ヨ";
+>>>>>>> Stashed changes:project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);//娣诲姞鏁版嵁
}
var alrt = _alarmResetHsyServer.GetWebSocketInfo();
_webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(alrt));
+<<<<<<< Updated upstream:椤圭洰浠ｇ爜/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
}
}
+=======
+ }
+
+>>>>>>> Stashed changes:project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
}
catch (Exception ex)
{
@@ -106,5 +252,20 @@
}
return Task.CompletedTask;
}
+ public (OtherDevice left, OtherDevice right)? GetDevicesByDeptId(int deptId)
+ {
+ // 宸﹁澶囧彿锛�1 -> 001锛�2 -> 003锛�3 -> 005...
+ int baseCode = 1 + (deptId - 1) * 2;
+ string leftCode = $"SSG{baseCode.ToString("D3")}";
+ string rightCode = $"SSG{(baseCode + 1).ToString("D3")}";
+
+ var left = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == leftCode);
+ var right = (OtherDevice)Storage.Devices.Find(x => x.DeviceCode == rightCode);
+
+ if (left == null || right == null)
+ return null;
+
+ return (left, right);
+ }
}
}
--
Gitblit v1.9.3