重新编写信号

yanjinhui

昨天 c6f41b547bf479dbe4d722794b308984eb0bfe03

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

@@ -22,15 +22,17 @@
    {
        public IRepository<Dt_Parameters> Repository => BaseDal;
        private readonly IRepository<Sys_User> _user;
        private readonly IRepository<Dt_AlarmResetHsy> _alarm;

        public ParametersService(IRepository<Dt_Parameters> BaseDal, IRepository<Sys_User> user) : base(BaseDal)
        public ParametersService(IRepository<Dt_Parameters> BaseDal, IRepository<Sys_User> user,IRepository<Dt_AlarmResetHsy> alarm) : base(BaseDal)
        {
            _user = user;   
            _user = user;
            _alarm = alarm;
        }


        /// <summary>
        /// è‡ªåŠ¨æŽ§åˆ¶ä¼¸ç¼©æ†çš„伸出和缩回速度（一次性控制所有的）
        /// è‡ªåŠ¨æŽ§åˆ¶è­¦æƒ•æœºæž„的伸出和缩回速度（一次性控制所有的）
        /// </summary>
        /// <param name="ExtendedState">伸/出状态</param>
        /// <returns></returns>
@@ -50,6 +52,11 @@
                            messages.Add($"DeptId={deptId} æœªæ‰¾åˆ°è®¾å¤‡ï¼Œè·³è¿‡");
                            continue;
                        }
                        var alarm = _alarm.QueryData(x => x.ResetStatus == true && x.Deptid == deptId && !x.AlarmContent.Contains("障碍"));  // æŽ’除 AlarmContent åŒ…含 "障碍s" çš„记录.ToList();
                        if (alarm.Count > 0)
                        {
                            return new WebResponseContent { Status = true, Message = "警惕机构报警，请先复位" };
                        }

                        var para = BaseDal.QueryData()
                            .Where(x => x.Deptid == deptId)
@@ -62,13 +69,15 @@
                            continue;
                        }


                        int ext = (int)para.ExtendSpeed;
                        int ret = (int)para.RetractionSpeed;
                        int liftPos = (int)para.LeftPosition;
                        int rightPos = (int)para.RightPosition;

                        
                        try
                        {
                           
                            if (devices.Value.left.Communicator.Read<bool>("M117"))
                            {

@@ -81,6 +90,8 @@
                        }
                        try
                        {
                           

                            if (devices.Value.right.Communicator.Read<bool>("M117"))
                            {
                                return new WebResponseContent { Status = true, Message = "现在正在进行中，等待操作完成" };
@@ -98,7 +109,7 @@
                        {
                        if (devices.Value.left.Communicator.Read<float>("D80")>= liftPos-5)//到达最大位置)
                        {
                                    messages.Add($"轨道站{deptId}左伸缩杆已到最大位置");
                                    messages.Add($"轨道站{deptId}左警惕机构已到最大位置");
                           
                        }
                        else
@@ -115,7 +126,7 @@
                        {
                        if (devices.Value.left.Communicator.Read<float>("D80") >=rightPos-5)
                        {
                                    messages.Add($"轨道站{deptId}右伸缩杆已到最大位置");
                                    messages.Add($"轨道站{deptId}右警惕机构已到最大位置");
                        
                        }
                        else
@@ -135,7 +146,7 @@
                        {
                        if (devices.Value.left.Communicator.Read<bool>("M115")) //到达原点位
                        {
                                    messages.Add($"轨道站{deptId}左伸缩杆已到原点");
                                    messages.Add($"轨道站{deptId}左警惕机构已到原点");
                           
                        }
                        else
@@ -154,7 +165,7 @@
                        {
                        if (devices.Value.right.Communicator.Read<bool>("M115"))
                        {
                                    messages.Add($"轨道站{deptId}右伸缩杆已到原点");
                                    messages.Add($"轨道站{deptId}右警惕机构已到原点");
                          
                        }
                        else
@@ -206,9 +217,9 @@


        /// <summary>
        /// æ‰‹åŠ¨æŽ§åˆ¶ï¼Œä¼¸ç¼©æ†çš„缩回和伸出速度
        /// æ‰‹åŠ¨æŽ§åˆ¶ï¼Œè­¦æƒ•æœºæž„的缩回和伸出速度
        /// </summary>
        /// <param name="position">伸缩杆的位置（左右）</param>
        /// <param name="position">警惕机构的位置（左右）</param>
        /// <param name="ExtendedState">伸/缩状态</param>
        /// <param name="DeptId">股道号</param>
        /// <returns></returns>
@@ -233,8 +244,15 @@
                // canRight = true;
                string message = "";

                var alarm = _alarm.QueryData(x => x.ResetStatus == true && x.Deptid == DeptId && !x.AlarmContent.Contains("障碍"));  // æŽ’除 AlarmContent åŒ…含 "障碍s" çš„记录.ToList();
                if (alarm.Count > 0)
                {
                    return new WebResponseContent { Status = true, Message = "警惕机构报警，请先复位" };
                }

                try
                {
                  
                    if (devices.Value.left.Communicator.Read<bool>("M117")) //默认是flase 
                    {

@@ -247,6 +265,7 @@
                }
                try
                {
                   
                    if (devices.Value.right.Communicator.Read<bool>("M117"))
                    {
                        return new WebResponseContent { Status = true, Message = "现在正在进行中，等待操作完成" };
@@ -260,7 +279,7 @@
                {
                    if (devices.Value.left.Communicator.Read<float>("D80") >= liftPosition - 5) //到达目标位置
                    {
                        message += "左伸缩杆到达目标位置；";
                        message += "左警惕机构到达目标位置；";
                    }
                    else
                    {
@@ -271,7 +290,7 @@
                        devices.Value.left.Communicator.Write<bool>("M100", false); // é‡Šæ”¾æŒ‰é’®


                        Console.WriteLine($"{position}伸缩杆手动伸出{ext}");
                        Console.WriteLine($"{position}警惕机构手动伸出{ext}");
                    }

                }
@@ -288,7 +307,7 @@
                        devices.Value.left.Communicator.Write<bool>("M101", true);
                        Thread.Sleep(100); // ç­‰å¾…100ms（模拟按钮按下）
                        devices.Value.left.Communicator.Write<bool>("M101", false); // é‡Šæ”¾æŒ‰é’®
                        Console.WriteLine($"{position}伸缩杆手动缩回{ext}");
                        Console.WriteLine($"{position}警惕机构手动缩回{ext}");
                    }

                }
@@ -297,7 +316,7 @@
                {
                    if (devices.Value.right.Communicator.Read<float>("D80") >= rigtpostition - 5)
                    {
                        message += "右伸缩杆到达目标位置；";
                        message += "右警惕机构到达目标位置；";
                    }
                    else
                    {
@@ -306,7 +325,7 @@
                        devices.Value.right.Communicator.Write<bool>("M100", true);
                        Thread.Sleep(100); // ç­‰å¾…100ms（模拟按钮按下）
                        devices.Value.right.Communicator.Write<bool>("M100", false); // é‡Šæ”¾æŒ‰é’®
                        Console.WriteLine($"{position}伸缩杆手动伸出{ret}");
                        Console.WriteLine($"{position}警惕机构手动伸出{ret}");
                    }


@@ -315,7 +334,7 @@
                {
                    if (devices.Value.right.Communicator.Read<bool>("M115"))
                    {
                        message += "右伸缩杆已到原点；";
                        message += "右警惕机构已到原点；";
                    }
                    else
                    {
@@ -324,7 +343,7 @@
                        devices.Value.right.Communicator.Write<bool>("M101", true);
                        Thread.Sleep(100); // ç­‰å¾…100ms（模拟按钮按下）
                        devices.Value.right.Communicator.Write<bool>("M101", false); // é‡Šæ”¾æŒ‰é’®
                        Console.WriteLine($"{position}伸缩杆手动缩回{ret}");
                        Console.WriteLine($"{position}警惕机构手动缩回{ret}");
                    }

                }
@@ -394,7 +413,7 @@


        /// <summary>
        /// ä¼¸ç¼©æ†å½“前位置(这个没有用)
        /// è­¦æƒ•æœºæž„当前位置(这个没有用)
        /// <param name="deptid">轨道站号</param>
        public WebResponseContent CurrentLocation(int deptid)
        {
@@ -405,7 +424,7 @@
                    return new WebResponseContent { Status = false, Message = "设备未找到" };
                var deviceslift = devices.Value.left.Communicator.Read<float>("D80");
                var devicesright = devices.Value.right.Communicator.Read<float>("D80");
                Console.WriteLine($"当前左右伸缩杆返回速度分别为为{deviceslift}");
                Console.WriteLine($"当前左右警惕机构返回速度分别为为{deviceslift}");
                return new WebResponseContent
                {
                    Status = true,