完成实时通信

yanjinhui

2025-03-31 5c246f877049ab0e832637954ddbdf44e35b8135

完成实时通信

 ÏîÄ¿´úÂë/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

@@ -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,6 +29,7 @@
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_TaskInfoService;
using WIDESEAWCS_Tasks.SerialPort;
using static WIDESEAWCS_Tasks.SerialPortJob;

namespace WIDESEAWCS_Tasks
{
@@ -92,9 +95,15 @@
                            if (deviceProtocolDetail != null)
                            {
                                string group = item.DeviceProDataBlock;//组别

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


                               
                                if (group == "电气" || group == "地沟" || group == "机械")
                                { // **查询任务信息一次**
                                    var takeResponse = _putakeServer.PerformTasks(group);
                                { // æŸ¥è¯¢ä»»åŠ¡ä¿¡æ¯ä¸€æ¬¡
                                    var takeResponse = _putakeServer.PerformTasks(group);//查找任务分解表这条最早的数据
                                    if (takeResponse == null || !takeResponse.Status)
                                    {
                                        Console.WriteLine($"任务分级表接口错误：{takeResponse?.Message}");
@@ -155,8 +164,41 @@
                                        {
                                            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();
                                        }
@@ -172,9 +214,8 @@
                            }


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


                        }

                    }
@@ -351,7 +392,7 @@
        private void SaveTorqueOpData(string group, string devicecode, string torqueValue,string takeid)
        {
        
            //调用Getcircuit拿到当前步骤
            ////调用Getcircuit拿到当前步骤
            var process = _processServer.Getcircuit(group, takeid);

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

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

      


    }
}