From 70f422e83f0754bd39a565fdc271bb08b1086266 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@gmail.com> Date: 星期二, 06 五月 2025 15:43:53 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java | 3 +++ zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java | 5 +++++ zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java | 2 +- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java | 6 ++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java index 6844105..25f5d31 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AreaConstant.java +++ b/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"); }}; } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java index 5c4ad50..7f45477 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java +++ b/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; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java index 2b6a8f1..29202df 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java +++ b/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()); diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java index a6cdb5d..ecd5db2 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java +++ b/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()) -- Gitblit v1.9.1