From d14e77e0da0db122867500fecf6d0607ef4d3bd5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 十二月 2024 13:43:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 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..04c462b 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,6 +3,7 @@
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;
@@ -28,6 +29,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 +197,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 +239,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 +395,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 +415,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();
}
--
Gitblit v1.9.1