重新编写信号

yanjinhui

昨天 c6f41b547bf479dbe4d722794b308984eb0bfe03

 ÏîÄ¿´úÂë/ºó¶Ë/ºǫ́¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SSG/AlarmResetJob.cs

@@ -36,29 +36,29 @@

        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)
@@ -67,14 +67,16 @@
            {
                var stuck = device.Communicator.Read<bool>("M109"); //伸缩杆报警//默认是false
                var other = device.Communicator.Read<bool>("M111"); //其他报警 //默认是false
                var scram = device.Communicator.Read<bool>("M110");//急停报警//默认是false
                var stop = device.Communicator.Read<bool>("M120");//遇到障碍停止报警

                Console.WriteLine($"{device.DeviceName}:卡住报警的默认值为{stuck}，其他报警的默认值为{other}");

                // æ ¹æ®è®¾å¤‡ä»£ç èŽ·å–位置和部门ID
                var (location, deptId) = device.DeviceCode switch
                {
                    "SSG001" => ("轨道一-å·¦", 1),
                    "SSG002" => ("轨道一-右", 1),
                    "SSG001" => ("检8道左侧警惕机构", 1),
                    "SSG002" => ("检8道右侧警惕机构", 1),
                    "SSG003" => ("轨道二-å·¦", 2),
                    "SSG004" => ("轨道二-右", 2),
                    "SSG005" => ("轨道三-å·¦", 3),
@@ -82,7 +84,7 @@
                    "SSG007" => ("轨道四-å·¦", 4),
                    "SSG008" => ("轨道四-右", 4),
                    "SSG009" => ("轨道五-å·¦", 5),
                    "SSG0010" => ("轨道五-右", 5),
                    "SSG0010" => ("轨道五-右",5),
                    _ => ($"未知设备({device.DeviceCode})", 0) // æœªçŸ¥è®¾å¤‡é»˜è®¤éƒ¨é—¨ID为0
                };

@@ -95,18 +97,26 @@

                if (stuck && !other)
                {
                    var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}:伸缩杆卡住报警", stuck);
                    Console.WriteLine($"{location}:伸缩杆卡住报警", stuck);
                    var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}:伸缩杆伺服报警", stuck);
                    Console.WriteLine($"{location}:伸缩杆伺服报警", stuck);
                }
                else if (!stuck && other)
                if (!stuck && other)
                {
                    var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}：其他报警", other);
                    Console.WriteLine($"{location}：其他报警", other);
                }
                else if (stuck && other)
                if (stuck && other)
                {
                    var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}：伸缩杆卡住报警和其他报警", other);
                    Console.WriteLine($"{location}：伸缩杆卡住报警和其他报警", other);
                    var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}：伸缩杆伺服报警和其他报警", other);
                    Console.WriteLine($"{location}：伸缩杆伺服报警和其他报警", other);
                }
                 if (scram&& !stuck && !other)
                {
                    var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, $"{location}:急停报警", scram);
                }
                if (stop)
                {
                    var alarm = _alarmResetHsyServer.AddAlarmHsy(deptId, "{location}:遇到障碍报警", stop);
                }
            }
            catch (Exception ex)