fix(ops): fix DispatchEngine instantiation error in test config
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled

This commit is contained in:
lzh
2026-01-24 19:20:43 +08:00
parent 850a9b1f9f
commit 7cf8e5ed2f
2 changed files with 25 additions and 3 deletions

View File

@@ -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

View File

@@ -320,7 +320,7 @@ public class OrderLifecycleManagerImpl implements OrderLifecycleManager {
// 记录业务日志
Map<String, Object> 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")