From 20f099aee8715510406bf46c5e8ff4a8f5d532df Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 02 四月 2025 16:27:19 +0800
Subject: [PATCH] 111
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs | 365 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 263 insertions(+), 102 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/SerialPortJob.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/SerialPortJob.cs"
index 286dd74..e27d8df 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/SerialPortJob.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/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()
{
@@ -58,8 +61,11 @@
private WebSocketServer _webSocketContext;
private readonly IProcessServer _processServer;
private readonly IPutakeServer _putakeServer;
+ private readonly ITorqueOpServer _torqueOpServer;
- public SerialPortJob(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;
@@ -67,7 +73,10 @@
_webSocketContext = webSocketContext;
_processServer = processServer;
_putakeServer = putakeServer;
+ _torqueOpServer = torqueOpServer;
}
+
+
public Task Execute(IJobExecutionContext context)
{
@@ -77,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())
@@ -84,69 +94,29 @@
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 == "鐢垫皵")
- {
- //鑾峰彇褰撳墠浠诲姟鍙� //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);
+ string group = item.DeviceProDataBlock;//缁勫埆
- if (process != null && process.Status)
+ ////2.璋冪敤Getcircuit鎷垮埌褰撳墠姝ラ
+ //var process = _processServer.Getcircuit(group, takeid);
+
+
+
+ if (group == "鐢垫皵" || group == "鍦版矡" || group == "鏈烘")
+ { // 鏌ヨ浠诲姟淇℃伅涓�娆�
+ var takeResponse = _putakeServer.PerformTasks(group);//鏌ユ壘浠诲姟鍒嗚В琛ㄨ繖鏉℃渶鏃╃殑鏁版嵁
+ if (takeResponse == null || !takeResponse.Status)
{
- var list = JsonConvert.SerializeObject(process.Data);
- var data = JsonConvert.DeserializeObject<ProcessData>(list);
+ Console.WriteLine($"浠诲姟鍒嗙骇琛ㄦ帴鍙ｉ敊璇細{takeResponse?.Message}");
+ continue;
+ }
- 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())//鍒ゆ柇鏄惁鏈夋暟鎹�
- {
- //鎵惧埌浜嗗氨瑕佸姣旂幇鍦╫p琛ㄤ腑鏈夊灏戞潯锛屾槸鍚﹀拰宸ヨ壓琛ㄤ腑鐨勭洰鏍囦竴鑷�
- 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);
- }
- //绗簩绉嶏紝绗竴涓�兼壄瀹屼簡锛岀浜屼釜娌℃湁鎵畬
- 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);
- }
- }
-
- }
+ var take = JsonConvert.DeserializeObject<Dt_Putake>(JsonConvert.SerializeObject(takeResponse.Data));
+ takeid = take?.Njtakeid; // 缂撳瓨浠诲姟鍙�
+ if (takeid != null)
+ {
+ ProcessElectricTask(group, serialPortDevice, item, deviceProtocolDetail, takeid);
}
}
- #endregion
item.DeviceProParamName = CommandType.None.ToString();
}
}
@@ -189,52 +159,50 @@
//鎶婅繖鏉℃暟鎹彃鍏p琛ㄤ腑
string group = item.DeviceProDataBlock; // 璁惧鎵�灞炵粍鍒�
string devicecode = item.DeviceChildCode;//璁惧缂栧彿
- string torqueValue = ExtractTorqueValue(receiveData);
-
- if (group == "鐢垫皵")
+ string torqueValue = ExtractTorqueValue(receiveData);//璋冪敤杞�兼柟娉�
+ 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)
+ if (takeid != null)
{
- var list = JsonConvert.SerializeObject(process.Data);
- var dataz = JsonConvert.DeserializeObject<ProcessData>(list);
+
- if (dataz?.proNow != 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琛�
+ };//杩斿洖褰撳墠宸ヨ壓姝ラ鍜宱p琛ㄤ腑婊¤冻鏉′欢鐨勫��
- 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,
+
- };
- }
+ //寤轰竴涓璞″皢鍏朵紶缁欏墠绔�/搴忓垪鍖栧苟鎺ㄩ�佺粰鍓嶇
+ string data = JsonConvert.SerializeObject(responseData);//杩欓噷serialPortDevice鏄亣璁炬湁杩欎釜瀵硅薄
+ _webSocketContext.PublishAllClientPayload(data);
}
-
-
- #endregion
-
+
+
+
item.DeviceProParamName = CommandType.None.ToString();
}
-
+
}
DeviceProtocolDetailDTO? deviceProtocolDetail2 = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandResult) && x.ProtocolDetailType == nameof(CommandResult.GetError));
@@ -245,10 +213,9 @@
}
}
+
- //寤轰竴涓璞″皢鍏朵紶缁欏墠绔�
- //string data = JsonConvert.SerializeObject(serialPortDevice);//杩欓噷serialPortDevice鏄亣璁炬湁杩欎釜瀵硅薄
- //_webSocketContext.PublishAllClientPayload(data);
+
}
}
@@ -270,11 +237,205 @@
/// <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, string takeid)
+ {
+ //1.鑾峰彇褰撳墠浠诲姟鍙� //IPutakeServer閲岄潰鐨勫緟鎵ц鐨勭涓�鏉′换鍔★紱
+ //var take = _putakeRepository.QueryData(x => x.Grouptype == group)
+ // .OrderBy(x => x.Dispatchtime)
+ // .FirstOrDefault();
+
+
+ //2.璋冪敤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);
+ // 3. 鏌ヨ鎵煩璁板綍
+ var opResponse = _torqueOpServer.WhetherSaveValueData(takeid, group, setpNum);
+ if (opResponse == null || !opResponse.Status || opResponse.Data == null)
+ {
+ Console.WriteLine($"WhetherSaveValueData鎺ュ彛閿欒锛歿opResponse?.Message}");
+ return;
+ }
+
+ var op = JsonConvert.DeserializeObject<List<Dt_TorqueOp>>(JsonConvert.SerializeObject(opResponse.Data)); // 纭繚杞崲姝ｇ‘
+
+
+ if (op.Any())//鍒ゆ柇鏄惁鏈夋暟鎹�
+ {
+ //鎵惧埌浜嗗氨瑕佸姣旂幇鍦╫p琛ㄤ腑鏈夊灏戞潯锛屾槸鍚﹀拰宸ヨ壓琛ㄤ腑鐨勭洰鏍囦竴鑷�
+
+ // 璁＄畻绗竴涓壄鐭╃殑鏁伴噺锛堝湪 卤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)//闃叉姝ラ涓�涓璽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}");
+ }
+ }
+
+ /// <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, string takeid)
+ {
+
+ ////璋冪敤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);
+ _torqueOpServer.AddData(Addop);
+
+
+ }
+ }
+ }
+
+ public class TorqueOpData
+ {
+ /// <summary>
+ /// 杩斿洖
+ /// </summary>
+ public List<Dt_TorqueOp> TorList { get; set; }
+ }
+
+
+
+
}
}
--
Gitblit v1.9.3