From b9eef68cc85d30b892a1cd50829341d3dae743b9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 06 一月 2025 13:00:47 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 129 +++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 46 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 25766b9..8171712 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
@@ -17,7 +17,9 @@
import lombok.extern.slf4j.Slf4j;
import java.util.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
/**
* Created by vincent on 6/6/2024
@@ -28,6 +30,9 @@
public static final Integer MAP_DEFAULT_LEV = 1;
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
+
+ List<Double> xIdxList;
+ List<Double> yIdxList;
private String[][] codeMatrix;
@@ -193,7 +198,6 @@
}
public String[][] initWaveMatrix(Integer lev) {
- log.info("There is initializing Wave Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -236,13 +240,20 @@
log.info("There is initializing Cda Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
+ if (Cools.isEmpty(xIdxList, yIdxList)) {
+ this.initCodeMatrix(lev);
+ }
+
String[][] codeMatrix = getCodeMatrix(lev);
String[][] cdaMatrix = new String[codeMatrix.length][codeMatrix[0].length];
for (int i = 0; i < codeMatrix.length; i++) {
for (int j = 0; j < codeMatrix[i].length; j++) {
if (CodeNodeType.NONE.val.equals(codeMatrix[i][j])) {
- cdaMatrix[i][j] = CdaNodeType.DISABLE.val;
+ List<Double> cdaArr = new ArrayList<>();
+ cdaArr.add(xIdxList.get(j));
+ cdaArr.add(yIdxList.get(i));
+ cdaMatrix[i][j] = JSON.toJSONString(cdaArr);
} else {
Code currCode = codeService.selectByData(codeMatrix[i][j]);
if (null != currCode) {
@@ -385,13 +396,9 @@
.orderByAsc(Code::getY)
.orderByAsc(Code::getX)
);
-// int xCount = codeService.selectDistinctCountFromX();
-// int yCount = codeService.selectDistinctCountFromY();
-// // [][] 绗竴涓槸鎺掔殑鏁伴噺 绗簩涓槸鍒楃殑鏁伴噺
-// String[][] codeMatrix = new String[yCount][xCount];
- List<Double> xIdxList = new ArrayList<>();
- List<Double> yIdxList = new ArrayList<>();
+ xIdxList = new ArrayList<>();
+ yIdxList = new ArrayList<>();
for (Code code : codeList) {
Double x = code.getX();
Double y = code.getY();
@@ -409,24 +416,9 @@
// [][] 绗竴涓槸鎺掔殑鏁伴噺 绗簩涓槸鍒楃殑鏁伴噺
String[][] codeMatrix = new String[yIdxList.size()][xIdxList.size()];
- int idxX = -1;
- int idxY = -1;
- double lastX = -1;
- double lastY = -1;
for (Code code : codeList) {
Double x = code.getX();
Double y = code.getY();
-// if (y != lastY) {
-// idxY ++;
-// idxX = 0;
-// lastY = y;
-// lastX = x;
-// }
-// if (x != lastX) {
-// idxX++;
-// lastX = x;
-// }
-// codeMatrix[idxY][idxX] = code.getData();
codeMatrix[yIdxList.indexOf(y)][xIdxList.indexOf(x)] = code.getData();
}
@@ -461,50 +453,95 @@
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<>();
}
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
- List<SortCodeDto> codeList = new ArrayList<>();
DynamicNode[][] dynamicMatrix = getDynamicMatrix(lev);
String[][] codeMatrix = this.getCodeMatrix(lev);
- for (int i = 0; i < codeMatrix.length; i++) {
+
+ 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];
if (nodeType.equals(dynamicNode.getVehicle())) {
codeList.add(new SortCodeDto(codeMatrix[i][j], dynamicNode.getSerial()));
}
}
+ });
+
+ return codeList.stream()
+ .sorted(Comparator.comparingInt(SortCodeDto::getSerial))
+ .map(SortCodeDto::getCode)
+ .collect(Collectors.toList());
+
+// 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];
+// if (nodeType.equals(dynamicNode.getVehicle())) {
+// codeList.add(new SortCodeDto(codeMatrix[i][j], dynamicNode.getSerial()));
+// }
+// }
+// }
+// codeList.sort(Comparator.comparingInt(SortCodeDto::getSerial));
+// return codeList.stream().map(SortCodeDto::getCode).collect(Collectors.toList());
+ }
+
+ public void modifyDynamicMatrix(Integer lev, List<String> codeDataList, String vehicle) {
+ this.modifyDynamicMatrix(lev, codeDataList, vehicle, false);
+ }
+
+ public synchronized void modifyDynamicMatrix(Integer lev, List<String> codeDataList, String vehicle, boolean reset) {
+ if (Cools.isEmpty(vehicle)) {
+ return;
}
- codeList.sort(Comparator.comparingInt(SortCodeDto::getSerial));
- return codeList.stream().map(SortCodeDto::getCode).collect(Collectors.toList());
- }
-
- public void modifyDynamicMatrix(Integer lev, List<String> codeList, String vehicle) {
- this.modifyDynamicMatrix(lev, codeList, vehicle, false);
- }
-
- public synchronized void modifyDynamicMatrix(Integer lev, List<String> codeList, String vehicle, boolean reset) {
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
DynamicNode[][] dynamicMatrix = getDynamicMatrix(lev);
if (!reset) {
- if (Cools.isEmpty(codeList, vehicle)) {
- return;
- }
- long time = System.currentTimeMillis() / 1000;
+// long time = System.currentTimeMillis() / 1000;
int serial = 1;
- for (String code : codeList) {
- int[] node = getCodeMatrixIdx(lev, code);
- dynamicMatrix[node[0]][node[1]] = new DynamicNode(vehicle, serial, time);
+ for (String codeData : codeDataList) {
+ int[] codeMatrixIdx = getCodeMatrixIdx(lev, codeData);
+ dynamicMatrix[codeMatrixIdx[0]][codeMatrixIdx[1]] = new DynamicNode(vehicle, serial);
serial++;
}
} else {
- if (Cools.isEmpty(vehicle)) {
- return;
- }
for (int i = 0; i < dynamicMatrix.length; i++) {
for (int j = 0; j < dynamicMatrix[i].length; j++) {
DynamicNode dynamicNode = dynamicMatrix[i][j];
@@ -518,8 +555,8 @@
setDynamicMatrix(lev, dynamicMatrix);
}
- public void clearDynamicMatrixByCodeList(Integer lev, List<String> codeList) {
- this.modifyDynamicMatrix(lev, codeList, DynamicNodeType.ACCESS.val);
+ public void clearDynamicMatrixByCodeList(Integer lev, List<String> codeDataList) {
+ this.modifyDynamicMatrix(lev, codeDataList, DynamicNodeType.ACCESS.val);
}
public int[][] filterMapData(int[][] mapMatrix, Integer lev, List<String> lockNodes) {
--
Gitblit v1.9.1