From 478aa1b99100ce75757e6aad96457d4b769474f4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 30 十二月 2024 16:33:10 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 76a5f58..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
@@ -77,6 +77,12 @@
         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) {
@@ -114,12 +120,6 @@
                     .eq(Jam::getCycleCode, endNode)
                     .eq(Jam::getState, JamStateType.RUNNING.toString())
             ) > 0) {
-                return;
-            }
-
-            // deprecate jam
-            if (this.isExpiredJamByAvo(segment.getId())) {
-                mainService.settleSegmentList(Utils.singletonList(segment), null);
                 return;
             }
 

--
Gitblit v1.9.1