重新编写信号

yanjinhui

昨天 c6f41b547bf479dbe4d722794b308984eb0bfe03

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

@@ -84,7 +84,7 @@
        /// <returns></returns>
        public WebResponseContent BecomeTrue()
        {
            var query = BaseDal.QueryData(x => x.ResetStatus == true).ToList();
            var query = BaseDal.QueryData(x => x.ResetStatus == true&&x.AlarmContent.Contains("障碍")).ToList();
            // å¦‚果没有找到符合条件的数据
            if (query.Count == 0)
            {
@@ -102,15 +102,30 @@
                    try
                    {
                        devices.Value.left.Communicator.Write<bool>("M105", true);
                        var left = devices.Value.left.Communicator.Write<bool>("M105", true); //重启报警复位
                                                                                              // ç­‰å¾…3秒
                        Thread.Sleep(1000);
                        if (devices.Value.left.Communicator.Read<bool>("M109") || devices.Value.left.Communicator.Read<bool>("M111") || devices.Value.left.Communicator.Read<bool>("M110"))
                        {
                            devices.Value.left.Communicator.Write<bool>("M105", true); //重启报警复位
                            return WebResponseContent.Instance.Error("复位失败，请重新检查后重新复位（如：急停按钮是否松开）");
                        }
                    }

                    catch (Exception)
                    {

                       

                    }
                    try
                    {
                        devices.Value.right.Communicator.Write<bool>("M105", true);
                        Thread.Sleep(1000);
                        if (devices.Value.right.Communicator.Read<bool>("M109") || devices.Value.right.Communicator.Read<bool>("M111") || devices.Value.right.Communicator.Read<bool>("M110"))
                        {
                            devices.Value.right.Communicator.Write<bool>("M105", true);
                            return WebResponseContent.Instance.Error("复位失败，请重新检查后重新复位（如：急停按钮是否松开）");
                        }
                    }
                    catch (Exception)
                    {