From 4dffd21751db0dffc166da9dc940e15303d55be7 Mon Sep 17 00:00:00 2001 From: lzh Date: Thu, 26 Mar 2026 16:14:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(security):=20=E5=B7=A5=E5=8D=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=97=A5=E5=BF=97=E5=8C=BA=E5=88=86=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根据 operatorType 区分日志描述： - SYSTEM → "系统自动取消（原因）" - ADMIN → "管理员手动取消（原因）" - 其他 → "安保工单已取消（原因）" Co-Authored-By: Claude Opus 4.6 (1M context) --- .../listener/SecurityOrderEventListener.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/integration/listener/SecurityOrderEventListener.java b/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/integration/listener/SecurityOrderEventListener.java index 71b1207..d7e1d0a 100644 --- a/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/integration/listener/SecurityOrderEventListener.java +++ b/viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/integration/listener/SecurityOrderEventListener.java @@ -258,12 +258,23 @@ public class SecurityOrderEventListener { private void handleCancelled(Long orderId, OrderStateChangedEvent event) { Long operatorId = event.getOperatorId(); + OperatorTypeEnum operatorType = event.getOperatorType(); String remark = event.getRemark(); - String message = "安保工单已取消"; - if (remark != null && !remark.isEmpty()) { - message += "（" + remark + "）"; + + // 区分取消来源 + String source; + if (operatorType == OperatorTypeEnum.SYSTEM) { + source = "系统自动取消"; + } else if (operatorType == OperatorTypeEnum.ADMIN) { + source = "管理员手动取消"; + } else { + source = "安保工单已取消"; } + String message = remark != null && !remark.isEmpty() + ? source + "（" + remark + "）" + : source; + recordLog(EventDomain.DISPATCH, LogType.ORDER_CANCELLED, message, orderId, operatorId); // 取消后自动派发下一个等待工单