更新了串口通信，现在已经满足要求

yanjinhui

2025-03-25 308e1a141a5d89fd9d2f97cb0d7bcb258188ef02

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs

@@ -84,69 +84,12 @@
                            DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandType) && x.ProtocolDetailType == nameof(CommandType.Set));
                            if (deviceProtocolDetail != null)
                            {
                                # region  Setvalue
                                string group = item.DeviceProDataBlock;
                                if (group == "电气")
                                
                                if (group == "电气" || group == "地沟" || group == "机械")
                                {
                                    //获取当前任务号  //IPutakeServer里面的待执行的第一条任务；
                                    var take = _putakeRepository.QueryData(x => x.Grouptype == group)
                                        .OrderBy(x=>x.Dispatchtime)
                                        .FirstOrDefault();
                                    var takeid = take?.Njtakeid;//拿到任务号
                                
                                    //调用Getcircuit拿到当前步骤
                                    var process = _processServer.Getcircuit(group,takeid);

                                    if (process != null && process.Status)
                                    {
                                        var list = JsonConvert.SerializeObject(process.Data);
                                        var data = JsonConvert.DeserializeObject<ProcessData>(list);

                                        if (data?.proNow != null)
                                        {
                                            
                                            int setpNum = data.proNow.SetpNum;
                                            int sum = data.proNow.TorqueSum;
                                            double torqueone = data.proNow.TorqueOne;
                                            int onequantity = data.proNow.TorqueOneQuantity;
                                            int towquantity = data.proNow.TorqueTwoQuantity;
                                            double torquetwo = data.proNow.TorqueTwo;

                                            //判断op表中这个值是否有该条任务的数据
                                            var op = _orqueOpRepository.QueryData(x => x.TakeId == takeid && x.GroupOp == group&&x.ProcessSte== setpNum);
                                            if (op.Any())//判断是否有数据
                                            {
                                                //找到了就要对比现在op表中有多少条，是否和工艺表中的目标一致
                                               var oponecount=op.Count(x=>x.TorqueSize== torqueone);//第一个扭的数量
                                                var optowcount = op.Count(x => x.TorqueSize == torquetwo);//第二个扭的数量
                                                sum=oponecount+optowcount;
                                                //第一种，第一个扭力值没有扭完
                                                if (oponecount< onequantity&& torqueone!=0)
                                                {
                                                    //设值
                                                    //var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
                                                    //        .Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r";
                                                    var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
                                                              .Replace("[setNum]", Math.Round(torqueone * 1000).ToString().PadLeft(7, '0')) + "\r";
                                                    //格式化成整数

                                                    serialPortDevice.Communicator.Write(com);
                                                    WriteDebug("写入", com);
                                    ProcessElectricTask(group, serialPortDevice, item, deviceProtocolDetail);
                                                }
                                                //第二种，第一个值扭完了，第二个没有扭完
                                                if (oponecount==onequantity&& optowcount < towquantity&& torquetwo!=0)
                                                {
                                                    //设值
                                                    var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
                                                            .Replace("[setNum]", Math.Round(torquetwo * 1000).ToString().PadLeft(7, '0')) + "\r";
                                                    serialPortDevice.Communicator.Write(com);
                                                }
                                            }

                                        }
                                    }
                                }
                                #endregion
                                item.DeviceProParamName = CommandType.None.ToString();
                            }
                        }
@@ -189,49 +132,14 @@
                                        //把这条数据插入op表中
                                        string group = item.DeviceProDataBlock; // è®¾å¤‡æ‰€å±žç»„别
                                        string devicecode = item.DeviceChildCode;//设备编号
                                        string torqueValue = ExtractTorqueValue(receiveData);
                                        string torqueValue = ExtractTorqueValue(receiveData);//调用转值方法

                                        if (group == "电气")

                                      
                                       
                                        if (group == "电气" || group == "地沟" || group == "机械")
                                        {
                                            #region
                                            var take = _putakeRepository.QueryData(x => x.Grouptype == group)
                                                                .OrderBy(x => x.Dispatchtime)
                                                                .FirstOrDefault();
                                            var takeid = take?.Njtakeid;//拿到任务号

                                            //调用Getcircuit拿到当前步骤
                                            var process = _processServer.Getcircuit(group, takeid);

                                            if (process != null && process.Status)
                                            {
                                                var list = JsonConvert.SerializeObject(process.Data);
                                                var dataz = JsonConvert.DeserializeObject<ProcessData>(list);

                                                if (dataz?.proNow != null)
                                                {

                                                    int setpNum = dataz.proNow.SetpNum;
                                                    int sum = dataz.proNow.TorqueSum;
                                                    double torqueone = dataz.proNow.TorqueOne;
                                                    int onequantity = dataz.proNow.TorqueOneQuantity;
                                                    int towquantity = dataz.proNow.TorqueTwoQuantity;
                                                    double torquetwo = dataz.proNow.TorqueTwo;
                                                    Dt_TorqueOp Addop = new Dt_TorqueOp()
                                                    {
                                                        DeviceCode = devicecode,
                                                        TakeId = takeid,
                                                        GroupOp = group,
                                                        ProcessSte = setpNum,
                                                        TorqueSize = float.TryParse(torqueValue, out float torque) ? torque : 0.0f, // è¿™é‡Œè¿›è¡Œå­—符串到float的转换
                                                        CreateDate = DateTime.Now,

                                                    };
                                                }
                                            }


                                            #endregion

                                            SaveTorqueOpData(group, devicecode, torqueValue);
                                            item.DeviceProParamName = CommandType.None.ToString();
                                        }
                                      
@@ -270,11 +178,183 @@
        /// <returns></returns>
        private string ExtractTorqueValue(string data)
        {
            Match match = Regex.Match(data, @"\b0*(\d{1,4})000\b");
            return match.Success ? (double.Parse(match.Groups[1].Value) / 10.0).ToString("0.0") : "0.0";
            string[] parts = data.Split(','); // æŒ‰é€—号分割数据
            if (parts.Length > 1) // ç¡®ä¿è‡³å°‘有两个部分
            {
                //返回的是一个类似于82407024103,+0005433,0004500,1702485619
                string targetValue = parts[1].TrimStart('+'); // ç§»é™¤å‰å¯¼ '+'
                if (Regex.IsMatch(targetValue, @"^\d+$")) // ç¡®ä¿æ˜¯çº¯æ•°å­—
                {
                    return (double.Parse(targetValue) / 1000.0).ToString("0.###"); // é™¤ä»¥ 1000，保留最多 3 ä½å°æ•°
                }
            }
            return "0.000"; // è§£æžå¤±è´¥è¿”回 0.000
        }




        /// <summary>
        /// å¤„理电气任务逻辑，发送扭矩指令到设备
        /// </summary>
        /// <param name="group">任务分组</param>
        /// <param name="serialPortDevice">串口设备</param>
        /// <param name="item">设备信息</param>
        /// <param name="deviceProtocolDetail">设备协议详情</param>
        private void ProcessElectricTask(string group, SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail)
        {
            //获取当前任务号  //IPutakeServer里面的待执行的第一条任务；
            var take = _putakeRepository.QueryData(x => x.Grouptype == group)
                .OrderBy(x => x.Dispatchtime)
                .FirstOrDefault();
            var takeid = take?.Njtakeid;//拿到任务号

            //调用Getcircuit拿到当前步骤
            var process = _processServer.Getcircuit(group, takeid);

            if (process != null && process.Status)
            {
                var list = JsonConvert.SerializeObject(process.Data);
                var data = JsonConvert.DeserializeObject<ProcessData>(list);

                if (data?.proNow != null)
                {

                    int setpNum = data.proNow.SetpNum;
                    int sum = data.proNow.TorqueSum;
                    double torqueone = data.proNow.TorqueOne;
                    double torquetwo = data.proNow.TorqueTwo;

                    int onequantity = data.proNow.TorqueOneQuantity;
                    int towquantity = data.proNow.TorqueTwoQuantity;


                    //判断op表中这个值是否有该条任务的数据
                    var op = _orqueOpRepository.QueryData(x => x.TakeId == takeid && x.GroupOp == group && x.ProcessSte == setpNum);
                    if (op.Any())//判断是否有数据
                    {
                        //找到了就要对比现在op表中有多少条，是否和工艺表中的目标一致

                        // è®¡ç®—第一个扭矩的数量（在 Â±1 è¯¯å·®èŒƒå›´å†…）//Math.Abs(5.2 - 4.5) = 0.7 // è®¡å…¥ Math.Abs(6.0 - 4.5) = 1.5 ä¸è®¡å…¥
                        var oponecount = op.Count(x => Math.Abs(x.TorqueSize - torqueone) <= 1);

                        int times = 0;
                        if (op.Count() > onequantity)
                        {
                            times = onequantity;//如果第一条以及满足就移除onequantity数量的数据
                        }
                        else
                        {
                            times = op.Count();//没有满足就移除当前的数据数据
                        }

                        for (int i = 0; i < times; i++)
                        {
                            //移除第一次值的影响（以为有可能俩个目标值相近而产生误判）
                            op.RemoveAt(0); //移除 op åˆ—表的 ç¬¬ä¸€ä¸ªå…ƒç´ ï¼ˆå³æœ€æ—©å­˜å…¥çš„记录）

                        }

                        // è®¡ç®—第二个扭矩的数量（在 Â±1 è¯¯å·®èŒƒå›´å†…）
                        var optowcount = op.Count(x => Math.Abs(x.TorqueSize - torquetwo) <= 1);
                        sum = oponecount + optowcount;
                        //第一种，第一个扭力值没有扭完
                        if (oponecount < onequantity && torqueone != 0)
                        {
                            //设值
                            //var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
                            //        .Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r";
                            var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
                                      .Replace("[setNum]", Math.Round(torqueone * 1000).ToString().PadLeft(7, '0')) + "\r";
                            //格式化成整数

                            serialPortDevice.Communicator.Write(com);
                            //WriteDebug("写入", com);
                        }
                        //第二种，第一个值扭完了，第二个没有扭完
                        if (oponecount == onequantity && optowcount < towquantity && torquetwo != 0)
                        {
                            //设值
                            var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
                                    .Replace("[setNum]", Math.Round(torquetwo * 1000).ToString().PadLeft(7, '0')) + "\r";
                            serialPortDevice.Communicator.Write(com);
                        }
                    }
                    //这里这个任务第一次执行，op表中肯定是没有数据的，所有第一次就要把工艺表中的值给它
                    else if(!op.Any()&& torqueone!=0)//防止步骤一中torqueone的值为0导致报错
                    {
                        //设值
                        var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
                                .Replace("[setNum]", Math.Round(torqueone * 1000).ToString().PadLeft(7, '0')) + "\r";
                        serialPortDevice.Communicator.Write(com);
                    }

                }
                else
                {
                    Console.WriteLine("proNow ä¸ºç©º");
                }
            }
            else
            {
                Console.WriteLine($"Getcireit接口错误：{process?.Message}");
            }
        }

        /// <summary>
        /// å‘送扭矩指令到设备
        /// </summary>
        /// <param name="serialPortDevice">串口设备</param>
        /// <param name="item">设备信息</param>
        /// <param name="deviceProtocolDetail">设备协议详情</param>
        /// <param name="torqueValue">扭矩值</param>
        private void SendTorqueCommand(SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail, double torqueValue)
        {
            var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
                        .Replace("[setNum]", Math.Round(torqueValue * 1000).ToString().PadLeft(7, '0')) + "\r";
            serialPortDevice.Communicator.Write(com);
        }


        /// <summary>
        /// å­˜å‚¨æ‰­çŸ©æ•°æ®åˆ° `op` è¡¨
        /// </summary>
        private void SaveTorqueOpData(string group, string devicecode, string torqueValue)
        {
            var take = _putakeRepository.QueryData(x => x.Grouptype == group)
                                                                .OrderBy(x => x.Dispatchtime)
                                                                .FirstOrDefault();
            var takeid = take?.Njtakeid;//拿到任务号

            //调用Getcircuit拿到当前步骤
            var process = _processServer.Getcircuit(group, takeid);

            if (process != null && process.Status)
            {
                var list = JsonConvert.SerializeObject(process.Data);
                var dataz = JsonConvert.DeserializeObject<ProcessData>(list);

                if (dataz?.proNow != null)
                {

                    int setpNum = dataz.proNow.SetpNum;
                    int sum = dataz.proNow.TorqueSum;
                    double torqueone = dataz.proNow.TorqueOne;
                    int onequantity = dataz.proNow.TorqueOneQuantity;
                    int towquantity = dataz.proNow.TorqueTwoQuantity;
                    double torquetwo = dataz.proNow.TorqueTwo;
                    Dt_TorqueOp Addop = new Dt_TorqueOp()
                    {
                        DeviceCode = devicecode,
                        TakeId = takeid,
                        GroupOp = group,
                        ProcessSte = setpNum,
                        TorqueSize = float.TryParse(torqueValue, out float torque) ? torque : 0.0f, // è¿™é‡Œè¿›è¡Œå­—符串到float的转换
                        CreateDate = DateTime.Now,
                    };
                    _orqueOpRepository.AddData(Addop);
                }
            }
        }
    }
}