From 0d3a1094a984088ffcf6befd7ebf06929419dd7d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 一月 2025 10:09:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 59c694b..78c45bb 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;
@@ -454,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<>();
@@ -493,29 +522,25 @@
// 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 void modifyDynamicMatrix(Integer lev, List<int[]> codeIdxList, String vehicle) {
+ this.modifyDynamicMatrix(lev, codeIdxList, vehicle, false);
}
- public synchronized void modifyDynamicMatrix(Integer lev, List<String> codeList, String vehicle, boolean reset) {
+ public synchronized void modifyDynamicMatrix(Integer lev, List<int[]> codeIdxList, String vehicle, boolean reset) {
+ if (Cools.isEmpty(vehicle)) {
+ return;
+ }
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;
int serial = 1;
- for (String code : codeList) {
- int[] node = getCodeMatrixIdx(lev, code);
- dynamicMatrix[node[0]][node[1]] = new DynamicNode(vehicle, serial);
+ for (int[] codeMatrixIdx : codeIdxList) {
+ 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];
@@ -529,8 +554,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<int[]> codeIdxList) {
+ this.modifyDynamicMatrix(lev, codeIdxList, DynamicNodeType.ACCESS.val);
}
public int[][] filterMapData(int[][] mapMatrix, Integer lev, List<String> lockNodes) {
--
Gitblit v1.9.1