#
luxiaotao1123
2025-05-06 70f422e83f0754bd39a565fdc271bb08b1086266
#
4个文件已修改
16 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java
@@ -610,6 +610,7 @@
        add("00001435");
        add("00001436");
        add("00001437");
        add("00001716");
    }};
    public static final ArrayList<String> MIDDLE_AREA  = new ArrayList<String>(){{
@@ -976,6 +977,7 @@
        add("00001040");
        add("00001041");
        add("00001042");
        add("00001713");
    }};
    public static final ArrayList<String> RIGHT_AREA  = new ArrayList<String>(){{
@@ -1340,6 +1342,7 @@
        add("00000645");
        add("00000646");
        add("00000647");
        add("00001711");
    }};
    public static final ArrayList<String> FAR_RIGHT_AREA  = new ArrayList<String>(){{
@@ -1607,6 +1610,8 @@
        add("00000262");
        add("00000263");
        add("00000264");
        add("00000264");
        add("00001708");
    }};
}
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java
@@ -5,7 +5,7 @@
 */
public class MapDataConstant {
    public static final Double MAX_DISTANCE_BETWEEN_ADJACENT_AGV_FACTOR = 1.09;
    public static final Double MAX_DISTANCE_BETWEEN_ADJACENT_AGV_FACTOR = 1.00;
    public static final Integer MAX_STEPS_SINGLE = 25;
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java
@@ -16,6 +16,8 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.StopWatch;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@@ -87,7 +89,7 @@
    // launcher -------------------------------------------------------
    @PostConstruct
    @EventListener(ApplicationReadyEvent.class)
    public void init() {
        Integer lev = MapDataDispatcher.MAP_DEFAULT_LEV;
        String laneDataStr = redis.getValue(RedisConstant.MAP_LANE_DATA, String.valueOf(lev));
@@ -295,7 +297,7 @@
                for (String anotherPointNear : anotherPointNears) {
                    if (!lane.getCodes().contains(anotherPointNear) && this.adjacencyCodeMap.get(anotherPointNear).size() == 2) {
                        for (Lane lane0 : lanes) {
                        for (Lane lane0 : new ArrayList<>(lanes)) {
                            if (lane0.getCodes().contains(anotherPointNear)) {
                                lane0.getCodes().addAll(lane.getCodes());
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java
@@ -101,6 +101,9 @@
        }
        Date now = new Date();
        Code code = codeService.getCacheByData(currCodeData);
        if (null == code) {
            return null;
        }
        List<Jam> jams = this.list(new LambdaQueryWrapper<Jam>()
                .eq(Jam::getAvoAgv, avoAgv)
                .eq(Jam::getAvoCode, code.getId())