From b6c82c2a4b94e63d1afe506a7b943496cc9f8017 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 06 一月 2025 09:20:20 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 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 04c462b..f32500d 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
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.constant.RedisConstant;
-import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
@@ -18,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
@@ -458,44 +459,59 @@
}
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];
@@ -509,8 +525,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