From 0dab88e8ed90367a2b8f016d019f364297ca3caa Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 13:41:18 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java | 18 +++++++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
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 3b45a5a..2b6a8f1 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
@@ -39,6 +39,8 @@
private final Map<String, List<int[]>> laneCodeIdxMap = new HashMap<>();
+ private final Map<String, Lane> codeLaneMap = new HashMap<>();
+
private boolean initialized = Boolean.FALSE;
@Autowired
@@ -62,12 +64,14 @@
if (Cools.isEmpty(codeData) || !this.initialized) {
return null;
}
- for (Lane lane : this.lanes) {
- if (lane.getCodes().contains(codeData)) {
- return lane;
- }
- }
- return null;
+// if (result == null) {
+// for (Lane lane : this.lanes) {
+// if (lane.getCodes().contains(codeData)) {
+// return lane;
+// }
+// }
+// }
+ return this.codeLaneMap.get(codeData);
}
public List<int[]> getLaneCodeIdxList(String codeData) {
@@ -348,7 +352,6 @@
public void generateLaneCodeIdx(Integer lev) {
log.info("There is initializing Lane CodeIdxMap......");
- long l = System.currentTimeMillis();
if (Cools.isEmpty(this.lanes)) {
return;
}
@@ -358,6 +361,7 @@
int[] codeMatrixIdx = mapDataDispatcher.getCodeMatrixIdx(lev, code);
codeIdxList.add(codeMatrixIdx);
this.laneCodeIdxMap.put(code, codeIdxList);
+ this.codeLaneMap.put(code, lane);
}
}
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 0029772..59ca80b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -497,7 +497,6 @@
if (Cools.isEmpty(agvId, taskType)) { return false; }
try {
String agvNo = agvService.getAgvNo(agvId);
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agvId);
if (!agvService.judgeEnable(agvId)) {
return false;
}
@@ -510,6 +509,7 @@
}
Date now = new Date();
+ AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agvId);
Code endCode = null;
switch (taskType) {
case TO_CHARGE:
--
Gitblit v1.9.1