Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKon...

qiuyao

2025-03-31 9dd01fc3eb30b0d3b1f64d9e4c5baa4173e6d056

Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0311

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt

Binary files differ

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/ISerialPortService/ITorqueOpServer.cs

@@ -19,15 +19,18 @@
        /// <returns></returns>
        WebResponseContent Checkvalue(GetTorDTO getTorDTO);

       

        WebResponseContent AddTorqueOp(Dt_TorqueOp torqueOp);

        /// <summary>
        /// åˆ¤æ–­op表中这个值是否有该条任务的数据
        /// åˆ¤æ–­op表中这个值是否有该条任务的数据/给前端返回当前op表中的值
        /// </summary>
        /// <param name="takeid">任务号</param>
        /// <param name="group">组别</param>
        /// <param name="setpunm">步骤</param>
        /// <returns></returns>
        WebResponseContent WhetherSaveValueData(string takeid,string group,int setpunm);
     
    }
}

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/TorqueOpServer.cs

@@ -14,7 +14,7 @@

namespace WIDESEAWCS_TaskInfoService
{
    public class TorqueOpServer : ServiceBase<Dt_TorqueOp, ITorqueOpRepository>,ITorqueOpServer
    public class TorqueOpServer : ServiceBase<Dt_TorqueOp, ITorqueOpRepository>, ITorqueOpServer
    {
        private IProcessRepository _iprocessRepository;
        public TorqueOpServer(ITorqueOpRepository BaseDal, IProcessRepository iprocessRepository) : base(BaseDal)
@@ -95,5 +95,7 @@
                return new WebResponseContent { Status = false, Message = "错误" + ex.Message };
            }
        }

      
    }
}

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_Server/appsettings.json

@@ -30,6 +30,6 @@
  "QuartzJobAutoStart": true,
  "PrintSql": false,
  "WebSocketEnable": true,
  "WebSocketPort": 5000,
  "WebSocketPort": 5174,
  "LogDeubgEnable": true
}

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

@@ -9,8 +9,10 @@
using System.Threading.Tasks;
using AutoMapper;
using HslCommunication.WebSocket;
using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using Quartz;
@@ -27,11 +29,12 @@
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_TaskInfoService;
using WIDESEAWCS_Tasks.SerialPort;
using static WIDESEAWCS_Tasks.SerialPortJob;

namespace WIDESEAWCS_Tasks
{
    [DisallowConcurrentExecution]
    public class SerialPortJob : JobBase, IJob,IDisposable
    public class SerialPortJob : JobBase, IJob, IDisposable
    {
        public void Dispose()
        {
@@ -60,7 +63,9 @@
        private readonly IPutakeServer _putakeServer;
        private readonly ITorqueOpServer _torqueOpServer;

        public SerialPortJob(ITorqueOpServer torqueOpServer,IPutakeServer putakeServer,IProcessServer processServer, IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
        static string takeid = ""; // åœ¨å¾ªçŽ¯å¼€å§‹å‰å£°æ˜Ž takeid

        public SerialPortJob(ITorqueOpServer torqueOpServer, IPutakeServer putakeServer, IProcessServer processServer, IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
        {
            _putakeRepository = putakeRepository;
            _processRepository = processRepository;
@@ -68,8 +73,10 @@
            _webSocketContext = webSocketContext;
            _processServer = processServer;
            _putakeServer = putakeServer;
            _torqueOpServer= torqueOpServer;    
            _torqueOpServer = torqueOpServer;
        }



        public Task Execute(IJobExecutionContext context)
        {
@@ -79,6 +86,7 @@
                if (serialPortDevice != null)
                {
                    List<DeviceProDTO> deviceProDTOs = serialPortDevice.DeviceProDTOs;

                    foreach (var item in deviceProDTOs)
                    {
                        if (item.DeviceProParamName != CommandType.Get.ToString() && item.DeviceProParamName != CommandType.Set.ToString())
@@ -86,11 +94,28 @@
                            DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandType) && x.ProtocolDetailType == nameof(CommandType.Set));
                            if (deviceProtocolDetail != null)
                            {
                                string group = item.DeviceProDataBlock;
                                
                                string group = item.DeviceProDataBlock;//组别

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


                               
                                if (group == "电气" || group == "地沟" || group == "机械")
                                {
                                    ProcessElectricTask(group, serialPortDevice, item, deviceProtocolDetail);
                                { // æŸ¥è¯¢ä»»åŠ¡ä¿¡æ¯ä¸€æ¬¡
                                    var takeResponse = _putakeServer.PerformTasks(group);//查找任务分解表这条最早的数据
                                    if (takeResponse == null || !takeResponse.Status)
                                    {
                                        Console.WriteLine($"任务分级表接口错误：{takeResponse?.Message}");
                                        continue;
                                    }

                                    var take = JsonConvert.DeserializeObject<Dt_Putake>(JsonConvert.SerializeObject(takeResponse.Data));
                                    takeid = take?.Njtakeid; // ç¼“存任务号
                                    if (takeid != null)
                                    {
                                        ProcessElectricTask(group, serialPortDevice, item, deviceProtocolDetail, takeid);
                                    }
                                }
                                item.DeviceProParamName = CommandType.None.ToString();
                            }
@@ -134,10 +159,47 @@
                                        //把这条数据插入op表中
                                        string group = item.DeviceProDataBlock; // è®¾å¤‡æ‰€å±žç»„别
                                        string devicecode = item.DeviceChildCode;//设备编号
                                        string torqueValue = ExtractTorqueValue(receiveData);//调用转值方法
                                       string torqueValue = ExtractTorqueValue(receiveData);//调用转值方法
                                        if (group == "电气" || group == "地沟" || group == "机械")
                                        {
                                            SaveTorqueOpData(group, devicecode, torqueValue);
                                            if (takeid != null)
                                            {
                                               

                                                //web
                                                var process = _processServer.Getcircuit(group, takeid);
                                                //var list = JsonConvert.SerializeObject(process.Data);//序列化
                                                //var dataS= JsonConvert.DeserializeObject<ProcessData>(list);//字符串反序列化为单个 ProcessData å¯¹è±¡

                                                var dataS = JsonConvert.DeserializeObject<ProcessData>(JsonConvert.SerializeObject(process.Data)); // ç¡®ä¿ä¸ºå¯¹è±¡
                                                int setnum = dataS.proNow.SetpNum;

                                                //存值
                                                SaveTorqueOpData(group, devicecode, torqueValue, takeid);

                                                //op
                                                var opResponse = _torqueOpServer.WhetherSaveValueData(takeid, group, setnum);
                                                //var jsonResponse = JsonConvert.SerializeObject(opResponse.Data);
                                                var opData = JsonConvert.DeserializeObject<List<Dt_TorqueOp>>(JsonConvert.SerializeObject(opResponse.Data)); // ç¡®ä¿ä¸ºå¯¹è±¡



                                                // åˆ›å»ºå‰ç«¯éœ€è¦çš„数据对象
                                                var responseData = new
                                                {
                                                    process = dataS,  // å·¥è‰ºè¡¨
                                                    operation = opData // op表
                                                };//返回当前工艺步骤和op表中满足条件的值

                                               

                                                //建一个对象将其传给前端/序列化并推送给前端
                                                string data = JsonConvert.SerializeObject(responseData);//这里serialPortDevice是假设有这个对象
                                                _webSocketContext.PublishAllClientPayload(data);
                                            }
                                           
                                        
                                          
                                            item.DeviceProParamName = CommandType.None.ToString();
                                        }

@@ -151,10 +213,9 @@
                                }
                            }

                           

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

                        }

                    }
@@ -190,7 +251,7 @@
        }


  


        /// <summary>
        /// å¤„理电气任务逻辑，发送扭矩指令到设备
@@ -199,20 +260,13 @@
        /// <param name="serialPortDevice">串口设备</param>
        /// <param name="item">设备信息</param>
        /// <param name="deviceProtocolDetail">设备协议详情</param>
        private void ProcessElectricTask(string group, SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail)
        private void ProcessElectricTask( string group, SerialPortDevice serialPortDevice, DeviceProDTO item, DeviceProtocolDetailDTO deviceProtocolDetail, string takeid)
        {
            //1.获取当前任务号  //IPutakeServer里面的待执行的第一条任务；
            //var take = _putakeRepository.QueryData(x => x.Grouptype == group)
            //    .OrderBy(x => x.Dispatchtime)
            //    .FirstOrDefault();
            var takeResponse = _putakeServer.PerformTasks(group);
            if (takeResponse == null || !takeResponse.Status)
            {
                Console.WriteLine($"任务分级表接口错误：{takeResponse?.Message}");
            }

            var take = JsonConvert.DeserializeObject<Dt_Putake>(JsonConvert.SerializeObject(takeResponse.Data)); // ç¡®ä¿è½¬æ¢æ­£ç¡®
            var takeid = take?.Njtakeid;//拿到任务号

            //2.调用Getcircuit拿到当前步骤
            var process = _processServer.Getcircuit(group, takeid);
@@ -297,7 +351,7 @@
                        }
                    }
                    //这里这个任务第一次执行，op表中肯定是没有数据的，所有第一次就要把工艺表中的值给它
                    else if(!op.Any()&& torqueone!=0)//防止步骤一中torqueone的值为0导致报错
                    else if (!op.Any() && torqueone != 0)//防止步骤一中torqueone的值为0导致报错
                    {
                        //设值
                        var com = item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue
@@ -310,7 +364,7 @@
                {
                    Console.WriteLine("proNow ä¸ºç©º");
                }
            }
        }
            else
            {
                Console.WriteLine($"Getcireit接口错误：{process?.Message}");
@@ -335,22 +389,10 @@
        /// <summary>
        /// å­˜å‚¨æ‰­çŸ©æ•°æ®åˆ° `op` è¡¨
        /// </summary>
        private void SaveTorqueOpData(string group, string devicecode, string torqueValue)
        private void SaveTorqueOpData(string group, string devicecode, string torqueValue, string takeid)
        {
            //var take = _putakeRepository.QueryData(x => x.Grouptype == group)
            //                                                    .OrderBy(x => x.Dispatchtime)
            //                                                    .FirstOrDefault();
            //var takeid = take?.Njtakeid;//拿到任务号
            var takeResponse = _putakeServer.PerformTasks(group);
            if (takeResponse == null || !takeResponse.Status)
            {
                Console.WriteLine($"任务分级表接口错误：{takeResponse?.Message}");
            }

            var take = JsonConvert.DeserializeObject<Dt_Putake>(JsonConvert.SerializeObject(takeResponse.Data)); // ç¡®ä¿è½¬æ¢æ­£ç¡®
            var takeid = take?.Njtakeid;//拿到任务号

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

            if (process != null && process.Status)
@@ -383,5 +425,17 @@
                }
            }
        }

        public class TorqueOpData
        {
            /// <summary>
            /// è¿”回
            /// </summary>
            public List<Dt_TorqueOp> TorList { get; set; }
        }

      


    }
}