From 8f143507d4f1e38a5cc63348ea23a1aeb9182006 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 01 四月 2025 17:02:51 +0800
Subject: [PATCH] Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0227
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs | 423 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 268 insertions(+), 155 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs"
index cd93448..a02e1e6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Tasks/SerialPort/SerialPortTestJob.cs"
@@ -1,177 +1,290 @@
-锘�/*using System.IO.Ports;
-using System.Text;
-using Quartz;
-using WIDESEA_ISerialPortService;
-using WIDESEAWCS_Model.Models;
+锘�//using System;
+//using System.Collections.Generic;
+//using System.IO.Ports;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+//using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+//using Quartz;
+//using WIDESEA_ISerialPortRepository;
+//using WIDESEA_SerialPortRepository;
+//using WIDESEAWCS_Model.Models;
+//using WIDESEAWCS_QuartzJob;
+
+//namespace WIDESEAWCS_Tasks
+//{
+// [DisallowConcurrentExecution]
+// public class SerialPortJob : JobBase, IJob
+// {
+// //dispatchinfo
+// //1 娴嬭瘯 OtherDevice WIDESEAWCS_Tasks SerialPortJob 1 NULL NULL NULL 1 2025-02-19 14:55:02.167 NULL NULL
+// public enum CommandType
+// {
+// None = 0,
+// Get = 1,
+// Set = 2,
+// }
+
+// private readonly IPutakeRepository _putakeRepository;
+// private readonly INJCommandsRepository _nJCommandsRepository;
+// private readonly IProcessRepository _processRepository;
+// private readonly ITorqueOpRepository _orqueOpRepository;
+// public SerialPortJob(IPutakeRepository putakeRepository, INJCommandsRepository nJCommandsRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository)
+// {
+// _putakeRepository = putakeRepository;
+// _nJCommandsRepository = nJCommandsRepository;
+// _processRepository = processRepository;
+// _orqueOpRepository = torqueOpRepository;
+// }
-namespace WIDESEAWCS_Tasks
-{
- public class SerialPortTestJob:IJob
- {
- // 鍦� SerialPortTestService 绫讳腑娣诲姞瀵� ISerialPortService 鐨勫紩鐢�
- private readonly ISerialPortService _serialPortService;
- public readonly string _port;
- public SerialPort SerialPort { get; set; } =null!; //琛ㄧず瑕佹墦寮�鐨勪覆鍙�;鍙负绌�
- // 鏋勯�犲嚱鏁�
- public SerialPortTestJob(ISerialPortService serialPortService)
- {
- _serialPortService = serialPortService;
- _port = "COM3";
+// private static SerialPort serialPort;
+// private static CommandType commandType = CommandType.None;
+// //private string commandGet = "824070241JNT\r";//璇诲��
+// //private string commandSet = "824070241JNT,0012500,+0001000[+TOL],-0001000[-TOL]\r";//璁惧��
+// private string setOK = "ParseOK";
+// //private string getOK = "82407024103";
+// //private string getError = "82407024104";
+// public Task Execute(IJobExecutionContext context)
+// {
+// #region 鍏堟煡鍒拌繖鏉″懡浠�
+// string commandSet = "";
+// string commandGet = "";
+// string getOK = "";
+// string getError = "";
- SerialPort = new SerialPort(_port);
+// var com = _nJCommandsRepository.QueryFirst(x => x.ID == 3);
+// if (com != null)
+// {
+// commandSet = string.Format("{0}JNT,{1},{2},{3}\r", com.DeviceNum, com.TorqueValue, com.TorqueMax, com.TorqueMin);//"824070241JNT,0005000,+0001000[+TOL],-0001000[-TOL]\r"
+// commandGet = string.Format("{0}\t", com.DeviceNum);// "824070241JNT\r"
+// getOK = string.Format("{0}03", com.DeviceNum);// "82407024103"
+// getError = string.Format("{0}04", com.DeviceNum);// "82407024104"
+// }
+// else
+// {
+// throw new Exception("鏈壘鍒版寚瀹氱殑鍛戒护鏁版嵁锛�");
+// }
+// #endregion
- //涓插彛鎺ユ敹鍒版暟鎹椂锛孲erialPort 浼氳嚜鍔ㄨЕ鍙� DataReceived 浜嬩欢
- //SerialPort.DataReceived += OnDataReceived; //鎺ユ敹涓插彛鍙戝嚭鐨勬暟鎹�
- }
-
- private CancellationTokenSource _cancellationTokenSource;
- private Task _sendTask;
- private int commandType = 2;
-
- // 鍛戒护瀛楃涓�
- private string command0 = ""; // 涓嶅彂閫佸懡浠�
- private string command1 = "824070241JNT\r"; //鍙戦�佷俊鍙�
- private string command2 = "824070241JNT;0005000;+0001000[+TOL];-0001000[-TOL]\r"; //璁惧��
-
- public Task Execute(IJobExecutionContext context)
- {
-
- //OpenSerialPort();
- SerialPort.DataReceived += OnDataReceived;
-
- return Task.CompletedTask;
- }
+// try
+// {
+// if (serialPort == null) { serialPort = new SerialPort("COM3"); serialPort.DataReceived += SerialPort_DataReceived; }
+// if (!serialPort.IsOpen)
+// {
+// serialPort.Open();
- // 鐢ㄤ簬瀛樺偍鎺ユ敹鍒扮殑鏁版嵁
- private List<string> receivedDataList = new List<string>();
-
+// serialPort.Write(commandSet);//鎵撳紑涓插彛鏃跺厛璁惧��
+// commandType = CommandType.Set;
+// }
+// switch (commandType)
+// {
+// case CommandType.Get://璇诲��
+// serialPort.Write(commandGet);
+// break;
+// case CommandType.Set://璁惧��
+// serialPort.Write(commandSet);
+// break;
+// }
+// }
+// catch (Exception ex)
+// {
+// throw new Exception(ex.Message);
+// }
+// return Task.CompletedTask;
+// }
+// private void SerialPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
+// {
+// # region 鍏堟煡鍒拌繖鏉″懡浠�
+// string getError = "";
+// string getOK = "";
- // 鎵撳紑涓插彛骞跺紑濮嬫寔缁彂閫佷俊鍙�
- public void OpenSerialPort()
- {
- if (!SerialPort.IsOpen)
- {
- SerialPort.Open();
- StartSendingData();//寮�鍚悗鍙板惊鐜�
- }
- }
+// var com = _nJCommandsRepository.QueryFirst(x => x.ID == 3);
+// if (com != null)
+// {
+// getOK = string.Format("{0}03", com.DeviceNum);// "82407024103"
- // 鍏抽棴涓插彛骞跺仠姝㈠彂閫佷俊鍙�
- public void CloseSerialPort()
- {
- if (SerialPort.IsOpen)
- {
- SerialPort.Close();
- }
- }
+// getError = string.Format("{0}04", com.DeviceNum);// "82407024104"
+// }
+// else
+// {
+// throw new Exception("鏈壘鍒版寚瀹氱殑鍛戒护鏁版嵁锛�");
+// }
+// #endregion
- // 鍙戦�佹暟鎹竴娆�
- public void SendData(string data)
- {
- if (SerialPort.IsOpen)
- {
- byte[] bytesToSend = Encoding.ASCII.GetBytes(data);
- SerialPort.Write(bytesToSend; 0; bytesToSend.Length);//灏嗘暟鎹彂閫佸埌涓插彛
- }
- }
+// byte[] buffers = new byte[1024];
+// while (serialPort.BytesToRead > 0)
+// {
+// serialPort.Read(buffers, 0, serialPort.BytesToRead > buffers.Length ? buffers.Length : serialPort.BytesToRead);
+// string data = Encoding.Default.GetString(buffers);
+// if (data.Contains(setOK) && commandType == CommandType.Set)
+// {
+// commandType = CommandType.Get;
+// }
+// else if (data.Contains(getOK) && commandType == CommandType.Get) //鎴愬姛灏变繚瀛樺埌鏁版嵁搴撲腑
+// {
+// //杩欓噷濡傛灉鎴愪簡灏卞瓨鍒版暟鎹簱涓殑torqueop琛ㄤ腑锛屽苟涓斿湪杩欏垽鏂璽orqueop琛ㄤ腑鐨勬暟鎹畇ize鍜屾楠わ紝鏄惁婊¤冻宸ヨ壓琛ㄦ墍瑕佹眰鐨�
+// //_orqueOpRepository.
- // 鑾峰彇涓插彛鐘舵��
- public bool GetSerialPortStatus()
- {
- return SerialPort.IsOpen;
- }
-
- // 鑾峰彇鎺ユ敹鍒扮殑鎵�鏈夋暟鎹�
- public List<string> GetReceivedData()
- {
- return receivedDataList;
- }
-
- // 澶勭悊鎺ユ敹鍒扮殑鏁版嵁
- //姣忓綋涓插彛鏀跺埌鏁版嵁鏃讹紝浼氳Е鍙戞鏂规硶
- private void OnDataReceived(object sender; SerialDataReceivedEventArgs e)
- {
- //浠庝覆鍙ｆ帴鏀舵暟鎹紝骞跺皢鎺ユ敹鍒扮殑鏁版嵁杞崲涓哄瓧绗︿覆
- byte[] buffer = new byte[1024];//涓�涓瓧鑺傛暟缁� buffer锛屽ぇ灏忎负 1024 瀛楄妭
- int bytesRead = SerialPort.Read(buffer; 0; buffer.Length);//浠庝覆鍙ｆ祦 SerialPort 涓鍙栨暟鎹苟灏嗗叾瀛樺叆 buffer 鏁扮粍涓��
- string receivedData = Encoding.ASCII.GetString(buffer; 0; bytesRead);//灏嗘帴鏀跺埌鐨勫瓧鑺傛暟鎹浆鎹㈡垚涓�涓瓧绗︿覆
-
- //杩欓噷鍐欎竴涓柟娉曠敤浜庡垽鏂瘡娆eceivedDat鏄惁婊¤冻鏉′欢
- //鎴彇璁惧缂栧彿鍚庣殑淇╀负鏄惁涓�03锛�03鎴愬姛灏辫繘琛屼笅姝�
- string deviceCodePostfix = receivedData.Substring(9; 2); // 绱㈠紩浠� 9 寮�濮嬶紝闀垮害涓� 2锛屽嵆鎻愬彇 "04"
- // 鎻愬彇浠庣24浣嶅悗鐨勬暟鎹紙渚嬪 "0008000"锛�
- string dataAfter24th = receivedData.Substring(13; 7); // 浠庣23浣嶅紑濮嬫彁鍙�7涓瓧绗︼紝寰楀埌 "0008000"
- if (deviceCodePostfix == "03")
- {
- //鎻掑叆鏁版嵁
- Dt_TorqueOp torqueOp = new Dt_TorqueOp
- {
- TorqueSize = dataAfter24th
-
- };
-
- _serialPortService.AddSerialPort(torqueOp);
-
- //receivedDataList.Add(receivedData);
-
-
- }
+// commandType = CommandType.Set;
+// }
+// else if (data.Contains(getError) && commandType == CommandType.Get)
+// {
+// commandType = CommandType.Set;
- receivedDataList.Add(receivedData);
-
-
+// }
+// }
+// }
+// }
+//}
+#region
+//if (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;
+// double torquetwo = data.proNow.TorqueTwo;
+
+// int onequantity = data.proNow.TorqueOneQuantity;
+// int towquantity = data.proNow.TorqueTwoQuantity;
- // 澶勭悊鍛戒护鍒囨崲閫昏緫
- if (commandType == 2 && receivedData.Contains("ParseOK"))
- {
- commandType = 1;
- }
- else if (commandType == 1 && (receivedData.Contains("82407024103") || receivedData.Contains("82407024104")))
- {
- commandType = 2;
- }
- }
+// //鍒ゆ柇op琛ㄤ腑杩欎釜鍊兼槸鍚︽湁璇ユ潯浠诲姟鐨勬暟鎹�
+// var op = _orqueOpRepository.QueryData(x => x.TakeId == takeid && x.GroupOp == group && x.ProcessSte == setpNum);
+// if (op.Any())//鍒ゆ柇鏄惁鏈夋暟鎹�
+// {
+// //鎵惧埌浜嗗氨瑕佸姣旂幇鍦╫p琛ㄤ腑鏈夊灏戞潯锛屾槸鍚﹀拰宸ヨ壓琛ㄤ腑鐨勭洰鏍囦竴鑷�
- // 鍚姩鍚庡彴浠诲姟锛屾瘡闅斾竴娈垫椂闂村彂閫佷俊鍙�
- private void StartSendingData()
- {
- _cancellationTokenSource = new CancellationTokenSource();
- _sendTask = Task.Run(() =>
- {
- while (SerialPort.IsOpen)
- {
- string command = command0;
- //鍏堝垽鏂璫ommandType
- if (commandType == 1)
- {
- command = command1;
- }
- else if (commandType == 2)
- {
- command = command2;
- }
+// // 璁＄畻绗竴涓壄鐭╃殑鏁伴噺锛堝湪 卤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 //闃叉姝ラ涓�涓璽orqueone鐨勫�间负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}");
+// }
+//}
+
+#endregion
- //鍐嶆鏌� command 瀛楃涓叉槸鍚︿负绌烘垨 null
- if (!string.IsNullOrEmpty(command))
- {
- byte[] dataToSend = Encoding.ASCII.GetBytes(command);//灏哻ommand杞垚瀛楄妭鏁扮粍
- //锛堜笁涓弬鏁扮殑鍚箟锛�1鏁扮粍锛�2浠庣0浣嶅紑濮嬫埅鍙栵紝3鏄鍙戦�佺殑瀛楄妭鏁帮紝杩欓噷琛ㄧず鏁翠釜瀛楄妭鏁扮粍鐨勯暱搴︼級
- SerialPort.Write(dataToSend; 0; dataToSend.Length);//鏈�鍚庡悜涓插彛鍙戦�佹暟鎹�
+#region 鏍规嵁涓嶅悓鐨刧roup瀛樺��
+//if (group == "鐢垫皵")
+//{
+// var take = _putakeRepository.QueryData(x => x.Grouptype == group)
+// .OrderBy(x => x.Dispatchtime)
+// .FirstOrDefault();
+// var takeid = take?.Njtakeid;//鎷垮埌浠诲姟鍙�
- }
+// //璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
+// var process = _processServer.Getcircuit(group, takeid);
- Thread.Sleep(1000); // 姣忛殧1绉掑彂閫佷竴娆″懡浠�
- }
- });
- }
+// if (process != null && process.Status)
+// {
+// var list = JsonConvert.SerializeObject(process.Data);
+// var dataz = JsonConvert.DeserializeObject<ProcessData>(list);
-
- }
-}*/
\ No newline at end of file
+// 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);
+// }
+// }
+
+
+// item.DeviceProParamName = CommandType.None.ToString();
+//}
+
+#endregion
\ No newline at end of file
--
Gitblit v1.9.3