From 7ac5a3f2bcbb0d0e13dc87cd969c8fb1fd99b488 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期日, 04 一月 2026 10:38:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
index 0bf08bd..230a977 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -5,6 +5,7 @@
import com.zy.acs.manager.core.service.MainLockWrapService;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.core.service.TrafficService;
+import com.zy.acs.manager.core.service.TransferStationHandler;
import com.zy.acs.manager.manager.entity.Bus;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Task;
@@ -68,6 +69,8 @@
private LocService locService;
@Autowired
private AgvModelService agvModelService;
+ @Autowired
+ private TransferStationHandler transferStationHandler;
@Scheduled(cron = "0/1 * * * * ? ")
private void startupBus() throws InterruptedException {
@@ -116,12 +119,15 @@
.eq(Segment::getState, SegmentStateType.WAITING.toString())
);
for (Segment segment : segments) {
- long startTime = System.currentTimeMillis();
- trafficService.trigger(segment);
+// long startTime = System.currentTimeMillis();
+ if (!transferStationHandler.hasDelayAtSta(segment)) {
+ trafficService.trigger(segment);
+ }
// log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
}
} catch (Exception e) {
+ // todo test TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("KernelScheduler.trafficCalcThread fail", e);
}
}
--
Gitblit v1.9.1