From 627371d0ffdf50239313f2c86d022a0c5c69550d Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 21 四月 2026 19:43:46 +0800
Subject: [PATCH] refactor(logging): 重构日志记录模块，统一使用Serilog和QuartzLogHelper
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs | 259 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 200 insertions(+), 59 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
index d2b057b..9f8efa0 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/Workflow/RobotSimpleCommandHandler.cs
@@ -1,5 +1,7 @@
+using Serilog;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.LogHelper;
+using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Tasks.Workflow.Abstractions;
namespace WIDESEAWCS_Tasks.Workflow
@@ -35,13 +37,20 @@
private readonly ISocketClientGateway _socketClientGateway;
/// <summary>
+ /// 鏃ュ織璁板綍鍣�
+ /// </summary>
+ private readonly ILogger _logger;
+
+ /// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="taskProcessor">浠诲姟澶勭悊鍣ㄥ疄渚�</param>
- public RobotSimpleCommandHandler(RobotTaskProcessor taskProcessor, ISocketClientGateway socketClientGateway)
+ /// <param name="logger">鏃ュ織璁板綍鍣�</param>
+ public RobotSimpleCommandHandler(RobotTaskProcessor taskProcessor, ISocketClientGateway socketClientGateway, ILogger logger)
{
_taskProcessor = taskProcessor;
_socketClientGateway = socketClientGateway;
+ _logger = logger;
}
/// <summary>
@@ -119,6 +128,16 @@
state.CurrentAction = "Putting";
return true;
+ // 鏄惁鐢佃姱鍒颁綅
+ case "batteryarrived":
+ state.BatteryArrived = true;
+ return true;
+
+ // 鏄惁鐢佃姱鍒颁綅
+ case "batteryarrivedno":
+ state.BatteryArrived = false;
+ return true;
+
// ==================== 鍏ㄩ儴瀹屾垚鍛戒护 ====================
// 鍏ㄩ儴鍙栬揣瀹屾垚
@@ -138,41 +157,103 @@
// 鍒ゆ柇浠诲姟绫诲瀷
var robotTaskType = (RobotTaskTypeEnum)currentTask.RobotTaskType;
- // 鎹㈢洏浠诲姟锛氫粎褰撴墍鏈夐樁娈靛畬鎴愭椂鎵嶅鐞嗗叆搴�
+ // 鎹㈢洏浠诲姟锛氭牴鎹樁娈靛尯鍒嗗鐞�
if (robotTaskType == RobotTaskTypeEnum.ChangePallet)
{
- if (state.ChangePalletPhase == 0)
+ // 璋冪敤鎵归噺鎷嗙洏纭鎺ュ彛
+ var sourcePallet = state.CurrentTask.RobotSourceAddressPalletCode;
+ var confirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet, state.RobotCrane?.DeviceName);
+ if (!confirmResult.IsSuccess)
{
- // 鎵�鏈夐樁娈靛畬鎴愶紝澶勭悊鍏ュ簱
- if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
- {
- // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
- _taskProcessor.DeleteTask(currentTask.RobotTaskId);
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
- QuartzLogger.Info($"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
-
- // 閲嶇疆鎵规鐘舵��
- state.ChangePalletPhase = 0;
- state.CurrentBatchIndex = 1;
- state.IsInFakeBatteryMode = false;
- return true;
- }
+ QuartzLogHelper.LogError(_logger, $"鎵归噺鎷嗙洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
}
- // 涓棿闃舵涓嶅鐞嗭紝浠呮洿鏂扮姸鎬�
+
+ if (state.ChangePalletPhase == 5)
+ {
+ // FlowB 鏈�缁堥樁娈碉細鍋囩數鑺彇瀹岋紝婧愮┖鎵樼洏鍥炲簱 HCSC1
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: "HCSC1"))
+ {
+ return false;
+ }
+
+ if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
+ {
+ QuartzLogHelper.LogError(_logger, $"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
+ }
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+
+ state.CurrentTask = null;
+ state.RobotTaskTotalNum = 0;
+ state.CellBarcode = new List<string>();
+ state.ChangePalletPhase = 0;
+ state.CurrentBatchIndex = 1;
+ state.IsInFakeBatteryMode = false;
+ return true;
+ }
+ else if (state.ChangePalletPhase != 0)
+ {
+ // FlowA 涓棿闃舵锛氭甯哥數鑺彇瀹岋紝婧愮┖鎵樼洏鍥炲簱 GWSC1
+ // 涓嶅垹闄や换鍔★紝涓嶉噸缃姸鎬侊紝缁х画 Phase 3-4 鍋囩數鑺祦绋�
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: "GWSC1"))
+ {
+ return false;
+ }
+ return true;
+ }
+
+ List<string> str = new List<string>() { "11001", "11010" };
+ // Phase == 0: 闈炴壒娆℃ā寮忥紙鐩爣鎬绘暟==48锛�
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: str.Contains(currentTask.RobotSourceAddressLineCode) ? "GWSC1" : "HCSC1"))
+ {
+ return false;
+ }
+
+ if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
+ {
+ QuartzLogHelper.LogError(_logger, $"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
+ }
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+
+ state.ChangePalletPhase = 0;
+ state.CurrentBatchIndex = 1;
+ state.IsInFakeBatteryMode = false;
return true;
}
// 鎷嗙洏浠诲姟锛氱洿鎺ュ鐞嗗叆搴�
if (robotTaskType == RobotTaskTypeEnum.SplitPallet)
{
- if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+ // 璋冪敤鎵归噺鎷嗙洏纭鎺ュ彛
+ var sourcePallet = state.CurrentTask.RobotSourceAddressPalletCode;
+ var confirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet, state.RobotCrane?.DeviceName);
+ if (!confirmResult.IsSuccess)
{
- // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
- _taskProcessor.DeleteTask(currentTask.RobotTaskId);
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
- QuartzLogger.Info($"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
- return true;
+ QuartzLogHelper.LogError(_logger, $"鎵归噺鎷嗙洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
}
+
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
+ {
+ return false;
+ }
+
+ // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
+ if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
+ {
+ QuartzLogHelper.LogError(_logger, $"allpickfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
+ }
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+ return true;
}
return false;
}
@@ -193,55 +274,115 @@
// 鍒ゆ柇浠诲姟绫诲瀷
var robotTaskType = (RobotTaskTypeEnum)currentTask.RobotTaskType;
- // 鎹㈢洏浠诲姟锛氫粎褰撴墍鏈夐樁娈靛畬鎴愭椂鎵嶅鐞嗗叆搴�
+ // 鎹㈢洏浠诲姟锛氭牴鎹樁娈靛尯鍒嗗鐞�
if (robotTaskType == RobotTaskTypeEnum.ChangePallet)
{
- if (state.ChangePalletPhase == 0)
+ // 璋冪敤鎵归噺缁勭洏纭鎺ュ彛
+ var targetPallet = state.CurrentTask.RobotTargetAddressPalletCode;
+ var confirmResult = _taskProcessor.PostGroupPalletConfirmAsync(targetPallet, state.RobotCrane?.DeviceName);
+ if (!confirmResult.IsSuccess)
{
- // 鎵�鏈夐樁娈靛畬鎴愶紝澶勭悊鍏ュ簱
- if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
- {
- // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
- _taskProcessor.DeleteTask(currentTask.RobotTaskId);
-
- // 娓呯悊鐘舵�侊紝涓轰笅涓�涓换鍔″仛鍑嗗
- state.CurrentTask = null; // 娓呴櫎褰撳墠浠诲姟
- state.RobotTaskTotalNum = 0; // 閲嶇疆浠诲姟璁℃暟
- state.CellBarcode = new List<string>(); // 娓呯┖鏉＄爜鍒楄〃
-
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
- QuartzLogger.Info($"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
-
- // 閲嶇疆鎵规鐘舵��
- state.ChangePalletPhase = 0;
- state.CurrentBatchIndex = 1;
- state.IsInFakeBatteryMode = false;
- return true;
- }
+ QuartzLogHelper.LogError(_logger, $"鎵归噺缁勭洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
}
- // 涓棿闃舵涓嶅鐞嗭紝浠呮洿鏂扮姸鎬�
+
+ if (state.ChangePalletPhase == 5)
+ {
+ // FlowA 鏈�缁堥樁娈碉細鍋囩數鑺斁瀹岋紝鐩爣鎵樼洏婊�48鍏ュ簱 HCSC1
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, isRoadway: "HCSC1"))
+ {
+ return false;
+ }
+
+ if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
+ {
+ QuartzLogHelper.LogError(_logger, $"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
+ }
+
+ state.CurrentTask = null;
+ state.RobotTaskTotalNum = 0;
+ state.CellBarcode = new List<string>();
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+
+ state.ChangePalletPhase = 0;
+ state.CurrentBatchIndex = 1;
+ state.IsInFakeBatteryMode = false;
+ return true;
+ }
+ else if (state.ChangePalletPhase != 0)
+ {
+ // FlowB 涓棿闃舵锛氭甯哥數鑺斁瀹岋紝鏈夎揣鎵樼洏缁勭洏鍏ュ簱 GWSC1
+ // 涓嶅垹闄や换鍔★紝涓嶉噸缃姸鎬侊紝缁х画 Phase 3-4 鍋囩數鑺祦绋�
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, isRoadway: "GWSC1"))
+ {
+ return false;
+ }
+ return true;
+ }
+
+ List<string> str = new List<string>() { "11001", "11010" };
+ // Phase == 0: 闈炴壒娆℃ā寮忥紙鐩爣鎬绘暟==48锛�
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, str.Contains(currentTask.RobotTargetAddressLineCode) ? "GWSC1" : "HCSC1"))
+ {
+ return false;
+ }
+
+ if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
+ {
+ QuartzLogHelper.LogError(_logger, $"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
+ }
+
+ state.CurrentTask = null;
+ state.RobotTaskTotalNum = 0;
+ state.CellBarcode = new List<string>();
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怱wap,diskFinished銆�", state.RobotCrane.DeviceName);
+
+ state.ChangePalletPhase = 0;
+ state.CurrentBatchIndex = 1;
+ state.IsInFakeBatteryMode = false;
return true;
}
// 缁勭洏浠诲姟锛氱洿鎺ュ鐞嗗叆搴�
if (robotTaskType == RobotTaskTypeEnum.GroupPallet)
{
+ // 璋冪敤鎵归噺缁勭洏纭鎺ュ彛
+ var targetPallet = state.CurrentTask.RobotTargetAddressPalletCode;
+ var confirmResult = _taskProcessor.PostGroupPalletConfirmAsync(targetPallet, state.RobotCrane?.DeviceName);
+ if (!confirmResult.IsSuccess)
+ {
+ QuartzLogHelper.LogError(_logger, $"鎵归噺缁勭洏纭澶辫触: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
+ }
+
// 澶勭悊鍏ュ簱浠诲姟鍥炰紶
// useSourceAddress: false 琛ㄧず浣跨敤鐩爣鍦板潃锛堢粍鐩樺満鏅級
- if (await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
+ if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
{
- // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
- _taskProcessor.DeleteTask(currentTask.RobotTaskId);
-
- // 娓呯悊鐘舵�侊紝涓轰笅涓�涓换鍔″仛鍑嗗
- state.CurrentTask = null; // 娓呴櫎褰撳墠浠诲姟
- state.RobotTaskTotalNum = 0; // 閲嶇疆浠诲姟璁℃暟
- state.CellBarcode = new List<string>(); // 娓呯┖鏉＄爜鍒楄〃
-
- await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
- QuartzLogger.Info($"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
- return true;
+ return false;
}
+
+ // 鍏ュ簱鎴愬姛锛屽垹闄や换鍔¤褰�
+ if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
+ {
+ QuartzLogHelper.LogError(_logger, $"allputfinished锛氬垹闄や换鍔¤褰曞け璐ワ紝浠诲姟鍙�: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
+ return false;
+ }
+
+ // 娓呯悊鐘舵�侊紝涓轰笅涓�涓换鍔″仛鍑嗗
+ state.CurrentTask = null; // 娓呴櫎褰撳墠浠诲姟
+ state.RobotTaskTotalNum = 0; // 閲嶇疆浠诲姟璁℃暟
+ state.CellBarcode = new List<string>(); // 娓呯┖鏉＄爜鍒楄〃
+
+ await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
+ QuartzLogHelper.LogInfo(_logger, $"鍙戦�佹秷鎭細銆怗roup,diskFinished銆�", state.RobotCrane.DeviceName);
+ return true;
}
return false;
}
--
Gitblit v1.9.3