feat: 添加Quartz日志助手类并重构任务服务日志记录

wanshenmean

18 小时以前 c5c3e4e538a11f2a6391e6b2613375b1f92eb20a

 Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -10,6 +10,7 @@
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_QuartzJob.StackerCrane;
using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
using WIDESEAWCS_Common.Constants;
using WIDESEAWCS_Tasks.StackerCraneJob;

namespace WIDESEAWCS_Tasks
@@ -173,8 +174,7 @@
                if (!flag || value is not CommonStackerCrane commonStackerCrane)
                {
                    // 参数无效，直接返回
                    _logger.LogWarning("Execute：参数无效");
                    QuartzLogger.Warn("Execute：参数无效", "CommonStackerCraneJob");
                    QuartzLogHelper.LogWarn(_logger, "Execute：参数无效", "Execute：参数无效", "CommonStackerCraneJob");
                    return Task.CompletedTask;
                }

@@ -185,8 +185,7 @@
                {
                    // 绑定任务完成事件处理方法
                    commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;
                    _logger.LogInformation("Execute：订阅任务完成事件，设备: {DeviceCode}", _deviceCode);
                    QuartzLogger.Info($"订阅任务完成事件", _deviceCode);
                    QuartzLogHelper.LogInfo(_logger, "Execute：订阅任务完成事件，设备: {DeviceCode}", "订阅任务完成事件", _deviceCode, _deviceCode);
                }

                // ========== 检查堆垛机任务完成状态 ==========
@@ -196,11 +195,11 @@

                // ========== 检查是否可以发送新任务 ==========
                //if (!commonStackerCrane.IsCanSendTask(commonStackerCrane.Communicator, commonStackerCrane.DeviceProDTOs, commonStackerCrane.DeviceProtocolDetailDTOs))
                if (commonStackerCrane.StackerCraneStatusValue != StackerCraneStatus.Normal)
                if (commonStackerCrane.StackerCraneStatusValue != StackerCraneStatus.Normal /*&& commonStackerCrane.StackerCraneAutoStatusValue != StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneWorkStatusValue != StackerCraneWorkStatus.Standby*/)
                {
                    // 堆垛机不可用（如正在执行上一任务），直接返回
                    _logger.LogDebug("Execute：堆垛机不可用，设备: {DeviceCode}", _deviceCode);
                    QuartzLogger.Debug($"堆垛机不可用，设备: {_deviceCode}", _deviceCode);
                    //_logger.LogDebug("Execute：堆垛机不可用，设备: {DeviceCode}", _deviceCode);
                    //QuartzLogger.Debug($"堆垛机不可用，设备: {_deviceCode}", _deviceCode);
                    return Task.CompletedTask;
                }

@@ -224,8 +223,7 @@
                if (stackerCraneTaskCommand == null)
                {
                    // 命令构建失败
                    _logger.LogWarning("Execute：命令构建失败，设备: {DeviceCode}，任务号: {TaskNum}", _deviceCode, task.TaskNum);
                    QuartzLogger.Warn($"命令构建失败，任务号: {task.TaskNum}", _deviceCode);
                    QuartzLogHelper.LogWarn(_logger, "Execute：命令构建失败，设备: {DeviceCode}，任务号: {TaskNum}", $"命令构建失败，任务号: {task.TaskNum}", _deviceCode, _deviceCode, task.TaskNum);
                    return Task.CompletedTask;
                }

@@ -234,25 +232,22 @@
                if (sendFlag)
                {
                    Task.Delay(1000).Wait();
                    commonStackerCrane.SetValue(StackerCraneDBName.WorkAction, (short)1);
                    commonStackerCrane.SetValue(StackerCraneDBName.WorkAction, (short)StackerCraneWorkActionEnum.StartTask);
                    // 发送成功，更新状态
                    commonStackerCrane.LastTaskType = task.TaskType;
                    _taskService.UpdateTaskStatusToNext(task.TaskNum);

                    _logger.LogInformation("Execute：命令发送成功，设备: {DeviceCode}，任务号: {TaskNum}", _deviceCode, task.TaskNum);
                    QuartzLogger.Info($"命令发送成功，任务号: {task.TaskNum}", _deviceCode);
                    QuartzLogHelper.LogInfo(_logger, "Execute：命令发送成功，设备: {DeviceCode}，任务号: {TaskNum}", $"命令发送成功，任务号: {task.TaskNum}", _deviceCode, _deviceCode, task.TaskNum);
                }
                else
                {
                    _logger.LogError("Execute：命令发送失败，设备: {DeviceCode}，任务号: {TaskNum}", _deviceCode, task.TaskNum);
                    QuartzLogger.Error($"命令发送失败", _deviceCode);
                    QuartzLogHelper.LogError(_logger, "Execute：命令发送失败，设备: {DeviceCode}，任务号: {TaskNum}", $"命令发送失败", _deviceCode, _deviceCode, task.TaskNum);
                }
            }
            catch (Exception ex)
            {
                // 记录异常
                _logger.LogError(ex, "Execute：执行异常，设备: {DeviceCode}", _deviceCode);
                QuartzLogger.Error($"执行异常: {ex.Message}", _deviceCode, ex);
                QuartzLogHelper.LogError(_logger, ex, "Execute：执行异常，设备: {DeviceCode}", $"执行异常: {ex.Message}", _deviceCode, _deviceCode);
            }

            return Task.CompletedTask;
@@ -276,14 +271,13 @@
            if (stackerCrane != null)
            {
                // 记录日志
                _logger.LogInformation("CommonStackerCrane_StackerCraneTaskCompletedEventHandler：任务完成，任务号: {TaskNum}", e.TaskNum);
                QuartzLogger.Info($"任务完成，任务号: {e.TaskNum}", stackerCrane.DeviceCode);
                QuartzLogHelper.LogInfo(_logger, "CommonStackerCrane_StackerCraneTaskCompletedEventHandler：任务完成，任务号: {TaskNum}", $"任务完成，任务号: {e.TaskNum}", stackerCrane.DeviceCode, e.TaskNum);

                // 更新任务状态为完成
                if (_taskService.StackCraneTaskCompleted(e.TaskNum).Status)
                {
                    // 清除堆垛机的作业指令（设置为 2，表示空闲）
                    stackerCrane.SetValue(StackerCraneDBName.WorkAction, 2);
                    // 清除堆垛机的作业指令（设置为空闲）
                    stackerCrane.SetValue(StackerCraneDBName.WorkAction, (short)StackerCraneWorkActionEnum.TaskComplete);
                }
            }
        }