From 1a518d788ee36886af92b2adfcbe9e79e83ef08e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 22 一月 2026 09:44:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 c986364..ae3b643 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
@@ -21,6 +21,7 @@
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.support.TransactionTemplate;
import javax.annotation.PreDestroy;
import java.util.ArrayList;
@@ -48,6 +49,8 @@
private Thread actionPublicThread;
@Autowired
+ private TransactionTemplate txTemplate;
+ @Autowired
private AgvService agvService;
@Autowired
private BusService busService;
@@ -68,7 +71,7 @@
@Autowired
private LocService locService;
@Autowired
- private AgvModelService agvModelService;
+ private TravelService travelService;
@Autowired
private TransferStationHandler transferStationHandler;
@@ -119,13 +122,19 @@
.eq(Segment::getState, SegmentStateType.WAITING.toString())
);
for (Segment segment : segments) {
-// long startTime = System.currentTimeMillis();
- if (!transferStationHandler.hasDelayAtSta(segment)) {
- trafficService.trigger(segment);
+ if (transferStationHandler.hasDelayAtSta(segment)) {
+ continue;
+ } else {
+ travelService.clearRollerWaiting(segment.getTravelId());
}
-// log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
+ try {
+ txTemplate.executeWithoutResult(status -> {
+ trafficService.trigger(segment);
+ });
+ } catch (Exception e) {
+ log.error("trigger fail segId={}", segment.getId(), e);
+ }
}
-
} catch (Exception e) {
log.error("KernelScheduler.trafficCalcThread fail", e);
}
--
Gitblit v1.9.1