From 42e63efa6589342e0f9cff4389b986cf1c713c0b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 一月 2025 11:20:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
index f32500d..7d90822 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
@@ -453,6 +453,36 @@
return null;
}
+ public List<int[]> getCodeMatrixIdxList(Integer lev, List<String> codeDataList) {
+ if (Cools.isEmpty(codeDataList)) {
+ return new ArrayList<>();
+ }
+ lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
+ String[][] codeMatrix = this.getCodeMatrix(lev);
+
+ List<int[]> codeMatrixIdxList = new ArrayList<>();
+
+ Map<String, int[]> map = new HashMap<>();
+ Set<String> codeDataSet = new HashSet<>(codeDataList);
+
+ for (int i = 0; i < codeMatrix.length; i++) {
+ for (int j = 0; j < codeMatrix[i].length; j++) {
+ String codeData = codeMatrix[i][j];
+ if (codeDataSet.contains(codeData)) {
+ map.put(codeData, new int[]{i, j});
+ }
+ }
+ }
+
+ for (String codeData : codeDataList) {
+ int[] codeMatrixIdx = map.get(codeData);
+ if (codeMatrixIdx != null) {
+ codeMatrixIdxList.add(codeMatrixIdx);
+ }
+ }
+ return codeMatrixIdxList;
+ }
+
public List<String> queryCodeListFromDynamicNode(Integer lev, String nodeType) {
if (Cools.isEmpty(nodeType)) {
return new ArrayList<>();
@@ -462,8 +492,8 @@
DynamicNode[][] dynamicMatrix = getDynamicMatrix(lev);
String[][] codeMatrix = this.getCodeMatrix(lev);
+ // concurrent
ConcurrentLinkedQueue<SortCodeDto> codeList = new ConcurrentLinkedQueue<>();
-
IntStream.range(0, codeMatrix.length).parallel().forEach(i -> {
for (int j = 0; j < codeMatrix[i].length; j++) {
DynamicNode dynamicNode = dynamicMatrix[i][j];
@@ -473,13 +503,8 @@
}
});
- return codeList.stream()
- .sorted(Comparator.comparingInt(SortCodeDto::getSerial))
- .map(SortCodeDto::getCode)
- .collect(Collectors.toList());
-
+ // synchronize
// List<SortCodeDto> codeList = new ArrayList<>();
-
// for (int i = 0; i < codeMatrix.length; i++) {
// for (int j = 0; j < codeMatrix[i].length; j++) {
// DynamicNode dynamicNode = dynamicMatrix[i][j];
@@ -488,15 +513,18 @@
// }
// }
// }
-// codeList.sort(Comparator.comparingInt(SortCodeDto::getSerial));
-// return codeList.stream().map(SortCodeDto::getCode).collect(Collectors.toList());
+
+ return codeList.stream()
+ .sorted(Comparator.comparingInt(SortCodeDto::getSerial))
+ .map(SortCodeDto::getCode)
+ .collect(Collectors.toList());
}
- public void modifyDynamicMatrix(Integer lev, List<String> codeDataList, String vehicle) {
- this.modifyDynamicMatrix(lev, codeDataList, vehicle, false);
+ public void modifyDynamicMatrix(Integer lev, List<int[]> codeIdxList, String vehicle) {
+ this.modifyDynamicMatrix(lev, codeIdxList, vehicle, false);
}
- public synchronized void modifyDynamicMatrix(Integer lev, List<String> codeDataList, String vehicle, boolean reset) {
+ public synchronized void modifyDynamicMatrix(Integer lev, List<int[]> codeIdxList, String vehicle, boolean reset) {
if (Cools.isEmpty(vehicle)) {
return;
}
@@ -506,8 +534,7 @@
if (!reset) {
// long time = System.currentTimeMillis() / 1000;
int serial = 1;
- for (String codeData : codeDataList) {
- int[] codeMatrixIdx = getCodeMatrixIdx(lev, codeData);
+ for (int[] codeMatrixIdx : codeIdxList) {
dynamicMatrix[codeMatrixIdx[0]][codeMatrixIdx[1]] = new DynamicNode(vehicle, serial);
serial++;
}
@@ -525,8 +552,8 @@
setDynamicMatrix(lev, dynamicMatrix);
}
- public void clearDynamicMatrixByCodeList(Integer lev, List<String> codeDataList) {
- this.modifyDynamicMatrix(lev, codeDataList, DynamicNodeType.ACCESS.val);
+ public void clearDynamicMatrixByCodeList(Integer lev, List<int[]> codeIdxList) {
+ this.modifyDynamicMatrix(lev, codeIdxList, DynamicNodeType.ACCESS.val);
}
public int[][] filterMapData(int[][] mapMatrix, Integer lev, List<String> lockNodes) {
--
Gitblit v1.9.1