From 259509a4598f0516f583a4529e87c521d6f99450 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 六月 2025 09:39:42 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/utils/ActionSorter.java | 3 ++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java | 10 ++--------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java | 2 +-
3 files changed, 5 insertions(+), 10 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 63eeb5d..c96c8a1 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
@@ -6,7 +6,7 @@
// NONE(0),
NONE(0),
- SEVERE(5L * MapDataConstant.MAX_JAM_TIMEOUT),
+ SEVERE(10L * MapDataConstant.MAX_JAM_TIMEOUT),
;
public long duration;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java
index c6051e1..be2642d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java
@@ -91,14 +91,8 @@
if (codeGap.getCode0().equals(codeGap.getCode1())) {
return R.error("Save Fail");
}
- if (codeGapService.count(new LambdaQueryWrapper<CodeGap>()
- .eq(CodeGap::getCode0, codeGap.getCode0())
- .eq(CodeGap::getCode1, codeGap.getCode1())) > 0 ||
- codeGapService.count(new LambdaQueryWrapper<CodeGap>()
- .eq(CodeGap::getCode0, codeGap.getCode1())
- .eq(CodeGap::getCode1, codeGap.getCode0())) > 0
- ) {
- return R.error("Save Fail");
+ if (codeGapService.getById(codeGap.getId()) == null){
+ return R.error("Save Fail no data");
}
codeGap.setUpdateBy(getLoginUserId());
codeGap.setUpdateTime(new Date());
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/utils/ActionSorter.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/utils/ActionSorter.java
index 896dac7..baad783 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/utils/ActionSorter.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/utils/ActionSorter.java
@@ -47,7 +47,8 @@
}
// 鎵惧埌鏈�鍚庝竴涓� turnCorner 鍔ㄤ綔鐨勪笅鏍�
- int turnCornerIdx = findLastActionIndex(actionList, turnCorner);
+ //int turnCornerIdx = findLastActionIndex(actionList, turnCorner);
+ int turnCornerIdx = findFirstActionIndex(actionList, turnCorner);
// 鏍规嵁鏄惁鎵惧埌 turnCorner 鏉ラ�夋嫨涓嶅悓鐨勯噸鏂版帓搴忛�昏緫
if (turnCornerIdx == -1) {
--
Gitblit v1.9.1