1
zhang
2025-06-23 259509a4598f0516f583a4529e87c521d6f99450
1
3个文件已修改
15 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/type/BlockSeverityType.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeGapController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/utils/ActionSorter.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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());
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) {