From 52c04ffb74dd7831d052ada9ebd6128f106ff5e7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 十二月 2024 10:06:14 +0800
Subject: [PATCH] #
---
zy-acs-fake/src/main/java/com/zy/acs/fake/service/MapService.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/zy-acs-fake/src/main/java/com/zy/acs/fake/service/MapService.java b/zy-acs-fake/src/main/java/com/zy/acs/fake/service/MapService.java
index 6228265..a737504 100644
--- a/zy-acs-fake/src/main/java/com/zy/acs/fake/service/MapService.java
+++ b/zy-acs-fake/src/main/java/com/zy/acs/fake/service/MapService.java
@@ -110,16 +110,21 @@
DynamicNode dynamicNode = dynamicMatrix[codeMatrixIdx[0]][codeMatrixIdx[1]];
-
Integer serial = dynamicNode.getSerial();
+ long time = dynamicNode.getTime();
List<String> resetCodeList = new ArrayList<>();
for (int i = 0; i < dynamicMatrix.length; i++) {
for (int j = 0; j < dynamicMatrix[i].length; j++) {
+
+ if (i == codeMatrixIdx[0] && j == codeMatrixIdx[1]) { continue; }
+
DynamicNode node = dynamicMatrix[i][j];
- if (node.getVehicle().equals(agvNo) && node.getSerial() < serial) {
- resetCodeList.add(codeMatrix[i][j]);
+ if (node.getVehicle().equals(agvNo)) {
+ if (node.getSerial() < serial || node.getTime() != time) {
+ resetCodeList.add(codeMatrix[i][j]);
+ }
}
}
}
--
Gitblit v1.9.1