From 9790d057039546794c6cc30efdb8e09497c57096 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 十二月 2024 11:19:14 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 11 ++++++++++-
zy-acs-manager/pom.xml | 16 ++++++++--------
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/pom.xml b/zy-acs-manager/pom.xml
index 1dc9b9e..17dcf00 100644
--- a/zy-acs-manager/pom.xml
+++ b/zy-acs-manager/pom.xml
@@ -147,14 +147,14 @@
</dependency>
<!-- nd4j -->
- <dependency>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-native-platform</artifactId>
- <!-- java 8 -->
-<!-- <version>1.0.0-M1.1</version>-->
- <!-- java 11 -->
- <version>1.0.0-M2.1</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.nd4j</groupId>-->
+<!-- <artifactId>nd4j-native-platform</artifactId>-->
+<!-- <!– java 8 –>-->
+<!--<!– <version>1.0.0-M1.1</version>–>-->
+<!-- <!– java 11 –>-->
+<!-- <version>1.0.0-M2.1</version>-->
+<!-- </dependency>-->
</dependencies>
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..c612dfe 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,14 @@
public synchronized void trigger(Segment segment) {
try {
Date now = new Date();
+
+ // 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());
--
Gitblit v1.9.1