重新编写信号

yanjinhui

昨天 c6f41b547bf479dbe4d722794b308984eb0bfe03

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs

@@ -5,6 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using AutoMapper;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using WIDESEAWCS_Core;
@@ -24,15 +25,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>
@@ -49,6 +52,9 @@
                };
                var devices = GetDevicesByDeptId(deid);

            
              

                //找到Dt_Parameters中的最新一条数据
                var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
                if (para == null)
@@ -60,8 +66,16 @@
                int rigtpostition = (int)para.RightPosition;//右伸出位置
                string message = "";

                var alarm = _alarm.QueryData(x => x.ResetStatus == true && x.Deptid == deid && !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"))
                    {
                        
@@ -74,6 +88,8 @@
                }
                try
                {
                  

                    if (devices.Value.right.Communicator.Read<bool>("M117"))
                    {
                        return new WebResponseContent { Status = true, Message = "现在正在进行中，等待操作完成" };
@@ -91,7 +107,7 @@
                        {
                        if (devices.Value.left.Communicator.Read<float>("D80")>= liftPosition-5)//到达最大位置)
                        {
                            message += "左伸缩杆到达目标位置；";
                            message += "左警惕机构到达目标位置；";
                        }
                        else
                        {
@@ -107,7 +123,7 @@
                        {
                        if (devices.Value.right.Communicator.Read<float>("D80") >= rigtpostition-5)
                        {
                            message += "右伸缩杆到达目标位置；";
                            message += "右警惕机构到达目标位置；";
                        }
                        else
                        {
@@ -126,7 +142,7 @@
                        {
                        if (devices.Value.left.Communicator.Read<bool>("M115")) //到达原点位
                        {
                            message += "左伸缩杆已到原点；";
                            message += "左警惕机构已到原点；";
                        }
                        else
                        {
@@ -144,7 +160,7 @@
                        {
                        if (devices.Value.right.Communicator.Read<bool>("M115"))
                        {
                            message += "右伸缩杆已到原点；";
                            message += "右警惕机构已到原点；";
                        }
                        else
                        {
@@ -184,9 +200,9 @@


        /// <summary>
        /// æ‰‹åŠ¨æŽ§åˆ¶ï¼Œä¼¸ç¼©æ†çš„缩回和伸出速度
        /// æ‰‹åŠ¨æŽ§åˆ¶ï¼Œè­¦æƒ•æœºæž„的缩回和伸出速度
        /// </summary>
        /// <param name="position">伸缩杆的位置（左右）</param>
        /// <param name="position">警惕机构的位置（左右）</param>
        /// <param name="ExtendedState">伸/缩状态</param>
        /// <returns></returns>
        /// 
@@ -196,7 +212,7 @@
            {
                if (!int.TryParse(AppSettings.Get("DepartmentID"), out int deid))
                {
                    return new WebResponseContent { Status = false, Message = "配置项 DepartmentID æ— æ³•è½¬æ¢ä¸ºæ•´æ•°" };
                    return new WebResponseContent { Status = true, Message = "配置项 DepartmentID æ— æ³•è½¬æ¢ä¸ºæ•´æ•°" };
                }
                var devices = GetDevicesByDeptId(deid);

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

                try
                {
                   
                    //var alarmSignals = new[] { "M109", "M111", "M110", "M120" };
                    //if (alarmSignals.Any(signal => devices.Value.left.Communicator.Read<bool>(signal)))
                    //{
                    //    return new WebResponseContent { Status = true, Message = "警惕机构报警，请先复位" };
                    //}
                    if (devices.Value.left.Communicator.Read<bool>("M117")) //默认是flase 
                    {

@@ -228,6 +255,8 @@
                }
                try
                {
                   

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

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

                }
@@ -260,16 +289,16 @@
                {
                    if (devices.Value.left.Communicator.Read<bool>("M115"))//缩回的时候判断) 
                    {
                        message += "左伸缩杆已到原点；";
                        message += "左警惕机构已到原点；";
                    }
                    else
                    {
                        //devices.Value.left.Communicator.Write<int>("D1004", liftPosition);//伸出位置
                        devices.Value.left.Communicator.Write<int>("D1004", liftPosition);//伸出位置
                        devices.Value.left.Communicator.Write<int>("D1000", ext);//å·¦PLC手动伸出缩回速度
                        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}");
                    }

                }
@@ -278,7 +307,7 @@
                {
                    if (devices.Value.right.Communicator.Read<float>("D80") >= rigtpostition - 5)
                    {
                        message += "右伸缩杆到达目标位置；";
                        message += "右警惕机构到达目标位置；";
                    }
                    else
                    {
@@ -287,7 +316,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}");
                    }


@@ -296,16 +325,16 @@
                {
                    if (devices.Value.right.Communicator.Read<bool>("M115"))
                    {
                        message += "右伸缩杆已到原点；";
                        message += "右警惕机构已到原点；";
                    }
                    else
                    {
                        //devices.Value.right.Communicator.Write<int>("D1004", rigtpostition);//伸出位置
                        devices.Value.right.Communicator.Write<int>("D1004", rigtpostition);//伸出位置
                        devices.Value.right.Communicator.Write<int>("D1000", ret);//右PLC手动伸出缩回速度
                        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}");
                    }

                }
@@ -443,7 +472,7 @@


        /// <summary>
        /// èŽ·å–当前程序最新的伸缩杆速度
        /// èŽ·å–当前程序最新的警惕机构速度
        /// </summary>
        /// <returns></returns>
        public WebResponseContent BackfillSpeed()
@@ -470,7 +499,7 @@
        }

        /// <summary>
        /// èŽ·å–当前伸缩杆的位置(自动)
        /// èŽ·å–当前警惕机构的位置(自动)
        /// </summary>
        /// <param name="ExtendedState"></param>
        /// <returns></returns>
@@ -488,7 +517,7 @@
            
                    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