From 7fd4327861ee2b36af01ff526742b0704f713ccc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 十一月 2024 15:00:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java
index 0c9c493..94ff2a4 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java
@@ -1,10 +1,12 @@
package com.zy.acs.manager.core.domain.type;
+import com.zy.acs.manager.core.service.TrafficService;
+
public enum BlockSeverityType {
// NONE(0),
NONE(0),
- SEVERE(30000),
+ SEVERE(9 * TrafficService.MAX_JAM_TIMEOUT),
;
public long duration;
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 cd825ca..acfe085 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
@@ -277,7 +277,7 @@
if (!Cools.isEmpty(jam.getAvoAgv())
&& BlockVehicleDto.customContain(blockVehicleList, agvService.getById(jam.getAvoAgv()).getUuid())) {
- maxJamTimeoutFactor = 10;
+ maxJamTimeoutFactor = 6;
} else {
--
Gitblit v1.9.1