更新伸缩杆的自动和手动接口的提示修改和完善

yanjinhui

2025-06-07 70900e697720bfe657bbf28067caeeb03bfdbf8f

 project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs

@@ -64,24 +64,23 @@
                            var leftPLcNowAdd = devices.Value.left.Communicator.Read<float>("D80");
                            Console.WriteLine($"{devices.Value.left.DeviceName}:卡住报警{leftPLcstuck1}，其他报警{leftPLcOher1}");
                            if (leftPLcstuck1 == true && leftPLcOher1 == false)
                            //if (leftPLcOher == false)
                            {
                                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 +92,7 @@
                    catch (Exception)
                    {
                        string text = $"轨道{deid}：左PLC未连接";
                        var reslut = _alarmResetHsyServer.AddAlarmHsy(text, false);//添加数据
                        //var reslut = _alarmResetHsyServer.AddAlarmHsy(deid, text, false);//添加数据
                    }
                    
                    try
@@ -102,25 +101,25 @@
                        {
                            //右plc
                            var rightPLcSuck = devices.Value.right.Communicator.Read<bool>("M109"); //卡住报警
                            var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M110");//其他报警
                            var rightPLcOher = devices.Value.right.Communicator.Read<bool>("M111");//其他报警
                            var rightPLcNowAdd = devices.Value.right.Communicator.Read<float>("D80");
                            Console.WriteLine($"{devices.Value.right.DeviceName}:卡住报警{rightPLcSuck}，其他报警{rightPLcOher}");
                            if (rightPLcSuck == true && rightPLcOher == false)
                            {
                                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 +131,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));
                    
                }