diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/test/java/com/viewsh/module/ops/environment/test/BadgeDispatchTestConfig.java b/viewsh-module-ops/viewsh-module-environment-biz/src/test/java/com/viewsh/module/ops/environment/test/BadgeDispatchTestConfig.java index f519a3f..822adc5 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/test/java/com/viewsh/module/ops/environment/test/BadgeDispatchTestConfig.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/test/java/com/viewsh/module/ops/environment/test/BadgeDispatchTestConfig.java @@ -4,6 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.viewsh.module.ops.api.queue.OrderQueueDTO; import com.viewsh.module.ops.api.queue.OrderQueueService; import com.viewsh.module.ops.core.dispatch.DispatchEngine; +import com.viewsh.module.ops.core.dispatch.DispatchEngineImpl; +import com.viewsh.module.ops.core.lifecycle.OrderLifecycleManager; +import com.viewsh.module.ops.dal.mysql.workorder.OpsOrderMapper; import com.viewsh.module.ops.environment.service.badge.BadgeDeviceStatusService; import com.viewsh.module.ops.environment.service.badge.BadgeDeviceStatusServiceImpl; import com.viewsh.module.ops.environment.service.dispatch.BadgeDeviceAreaAssignStrategy; @@ -72,12 +75,31 @@ public class BadgeDispatchTestConfig { public OrderQueueService orderQueueService() { OrderQueueService mockService = mock(OrderQueueService.class); when(mockService.getWaitingTasksByUserId(anyLong())).thenReturn(Collections.emptyList()); + when(mockService.getTasksByUserId(anyLong())).thenReturn(Collections.emptyList()); + when(mockService.getInterruptedTasksByUserId(anyLong())).thenReturn(Collections.emptyList()); return mockService; } @Bean - public DispatchEngine dispatchEngine() { - return new DispatchEngine(); + public OrderLifecycleManager orderLifecycleManager() { + return mock(OrderLifecycleManager.class); + } + + @Bean + public OpsOrderMapper opsOrderMapper() { + return mock(OpsOrderMapper.class); + } + + @Bean + public DispatchEngine dispatchEngine( + OrderLifecycleManager orderLifecycleManager, + OrderQueueService orderQueueService, + OpsOrderMapper opsOrderMapper) { + DispatchEngineImpl engine = new DispatchEngineImpl(); + setField(engine, "orderLifecycleManager", orderLifecycleManager); + setField(engine, "orderQueueService", orderQueueService); + setField(engine, "orderMapper", opsOrderMapper); + return engine; } @Bean 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 0489b85..c78fd1d 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 @@ -320,7 +320,7 @@ public class OrderLifecycleManagerImpl implements OrderLifecycleManager { // 记录业务日志 Map extra = new HashMap<>(); extra.put("cancelReason", reason); - extra.put("operatorType", operatorType != null ? operatorType.getCode() : "SYSTEM"); + extra.put("operatorType", operatorType != null ? operatorType.getType() : "SYSTEM"); eventLogRecorder.record(EventLogRecord.builder() .module("clean")