From d77edc6de3ffe93afd5680953759fff556b5ca73 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 03 一月 2025 08:30:05 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index cba4c70..8f7ed9f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -20,6 +20,7 @@
import com.zy.acs.manager.manager.enums.SegmentStateType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.service.*;
+import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -65,7 +66,7 @@
@Autowired
private RetreatNavigateService retreatNavigateService;
@Autowired
- private TaskService taskService;
+ private ConfigService configService;
@Autowired
private JamService jamService;
@Autowired
@@ -75,6 +76,20 @@
public synchronized void trigger(Segment segment) {
try {
Date now = new Date();
+
+ // deprecate jam
+ if (this.isExpiredJamByAvo(segment.getId())) {
+ mainService.settleSegmentList(Utils.singletonList(segment), null);
+ return;
+ }
+
+ // temporary -----------------
+ Integer algoExtensionTime = configService.getVal("algoExtensionTime", Integer.class);
+ if (null != algoExtensionTime && algoExtensionTime > 0) {
+ Thread.sleep(algoExtensionTime);
+ }
+ // ---------------------------
+
Travel travel = travelService.getById(segment.getTravelId());
Agv agv = agvService.getById(travel.getAgvId());
AgvDetail agvDetail = agvDetailService.selectByAgvId(travel.getAgvId());
@@ -108,17 +123,14 @@
return;
}
- // deprecate jam
- if (this.isExpiredJamByAvo(segment.getId())) {
- mainService.settleSegmentList(Utils.singletonList(segment), null);
- return;
- }
-
// execute -----------------------------------------------
// ArrayList<List<TaskPosDto>> list = JSON.parseObject(travel.getTaskContent(), new TypeReference<ArrayList<List<TaskPosDto>>>() {});
- // get path list
- avoidWaveCalculator.calcWaveScope(); // * sync wave scope
+ // * sync wave scope
+ if (!avoidWaveCalculator.calcWaveScope()) {
+ log.error("failed to calculate avoid wave matrix ...");
+ return;
+ }
// checkout path
Code startCode = codeService.getById(agvDetail.getRecentCode());
--
Gitblit v1.9.1