From 8d425ae26f1070043f4e81e7ebce1e6f39d5d013 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 18 十一月 2024 10:21:52 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
index 63d395e..4a605e3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
@@ -8,10 +8,7 @@
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.domain.param.HandlerPublishParam;
import com.zy.acs.manager.common.exception.BusinessException;
-import com.zy.acs.manager.core.service.AvoidWaveCalculator;
-import com.zy.acs.manager.core.service.MainService;
-import com.zy.acs.manager.core.service.ThreadPoolRegulator;
-import com.zy.acs.manager.core.service.TrafficService;
+import com.zy.acs.manager.core.service.*;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.ActionStsType;
@@ -49,6 +46,8 @@
private TaskService taskService;
@Autowired
private MainService mainService;
+ @Autowired
+ private MainLockWrapService mainLockWrapService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
@@ -113,13 +112,13 @@
if (null == endCode) {
return R.error();
}
- if (!mainService.buildMinorTask(agv, agvDetail, param.getTaskMode(), endCode.getData())) {
+ if (!mainLockWrapService.buildMinorTask(agv, param.getTaskMode(), endCode.getData(), null)) {
return R.error();
}
break;
case TO_CHARGE:
case TO_STANDBY:
- if (!mainService.buildMinorTask(agv, agvDetail, param.getTaskMode(), null)) {
+ if (!mainLockWrapService.buildMinorTask(agv, param.getTaskMode(), null, null)) {
return R.error();
}
break;
--
Gitblit v1.9.1