解决冲突

qiuyao

2025-04-28 1dcc7b63a20daad7c7060f18878d8e8dbaad02de

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs

@@ -17,12 +17,14 @@
    [DisallowConcurrentExecution]
    public class AlarmResetJob : JobBase, IJob
    {
        private WebSocketServer _webSocketContext;
        private readonly AlarmResetHsyServer _alarmResetHsyServer;

        private readonly IAlarmResetHsyServer _alarmResetHsyServer;
        WebSocketServer _webSocketServer;
        
        public AlarmResetJob(WebSocketServer webSocketServer, AlarmResetHsyServer alarmResetHsyServer)
        
        public AlarmResetJob(WebSocketServer webSocketServer, IAlarmResetHsyServer alarmResetHsyServer)
        {
            _webSocketContext = webSocketServer;
            _webSocketServer = webSocketServer;
            _alarmResetHsyServer = alarmResetHsyServer;
        }

@@ -39,64 +41,61 @@
                    if (serialPortDevice.DeviceName=="左汇川PLC")
                    {
                        //å·¦plc
                        //var leftPLcstuck = serialPortDevice.Communicator.Read<bool>("M104"); //卡住报警
                        //var leftPLcOher = serialPortDevice.Communicator.Read<bool>("M105");  //其他报警 //默认是false
                        //Console.WriteLine($"å·¦PLC:卡住报警{leftPLcstuck}，其他报警{leftPLcOher}");
                        
                        //    if (leftPLcstuck == true&&leftPLcOher==false)
                        //    {
                        //        string  text = "报警伸缩卡住报警";
                        //    //报警了在这调用添加方法，并传给前端
                        //    var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
                        //    _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver这种只能传给前端json格式
                        //     }
                        //    if (leftPLcOher == true&&leftPLcstuck==false) {
                        //        string text = "其他故障报警";
                        //        _alarmResetHsyServer.AddAlarmHsy(text, leftPLcOher);
                        //    var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
                        //    _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver这种只能传给前端json格式
                        //     }
                        //    if (leftPLcstuck == true && leftPLcOher == true)//如果报警了
                        //    {
                        //         string text = "报警伸缩卡住报警和其他故障报警";
                        //         _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
                        //    var reslut = _alarmResetHsyServer.AddAlarmHsy(text, leftPLcstuck);
                        //    _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver这种只能传给前端json格式
                        var leftPLcstuck = serialPortDevice.Communicator.Read<bool>("M104"); //卡住报警
                        var leftPLcOher = serialPortDevice.Communicator.Read<bool>("M105");  //其他报警 //默认是false
                        Console.WriteLine($"å·¦PLC:卡住报警{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.DeviceName == "右汇川PLC")
                    {
                        //右plc
                        //var rightPLcSuck = serialPortDevice.Communicator.Read<bool>("M104"); //卡住报警
                        //var rightPLcOher = serialPortDevice.Communicator.Read<bool>("M105");//其他报警
                        //Console.WriteLine($"右PLC:卡住报警{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 = "其他故障报警";
                        //    _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
                        //    var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
                        //    _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver这种只能传给前端json格式
                        //}
                        //if (rightPLcSuck == true && rightPLcOher == true)//如果报警了
                        //{
                        //    string text = "报警伸缩卡住报警和其他故障报警";
                        //    _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
                        //    var reslut = _alarmResetHsyServer.AddAlarmHsy(text, rightPLcOher);
                        //    _webSocketServer.PublishAllClientPayload(JsonConvert.SerializeObject(reslut));//websocketserver这种只能传给前端json格式
                        var rightPLcSuck = serialPortDevice.Communicator.Read<bool>("M104"); //卡住报警
                        var rightPLcOher = serialPortDevice.Communicator.Read<bool>("M105");//其他报警
                        Console.WriteLine($"右PLC:卡住报警{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)