yanjinhui
2025-06-02 4b4cc0dd66d0bfb8220709f6a5edd5fc3b8a65c2
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs
@@ -68,20 +68,20 @@
                            {
                                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 +93,7 @@
                    catch (Exception)
                    {
                        string text = $"轨道{deid}:左PLC未连接";
                        var reslut = _alarmResetHsyServer.AddAlarmHsy(text, false);//添加数据
                        //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false);//添加数据
                    }
                    
                    try
@@ -109,18 +109,18 @@
                            {
                                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="右Plc",
@@ -132,9 +132,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));
                    
                }