XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ops): 修复队列脏数据导致工单永远排队无法派发

Browse Source 
问题：autoCompleteOrder 直接调用 orderStateMachine.forceTransition，
绕过责任链导致队列记录残留 WAITING，autoDispatchNext 反复命中脏数据
失败，人员状态永远 BUSY，新工单全部 ENQUEUE_ONLY 形成死循环。

修复：
1. SecurityOrderServiceImpl 所有状态操作统一走 OrderLifecycleManager，
   移除对 OrderStateMachine 的直接依赖
2. autoDispatchNext 增加循环遍历 + 工单状态校验，跳过并清理非 QUEUED
   的脏队列记录，增加 maxSkip=50 防护上限
3. forceComplete 返回值校验，失败时抛异常而非静默继续

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
lzh
2026-03-26 15:30:02 +08:00
parent 8406a80655
commit bd70f3bc8a
3 changed files with 129 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
viewsh-module-ops/viewsh-module-security-biz/src/main/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderServiceImpl.java
View File

@@ -22,7 +22,9 @@ import com.viewsh.module.ops.infrastructure.log.recorder.EventLogRecord;
import com.viewsh.module.ops.infrastructure.log.recorder.EventLogRecorder;
import com.viewsh.module.ops.security.dal.dataobject.workorder.OpsOrderSecurityExtDO;
import com.viewsh.module.ops.security.dal.mysql.workorder.OpsOrderSecurityExtMapper;
import com.viewsh.module.ops.service.fsm.OrderStateMachine;
import com.viewsh.module.ops.core.lifecycle.OrderLifecycleManager;
import com.viewsh.module.ops.core.lifecycle.model.OrderTransitionRequest;
import com.viewsh.module.ops.core.lifecycle.model.OrderTransitionResult;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -62,7 +64,7 @@ public class SecurityOrderServiceImpl implements SecurityOrderService {
private AreaPathBuilder areaPathBuilder;
@Resource
private OrderStateMachine orderStateMachine;
private OrderLifecycleManager orderLifecycleManager;
@Resource
private EventLogRecorder eventLogRecorder;
@@ -151,9 +153,15 @@ public class SecurityOrderServiceImpl implements SecurityOrderService {
// 如果 userId 为 null（open-api 调用），取已分配人员
Long effectiveUserId = resolveOperatorId(orderId, userId);
// 状态转换：DISPATCHED → CONFIRMED（扩展表时间 + 业务日志由 EventListener 统一记录）
orderStateMachine.transition(order, WorkOrderStatusEnum.CONFIRMED,
OperatorTypeEnum.SECURITY_GUARD, effectiveUserId, "安保人员确认接单");
// 状态转换：DISPATCHED → CONFIRMED（走完整责任链，确保队列同步 + 事件发布）
OrderTransitionRequest request = OrderTransitionRequest.builder()
.orderId(orderId)
.targetStatus(WorkOrderStatusEnum.CONFIRMED)
.operatorType(OperatorTypeEnum.SECURITY_GUARD)
.operatorId(effectiveUserId)
.reason("安保人员确认接单")
.build();
orderLifecycleManager.transition(request);
log.info("安保工单确认: orderId={}, userId={}", orderId, effectiveUserId);
}
@@ -172,15 +180,19 @@ public class SecurityOrderServiceImpl implements SecurityOrderService {
log.info("安保工单已处于终态，跳过自动完单: orderId={}, status={}", orderId, currentStatus);
return;
}
// 2. PENDING：未派单，直接取消（PENDING → CANCELLED 规则已支持）
// 2. PENDING：未派单，直接取消（PENDING → CANCELLED 是合法转换）
if (currentStatus == WorkOrderStatusEnum.PENDING) {
orderStateMachine.transition(order, WorkOrderStatusEnum.CANCELLED,
OperatorTypeEnum.SYSTEM, null, effectiveRemark + "（工单未派单）");
orderLifecycleManager.cancelOrder(orderId, null, OperatorTypeEnum.SYSTEM,
effectiveRemark + "（工单未派单）");
}
// 3. 其他非终态（DISPATCHED / CONFIRMED / ARRIVED / PAUSED）→ 强制跳转 COMPLETED
// 3. 其他非终态（QUEUED / DISPATCHED / CONFIRMED / ARRIVED / PAUSED）
// 通过 forceComplete 走完整责任链（队列清理 + 事件发布），避免脏数据残留
else {
orderStateMachine.forceTransition(order, WorkOrderStatusEnum.COMPLETED,
OperatorTypeEnum.SYSTEM, null, effectiveRemark);
OrderTransitionResult result = orderLifecycleManager.forceComplete(
orderId, null, OperatorTypeEnum.SYSTEM, effectiveRemark);
if (!result.isSuccess()) {
throw new IllegalStateException("强制完成工单失败: " + result.getMessage());
}
}
log.info("安保工单自动结单: orderId={}, 原始状态={}", orderId, currentStatus);
@@ -211,9 +223,9 @@ public class SecurityOrderServiceImpl implements SecurityOrderService {
// 如果 operatorId 为 null（open-api 调用），取已分配人员
Long effectiveOperatorId = resolveOperatorId(req.getOrderId(), req.getOperatorId());
// 状态转换 → COMPLETED（扩展表 completedTime + 业务日志由 EventListener 统一记录，主表 endTime 由状态机统一设置）
orderStateMachine.transition(order, WorkOrderStatusEnum.COMPLETED,
OperatorTypeEnum.SECURITY_GUARD, effectiveOperatorId, "安保人员提交处理结果");
// 状态转换 → COMPLETED（走完整责任链，确保队列同步 + 事件发布）
orderLifecycleManager.completeOrder(req.getOrderId(), effectiveOperatorId,
OperatorTypeEnum.SECURITY_GUARD, "安保人员提交处理结果");
// 更新扩展表：结果 + 图片
OpsOrderSecurityExtDO extUpdate = new OpsOrderSecurityExtDO();

112
viewsh-module-ops/viewsh-module-security-biz/src/test/java/com/viewsh/module/ops/security/service/securityorder/SecurityOrderServiceTest.java
View File

@@ -13,7 +13,9 @@ import com.viewsh.module.ops.infrastructure.code.OrderCodeGenerator;
import com.viewsh.module.ops.infrastructure.id.OrderIdGenerator;
import com.viewsh.module.ops.security.dal.dataobject.workorder.OpsOrderSecurityExtDO;
import com.viewsh.module.ops.security.dal.mysql.workorder.OpsOrderSecurityExtMapper;
import com.viewsh.module.ops.service.fsm.OrderStateMachine;
import com.viewsh.module.ops.core.lifecycle.OrderLifecycleManager;
import com.viewsh.module.ops.core.lifecycle.model.OrderTransitionRequest;
import com.viewsh.module.ops.core.lifecycle.model.OrderTransitionResult;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -52,7 +54,7 @@ public class SecurityOrderServiceTest {
@Mock
private OrderEventPublisher orderEventPublisher;
@Mock
private OrderStateMachine orderStateMachine;
private OrderLifecycleManager orderLifecycleManager;
// 模拟数据库
private Map<Long, OpsOrderDO> orderDB;
@@ -199,14 +201,14 @@ public class SecurityOrderServiceTest {
// 执行
securityOrderService.confirmOrder(TEST_ORDER_ID, userId);
// 验证状态机调用
verify(orderStateMachine).transition(
eq(order),
eq(WorkOrderStatusEnum.CONFIRMED),
eq(OperatorTypeEnum.SECURITY_GUARD),
eq(userId),
eq("安保人员确认接单")
);
// 验证走 orderLifecycleManager.transition()
ArgumentCaptor<OrderTransitionRequest> reqCaptor = ArgumentCaptor.forClass(OrderTransitionRequest.class);
verify(orderLifecycleManager).transition(reqCaptor.capture());
OrderTransitionRequest capturedReq = reqCaptor.getValue();
assertEquals(TEST_ORDER_ID, capturedReq.getOrderId());
assertEquals(WorkOrderStatusEnum.CONFIRMED, capturedReq.getTargetStatus());
assertEquals(OperatorTypeEnum.SECURITY_GUARD, capturedReq.getOperatorType());
assertEquals(userId, capturedReq.getOperatorId());
// 验证不再直接写扩展表时间（由 EventListener 统一处理）
verify(securityExtMapper, never()).insertOrUpdateSelective(any());
@@ -235,9 +237,8 @@ public class SecurityOrderServiceTest {
() -> securityOrderService.confirmOrder(TEST_ORDER_ID, 2001L));
assertTrue(exception.getMessage().contains("工单类型不匹配"));
// 验证状态机未被调用
verify(orderStateMachine, never()).transition(
any(), any(), any(), anyLong(), anyString());
// 验证 lifecycleManager 未被调用
verify(orderLifecycleManager, never()).transition(any(OrderTransitionRequest.class));
}
// ==================== 自动完单测试 ====================
@@ -247,21 +248,21 @@ public class SecurityOrderServiceTest {
// 准备
OpsOrderDO order = buildSecurityOrder(TEST_ORDER_ID, WorkOrderStatusEnum.ARRIVED);
orderDB.put(TEST_ORDER_ID, order);
when(orderLifecycleManager.forceComplete(anyLong(), any(), any(), anyString()))
.thenReturn(OrderTransitionResult.builder().success(true).orderId(TEST_ORDER_ID).build());
// 执行
securityOrderService.autoCompleteOrder(TEST_ORDER_ID, "告警自动解除");
// 验证状态机调用（ARRIVED 非终态，走 forceTransition）
verify(orderStateMachine).forceTransition(
eq(order),
eq(WorkOrderStatusEnum.COMPLETED),
eq(OperatorTypeEnum.SYSTEM),
// 验证走 forceComplete（完整责任链）
verify(orderLifecycleManager).forceComplete(
eq(TEST_ORDER_ID),
isNull(),
eq(OperatorTypeEnum.SYSTEM),
eq("告警自动解除")
);
// 验证不直接写扩展表
verify(securityExtMapper, never()).insertOrUpdateSelective(any());
// 验证不直接调用 orderStateMachine（已完全移除依赖）
}
@Test
@@ -269,14 +270,16 @@ public class SecurityOrderServiceTest {
// 准备
OpsOrderDO order = buildSecurityOrder(TEST_ORDER_ID, WorkOrderStatusEnum.ARRIVED);
orderDB.put(TEST_ORDER_ID, order);
when(orderLifecycleManager.forceComplete(anyLong(), any(), any(), anyString()))
.thenReturn(OrderTransitionResult.builder().success(true).orderId(TEST_ORDER_ID).build());
// 执行：remark 为空
securityOrderService.autoCompleteOrder(TEST_ORDER_ID, null);
// 验证使用默认备注
verify(orderStateMachine).forceTransition(
any(), eq(WorkOrderStatusEnum.COMPLETED),
eq(OperatorTypeEnum.SYSTEM), isNull(),
verify(orderLifecycleManager).forceComplete(
eq(TEST_ORDER_ID), isNull(),
eq(OperatorTypeEnum.SYSTEM),
eq("系统自动完单")
);
}
@@ -286,14 +289,16 @@ public class SecurityOrderServiceTest {
// 准备
OpsOrderDO order = buildSecurityOrder(TEST_ORDER_ID, WorkOrderStatusEnum.ARRIVED);
orderDB.put(TEST_ORDER_ID, order);
when(orderLifecycleManager.forceComplete(anyLong(), any(), any(), anyString()))
.thenReturn(OrderTransitionResult.builder().success(true).orderId(TEST_ORDER_ID).build());
// 执行：remark 为空白字符串
securityOrderService.autoCompleteOrder(TEST_ORDER_ID, " ");
// 验证使用默认备注
verify(orderStateMachine).forceTransition(
any(), eq(WorkOrderStatusEnum.COMPLETED),
eq(OperatorTypeEnum.SYSTEM), isNull(),
verify(orderLifecycleManager).forceComplete(
eq(TEST_ORDER_ID), isNull(),
eq(OperatorTypeEnum.SYSTEM),
eq("系统自动完单")
);
}
@@ -313,16 +318,15 @@ public class SecurityOrderServiceTest {
// 执行
securityOrderService.autoCompleteOrder(TEST_ORDER_ID, "告警自动解除");
// 验证：走正常 transition → CANCELLED
verify(orderStateMachine).transition(
eq(order),
eq(WorkOrderStatusEnum.CANCELLED),
eq(OperatorTypeEnum.SYSTEM),
// 验证：走 cancelOrder（完整责任链）
verify(orderLifecycleManager).cancelOrder(
eq(TEST_ORDER_ID),
isNull(),
eq(OperatorTypeEnum.SYSTEM),
eq("告警自动解除（工单未派单）")
);
// 不应调用 forceTransition
verify(orderStateMachine, never()).forceTransition(any(), any(), any(), any(), any());
// 不应调用 forceComplete
verify(orderLifecycleManager, never()).forceComplete(anyLong(), any(), any(), anyString());
}
@Test
@@ -330,16 +334,17 @@ public class SecurityOrderServiceTest {
// 准备：DISPATCHED 状态工单
OpsOrderDO order = buildSecurityOrder(TEST_ORDER_ID, WorkOrderStatusEnum.DISPATCHED);
orderDB.put(TEST_ORDER_ID, order);
when(orderLifecycleManager.forceComplete(anyLong(), any(), any(), anyString()))
.thenReturn(OrderTransitionResult.builder().success(true).orderId(TEST_ORDER_ID).build());
// 执行
securityOrderService.autoCompleteOrder(TEST_ORDER_ID, "告警自动解除");
// 验证：走 forceTransition → COMPLETED
verify(orderStateMachine).forceTransition(
eq(order),
eq(WorkOrderStatusEnum.COMPLETED),
eq(OperatorTypeEnum.SYSTEM),
// 验证：走 forceComplete → COMPLETED（通过完整责任链）
verify(orderLifecycleManager).forceComplete(
eq(TEST_ORDER_ID),
isNull(),
eq(OperatorTypeEnum.SYSTEM),
eq("告警自动解除")
);
}
@@ -353,9 +358,9 @@ public class SecurityOrderServiceTest {
// 执行：不应抛异常
securityOrderService.autoCompleteOrder(TEST_ORDER_ID, "告警自动解除");
// 验证：状态机未被调用
verify(orderStateMachine, never()).transition(any(), any(), any(), any(), any());
verify(orderStateMachine, never()).forceTransition(any(), any(), any(), any(), any());
// 验证：生命周期管理器未被调用
verify(orderLifecycleManager, never()).forceComplete(anyLong(), any(), any(), anyString());
verify(orderLifecycleManager, never()).cancelOrder(anyLong(), any(), any(), anyString());
}
@Test
@@ -363,16 +368,17 @@ public class SecurityOrderServiceTest {
// 准备：DISPATCHED 状态工单
OpsOrderDO order = buildSecurityOrder(TEST_ORDER_ID, WorkOrderStatusEnum.DISPATCHED);
orderDB.put(TEST_ORDER_ID, order);
when(orderLifecycleManager.forceComplete(anyLong(), any(), any(), anyString()))
.thenReturn(OrderTransitionResult.builder().success(true).orderId(TEST_ORDER_ID).build());
// 执行
securityOrderService.falseAlarmOrder(TEST_ORDER_ID);
// 验证：forceTransition 被调用（通过 autoCompleteOrder 委托）
verify(orderStateMachine).forceTransition(
eq(order),
eq(WorkOrderStatusEnum.COMPLETED),
eq(OperatorTypeEnum.SYSTEM),
// 验证：forceComplete 被调用（通过 autoCompleteOrder 委托）
verify(orderLifecycleManager).forceComplete(
eq(TEST_ORDER_ID),
isNull(),
eq(OperatorTypeEnum.SYSTEM),
eq("误报")
);
@@ -403,12 +409,11 @@ public class SecurityOrderServiceTest {
// 执行
securityOrderService.manualCompleteOrder(req);
// 验证状态机调用
verify(orderStateMachine).transition(
eq(order),
eq(WorkOrderStatusEnum.COMPLETED),
eq(OperatorTypeEnum.SECURITY_GUARD),
// 验证走 orderLifecycleManager.completeOrder()
verify(orderLifecycleManager).completeOrder(
eq(TEST_ORDER_ID),
eq(2001L),
eq(OperatorTypeEnum.SECURITY_GUARD),
eq("安保人员提交处理结果")
);
@@ -421,11 +426,6 @@ public class SecurityOrderServiceTest {
assertNotNull(extUpdate.getResultImgUrls());
assertTrue(extUpdate.getResultImgUrls().contains("result1.jpg"));
assertNull(extUpdate.getCompletedTime()); // 时间由 EventListener 写入
// 验证主表 endTime 更新
ArgumentCaptor<OpsOrderDO> orderUpdateCaptor = ArgumentCaptor.forClass(OpsOrderDO.class);
verify(opsOrderMapper).updateById(orderUpdateCaptor.capture());
assertNotNull(orderUpdateCaptor.getValue().getEndTime());
}
@Test