From 72fdccd147d416cd27c3374b25cb2f5896d86b6f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 26 三月 2025 11:35:19 +0800
Subject: [PATCH] 优化通信
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs | 57 +++++++++++++++++++++++++++++----------------------------
1 files changed, 29 insertions(+), 28 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 cab0415..bbb7260 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"
@@ -60,6 +60,8 @@
private readonly IPutakeServer _putakeServer;
private readonly ITorqueOpServer _torqueOpServer;
+ static string takeid = ""; // 鍦ㄥ惊鐜紑濮嬪墠澹版槑 takeid
+
public SerialPortJob(ITorqueOpServer torqueOpServer,IPutakeServer putakeServer,IProcessServer processServer, IPutakeRepository putakeRepository, IProcessRepository processRepository, ITorqueOpRepository torqueOpRepository, WebSocketServer webSocketContext)
{
_putakeRepository = putakeRepository;
@@ -71,6 +73,8 @@
_torqueOpServer= torqueOpServer;
}
+
+
public Task Execute(IJobExecutionContext context)
{
try
@@ -79,6 +83,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 +91,22 @@
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;//缁勫埆
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();
}
@@ -137,7 +153,11 @@
string torqueValue = ExtractTorqueValue(receiveData);//璋冪敤杞�兼柟娉�
if (group == "鐢垫皵" || group == "鍦版矡" || group == "鏈烘")
{
- SaveTorqueOpData(group, devicecode, torqueValue);
+ if (takeid != null)
+ {
+ SaveTorqueOpData(group, devicecode, torqueValue, takeid);
+ }
+
item.DeviceProParamName = CommandType.None.ToString();
}
@@ -199,20 +219,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);
@@ -335,21 +348,9 @@
/// <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鎷垮埌褰撳墠姝ラ
var process = _processServer.Getcircuit(group, takeid);
--
Gitblit v1.9.3