修改websocket；

yanjinhui

2025-03-22 2f0c81709876d76b6b120cf6ac43f05cda6dfe4c

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

@@ -3,26 +3,23 @@
using System.Drawing.Imaging;
using System.IO.Ports;
using System.Linq;
using System.Net.WebSockets;
using System.Text;
using System.Threading.Tasks;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using HslCommunication.WebSocket;
using Newtonsoft.Json;
using Quartz;
using SqlSugar;
using StackExchange.Profiling.Internal;
using WIDESEA_ISerialPortRepository;
using WIDESEA_SerialPortRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
using WIDESEAWCS_Tasks.ConveyorLineJob;
using WIDESEAWCS_Tasks.StackerCraneJob;

namespace WIDESEAWCS_Tasks
{
    [DisallowConcurrentExecution]
    public class SerialPortJob : JobBase, IJob, IDisposable
    public class SerialPortJob : JobBase, IJob,IDisposable
    {
        public void Dispose()
        {
@@ -32,24 +29,27 @@
        public enum CommandType
        {
            None = 0,
            Get = 1,
            Set = 2,
            Get = 1,//发信号
            Set = 2,//设值
        }

        public enum CommandResult
        {
            SetOK = 0,
            GetOK = 1,
            GetError = 2,
            SetOK = 0,//parseok
            GetOK = 1,//03
            GetError = 2,//04
        }
        private readonly IPutakeRepository _putakeRepository;
        private readonly IProcessRepository _processRepository;
        private readonly ITorqueOpRepository _orqueOpRepository;
        public SerialPortJob(IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository)
        private WebSocketServer _webSocketContext;

        public SerialPortJob(IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
        {
            _putakeRepository = putakeRepository;
            _processRepository = processRepository;
            _orqueOpRepository = torqueOpRepository;
            _webSocketContext = webSocketContext;
        }

        public Task Execute(IJobExecutionContext context)
@@ -59,6 +59,7 @@
                SerialPortDevice serialPortDevice = (SerialPortDevice)context.JobDetail.JobDataMap.Get("JobParams");
                if (serialPortDevice != null)
                {

                    List<DeviceProDTO> deviceProDTOs = serialPortDevice.DeviceProDTOs;
                    foreach (var item in deviceProDTOs)
                    {
@@ -67,61 +68,21 @@
                            DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandType) && x.ProtocolDetailType == nameof(CommandType.Set));
                            if (deviceProtocolDetail != null)
                            {
                                //我要前端返回给我一个组别，和任务id
                                //先查状态和组，按时间降序
                                string group = "电气";
                                
                                
                                //这里判断组别三个看是那个，就查那个工艺表的值
                                if (group=="电气")
                                # region  Setvalue
                                string group = item.DeviceProDataBlock;
                                if (group == "电气")
                                {
                                   
                                    //先看工艺表中步骤一中要扭的值有多少个 å†æŸ¥çœ‹Dt_TorqueOp表中是否有该任务号id和步骤总数是否满足工艺表
                                    // æŸ¥è¯¢æ‰€æœ‰å·¥è‰ºæ•°æ®ï¼ŒæŒ‰ç…§æ­¥éª¤å· SetpNum é€’增排序                                                                                                                                            
                                    var processList = _processRepository.QueryData(x => x.CraftType == group)
                                                                        .OrderBy(x => x.SetpNum)
                                                                        .ToList();

                                    foreach (var process in processList)
                                    {
                                        float  torqueone = process.TorqueOne;//读到值了
                                        float torquetow = process.TorqueTwo;
                                        if (torqueone!=0)
                                        {
                                            serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r");
                                        }
                                        if (torquetow != 0)
                                        {
                                            serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torquetow * 1000).ToString().PadLeft(7, '0')) + "\r");
                                        }
                                      
                                        // è®¡ç®—当前步骤所需的 Torque æ€»æ•°
                                        int requiredTorqueCount = process.TorqueOneQuantity + process.TorqueTwoQuantity;

                                        // æŸ¥è¯¢å½“前步骤的 TorqueOp è®°å½•ï¼ŒåŒ¹é… ProcessSte和组，检查是否达到要求
                                        int torqueCount = _orqueOpRepository.QueryData(x => x.ProcessSte == process.SetpNum&& x.GroupOp== group).Count();

                                        if (torqueCount < requiredTorqueCount)
                                        {
                                            // å¦‚果数量不满足，停止读取
                                           
                                            break;
                                        }
                                        //符合要求，继续读取下一步
                                       
                                    }

                                    //查看步骤
                                    var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (5 * 1000).ToString().PadLeft(7, '0'))+"\r";
                                    serialPortDevice.Communicator.Write(com+"\r");
                                    //打开串口时先设值
                                    
                                     
                                }
                                if (group == "机械")
                                {

                                }
                                if (group == "地沟")
                                {

                                }
                                //打开串口时先设值
                                #endregion
                                item.DeviceProParamName = CommandType.Set.ToString();


                            }
                        }

@@ -170,54 +131,38 @@
                                {
                                    DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandResult) && x.ProtocolDetailType == nameof(CommandResult.GetOK));
                                    //03成功

                                    if (deviceProtocolDetail != null && receiveData.Contains(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue))
                                    {
                                        //这里成功之后，要存储到看Dt_TorqueOp（存任务号，组，值）
                                        string group = "";

                                        string group = item.DeviceProDataBlock; // è®¾å¤‡æ‰€å±žç»„别
                                        if (group == "电气")
                                        {
                                            var putake = _putakeRepository.QueryData(x => x.Pustatus == 2 && x.Grouptype == group).OrderByDescending(x => x.Dispatchtime).FirstOrDefault();//每次都拿最早的那条
                                            var punjid = putake.ID;
                                            var Nj = new Dt_TorqueOp()
                                            {
                                                TakeId = putake.Njtakeid,
                                                GroupOp = group,
                                                //ProcessSte= processList
                                                TorqueSize = receiveData

                                            };
                                            _orqueOpRepository.AddData(Nj);

                                        }
                                        if (group == "机械")
                                        {

                                        }
                                        if (group == "地沟")


                                            item.DeviceProParamName = CommandType.Set.ToString();

                                    }
                                }
                                else if (item.DeviceProParamName == CommandType.Get.ToString())
                                {
                                    DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandResult) && x.ProtocolDetailType == nameof(CommandResult.GetError));
                                    if (deviceProtocolDetail != null && receiveData.Contains(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue))
                                    {
                                        item.DeviceProParamName = CommandType.Set.ToString();
                                        }
                                        else if (item.DeviceProParamName == CommandType.Get.ToString())
                                        {
                                            //DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandResult) && x.ProtocolDetailType == nameof(CommandResult.GetError));
                                            //if (deviceProtocolDetail != null && receiveData.Contains(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue))
                                            //{
                                            //    item.DeviceProParamName = CommandType.Set.ToString();



                                            //}
                                        }
                                    }
                                }
                            }


                            //建一个对象将其传给前端
                            string data = JsonConvert.SerializeObject(serialPortDevice);//这里serialPortDevice是假设有这个对象
                            _webSocketContext.PublishAllClientPayload(data);
                        }

                    }

                }

            }
            catch (Exception ex)
            {
@@ -226,5 +171,8 @@
            WriteDebug("CommonConveyorLineJob", "test");
            return Task.CompletedTask;
        }
       


    }
}