From d8fd0aa3899d757d367f33eb63e026c13ff4de1b Mon Sep 17 00:00:00 2001 From: lzh Date: Thu, 29 Jan 2026 19:01:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(ops):=20=E4=BF=AE=E5=A4=8D=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=B4=BE=E5=8D=95=E5=9C=BA=E6=99=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=97=AE=E9=A2=98=E5=B9=B6=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 修复 QueueSyncHandler 在直接派单场景下提前返回的问题 2. 修复 EventPublishHandler 日志级别便于排查 3. 统一 LogType.eventType 为大写下划线格式 Co-Authored-By: Claude (MiniMax-M2.1) --- .../lifecycle/OrderLifecycleManagerImpl.java | 2 +- .../lifecycle/handler/EventPublishHandler.java | 3 ++- .../lifecycle/handler/QueueSyncHandler.java | 3 ++- .../log/enumeration/LogType.java | 18 +++++++++--------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/OrderLifecycleManagerImpl.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/OrderLifecycleManagerImpl.java index c78fd1d..687923e 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/OrderLifecycleManagerImpl.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/OrderLifecycleManagerImpl.java @@ -146,7 +146,7 @@ public class OrderLifecycleManagerImpl implements OrderLifecycleManager { @Override @Transactional(rollbackFor = Exception.class) public OrderTransitionResult dispatch(OrderTransitionRequest request) { - log.info("工单派发: orderId={}, queueId={}", request.getOrderId(), request.getQueueId()); + log.info("工单派发: orderId={}, queueId={}, assigneeId={}", request.getOrderId(), request.getQueueId(), request.getAssigneeId()); // 设置目标状态 request.setTargetStatus(WorkOrderStatusEnum.DISPATCHED); diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/handler/EventPublishHandler.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/handler/EventPublishHandler.java index 912a6d6..788e38e 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/handler/EventPublishHandler.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/handler/EventPublishHandler.java @@ -30,7 +30,8 @@ public class EventPublishHandler extends TransitionHandler { WorkOrderStatusEnum targetStatus = request.getTargetStatus(); WorkOrderStatusEnum oldStatus = context.getOldStatus(); - log.debug("事件发布处理器: orderId={}, {} -> {}", context.getOrder().getId(), oldStatus, targetStatus); + log.info("事件发布处理器: orderId={}, {} -> {}, assigneeId={}", + context.getOrder().getId(), oldStatus, targetStatus, request.getAssigneeId()); try { // 构建事件 payload（包含 assigneeId） diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/handler/QueueSyncHandler.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/handler/QueueSyncHandler.java index 25f7892..4f96765 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/handler/QueueSyncHandler.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/core/lifecycle/handler/QueueSyncHandler.java @@ -103,7 +103,8 @@ public class QueueSyncHandler extends TransitionHandler { Long queueId = request.getQueueId(); if (queueId == null) { - log.warn("派发时缺少队列ID: orderId={}", context.getOrder().getId()); + // 直接派单场景（无队列记录），跳过队列同步，继续执行后续处理器 + log.debug("直接派单无队列记录，跳过队列同步: orderId={}", context.getOrder().getId()); return; } diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/infrastructure/log/enumeration/LogType.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/infrastructure/log/enumeration/LogType.java index a7972ec..93efae3 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/infrastructure/log/enumeration/LogType.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/infrastructure/log/enumeration/LogType.java @@ -10,42 +10,42 @@ public enum LogType { /** * 派单日志 */ - DISPATCH("dispatch", "派单"), + DISPATCH("ORDER_DISPATCHED", "派单"), /** * 状态转换日志 */ - TRANSITION("transition", "状态转换"), + TRANSITION("ORDER_STATUS_CHANGED", "状态转换"), /** * 生命周期日志 */ - LIFECYCLE("lifecycle", "生命周期"), + LIFECYCLE("ORDER_LIFECYCLE", "生命周期"), /** * 队列日志 */ - QUEUE("queue", "队列"), + QUEUE("ORDER_QUEUE_CHANGED", "队列"), /** - * 保洁员��志 + * 保洁员日志 */ - CLEANER("cleaner", "保洁员"), + CLEANER("CLEANER_ACTION", "保洁员"), /** * 设备日志 */ - DEVICE("device", "设备"), + DEVICE("DEVICE_ACTION", "设备"), /** * 通知日志 */ - NOTIFICATION("notification", "通知"), + NOTIFICATION("NOTIFICATION_SENT", "通知"), /** * 系统日志 */ - SYSTEM("system", "系统"); + SYSTEM("SYSTEM_EVENT", "系统"); private final String code; private final String description;