#

luxiaotao1123

2025-01-08 02b49844456ea3e650edcf03d8d6a5bad6ba9aed

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java

@@ -1,19 +1,16 @@
package com.zy.acs.manager.core.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.MapDataUtils;
import com.zy.acs.manager.core.constant.MapDataConstant;
import com.zy.acs.manager.core.domain.Lane;
import com.zy.acs.manager.core.service.astart.*;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.core.utils.RouteGenerator;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.entity.Route;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.enums.JamStateType;
import com.zy.acs.manager.manager.service.*;
@@ -39,8 +36,6 @@

    @Autowired
    private CodeService codeService;
    @Autowired
    private RouteService routeService;
    @Autowired
    private MapDataDispatcher mapDataDispatcher;
    @Autowired
@@ -113,7 +108,7 @@
                        if (!Cools.isEmpty(blackList) && blackList.contains(otherWave)) {
                            continue label;
                        }
                        if (1 < mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size()) {
                        if (1 < mapService.queryCodeListFromDynamicNode(lev, otherWave).size()) {
                            phaseSecond = false;    // there is a running way
                            continue label;
                        } else {
@@ -269,7 +264,7 @@
                            if (!Cools.isEmpty(blackList) && blackList.contains(otherWave)) {
                                continue;
                            }
                            if (1 < mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size()) {
                            if (1 < mapService.queryCodeListFromDynamicNode(lev, otherWave).size()) {

                                if (null != availablePointOfTurn && actualLanesOfTurn > 0) {
                                    actualLanesOfTurn --;