refactor(logging): 重构日志记录模块，统一使用Serilog和QuartzLogHelper

wanshenmean

19 小时以前 627371d0ffdf50239313f2c86d022a0c5c69550d

 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>
@@ -124,6 +133,11 @@
                    state.BatteryArrived = true;
                    return true;

                // 是否电芯到位
                case "batteryarrivedno":
                    state.BatteryArrived = false;
                    return true;

                // ==================== 全部完成命令 ====================

                // 全部取货完成
@@ -151,26 +165,26 @@
                            var confirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet, state.RobotCrane?.DeviceName);
                            if (!confirmResult.IsSuccess)
                            {
                                QuartzLogger.Error($"批量拆盘确认失败: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                QuartzLogHelper.LogError(_logger, $"批量拆盘确认失败: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                return false;
                            }

                            if (state.ChangePalletPhase == 5)
                            {
                                // FlowB 最终阶段：假电芯取完，源空托盘回库 HCSC1
                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: "HCSC1"))
                                {
                                    return false;
                                }

                                if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                                {
                                    QuartzLogger.Error($"allpickfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                    QuartzLogHelper.LogError(_logger, $"allpickfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                    return false;
                                }

                                await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
                                QuartzLogger.Info($"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);
                                QuartzLogHelper.LogInfo(_logger, $"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);

                                state.CurrentTask = null;
                                state.RobotTaskTotalNum = 0;
@@ -184,27 +198,28 @@
                            {
                                // FlowA 中间阶段：正常电芯取完，源空托盘回库 GWSC1
                                // 不删除任务，不重置状态，继续 Phase 3-4 假电芯流程
                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true))
                                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))
                            if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: true, isRoadway: str.Contains(currentTask.RobotSourceAddressLineCode) ? "GWSC1" : "HCSC1"))
                            {
                                return false;
                            }

                            if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                            {
                                QuartzLogger.Error($"allpickfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                QuartzLogHelper.LogError(_logger, $"allpickfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                return false;
                            }

                            await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
                            QuartzLogger.Info($"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);
                            QuartzLogHelper.LogInfo(_logger, $"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);

                            state.ChangePalletPhase = 0;
                            state.CurrentBatchIndex = 1;
@@ -220,7 +235,7 @@
                            var confirmResult = _taskProcessor.PostSplitPalletConfirmAsync(sourcePallet, state.RobotCrane?.DeviceName);
                            if (!confirmResult.IsSuccess)
                            {
                                QuartzLogger.Error($"批量拆盘确认失败: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                QuartzLogHelper.LogError(_logger, $"批量拆盘确认失败: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                return false;
                            }

@@ -232,12 +247,12 @@
                            // 入库成功，删除任务记录
                            if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                            {
                                QuartzLogger.Error($"allpickfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                QuartzLogHelper.LogError(_logger, $"allpickfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                return false;
                            }

                            await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
                            QuartzLogger.Info($"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);
                            QuartzLogHelper.LogInfo(_logger, $"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);
                            return true;
                        }
                        return false;
@@ -267,21 +282,21 @@
                            var confirmResult = _taskProcessor.PostGroupPalletConfirmAsync(targetPallet, state.RobotCrane?.DeviceName);
                            if (!confirmResult.IsSuccess)
                            {
                                QuartzLogger.Error($"批量组盘确认失败: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                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))
                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, isRoadway: "HCSC1"))
                                {
                                    return false;
                                }

                                if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                                {
                                    QuartzLogger.Error($"allputfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                    QuartzLogHelper.LogError(_logger, $"allputfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                    return false;
                                }

@@ -290,7 +305,7 @@
                                state.CellBarcode = new List<string>();

                                await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
                                QuartzLogger.Info($"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);
                                QuartzLogHelper.LogInfo(_logger, $"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);

                                state.ChangePalletPhase = 0;
                                state.CurrentBatchIndex = 1;
@@ -301,22 +316,23 @@
                            {
                                // FlowB 中间阶段：正常电芯放完，有货托盘组盘入库 GWSC1
                                // 不删除任务，不重置状态，继续 Phase 3-4 假电芯流程
                                if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false))
                                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))
                            if (!await _taskProcessor.HandleInboundTaskAsync(state, useSourceAddress: false, str.Contains(currentTask.RobotTargetAddressLineCode) ? "GWSC1" : "HCSC1"))
                            {
                                return false;
                            }

                            if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                            {
                                QuartzLogger.Error($"allputfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                QuartzLogHelper.LogError(_logger, $"allputfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                return false;
                            }

@@ -325,7 +341,7 @@
                            state.CellBarcode = new List<string>();

                            await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Swap,diskFinished");
                            QuartzLogger.Info($"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);
                            QuartzLogHelper.LogInfo(_logger, $"发送消息：【Swap,diskFinished】", state.RobotCrane.DeviceName);

                            state.ChangePalletPhase = 0;
                            state.CurrentBatchIndex = 1;
@@ -341,7 +357,7 @@
                            var confirmResult = _taskProcessor.PostGroupPalletConfirmAsync(targetPallet, state.RobotCrane?.DeviceName);
                            if (!confirmResult.IsSuccess)
                            {
                                QuartzLogger.Error($"批量组盘确认失败: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                QuartzLogHelper.LogError(_logger, $"批量组盘确认失败: {confirmResult.ErrorMessage}", state.RobotCrane?.DeviceName ?? "Unknown");
                                return false;
                            }

@@ -355,7 +371,7 @@
                            // 入库成功，删除任务记录
                            if (_taskProcessor.DeleteTask(currentTask.RobotTaskId) != true)
                            {
                                QuartzLogger.Error($"allputfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                QuartzLogHelper.LogError(_logger, $"allputfinished：删除任务记录失败，任务号: {currentTask.RobotTaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
                                return false;
                            }

@@ -365,7 +381,7 @@
                            state.CellBarcode = new List<string>();  // 清空条码列表

                            await _socketClientGateway.SendToClientAsync(state.IPAddress, $"Group,diskFinished");
                            QuartzLogger.Info($"发送消息：【Group,diskFinished】", state.RobotCrane.DeviceName);
                            QuartzLogHelper.LogInfo(_logger, $"发送消息：【Group,diskFinished】", state.RobotCrane.DeviceName);
                            return true;
                        }
                        return false;