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 | 26 +++++++++++---------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java | 5 +++--
2 files changed, 14 insertions(+), 17 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..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;
@@ -493,29 +492,26 @@
// 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<String> codeDataList, String vehicle) {
+ this.modifyDynamicMatrix(lev, codeDataList, vehicle, false);
}
- public synchronized void modifyDynamicMatrix(Integer lev, List<String> codeList, String vehicle, boolean reset) {
+ public synchronized void modifyDynamicMatrix(Integer lev, List<String> codeDataList, 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 (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];
@@ -529,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) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java
index 7b46e3a..e2d5697 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/domain/DynamicNode.java
@@ -1,5 +1,6 @@
package com.zy.acs.manager.core.service.astart.domain;
+import com.zy.acs.manager.core.service.astart.DynamicNodeType;
import lombok.Data;
import java.io.Serializable;
@@ -14,7 +15,7 @@
private String vehicle;
- private Integer serial = -1;
+ private int serial = -1;
public DynamicNode() {}
@@ -24,7 +25,7 @@
public DynamicNode(String vehicle, Integer serial) {
this.vehicle = vehicle;
- this.serial = serial;
+ this.serial = DynamicNodeType.ACCESS.val.equals(vehicle) ? -1 : serial;
}
}
--
Gitblit v1.9.1