From 9f19c2ea1a1d4e94460eb2d881b7cf8cc10e66df Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 14 十一月 2024 10:42:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 ca395b0..b4e5e50 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
@@ -2,10 +2,11 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.exception.CoolException;
+import com.zy.acs.manager.core.domain.SortCodeDto;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.service.CodeService;
@@ -13,8 +14,10 @@
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Collectors;
/**
* Created by vincent on 6/6/2024
@@ -380,6 +383,7 @@
for (Code code : codeList) {
Double x = code.getX();
Double y = code.getY();
+ if (null == x || null == y) { continue; }
if (!xIdxList.contains(x)) {
xIdxList.add(x);
}
@@ -446,21 +450,24 @@
}
public List<String> queryCodeListFromDynamicNode(Integer lev, String nodeType) {
- List<String> nodes = new ArrayList<>();
if (Cools.isEmpty(nodeType)) {
- return nodes;
+ 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++) {
for (int j = 0; j < codeMatrix[i].length; j++) {
- if (nodeType.equals(dynamicMatrix[i][j].getVehicle())) {
- nodes.add(codeMatrix[i][j]);
+ DynamicNode dynamicNode = dynamicMatrix[i][j];
+ if (nodeType.equals(dynamicNode.getVehicle())) {
+ codeList.add(new SortCodeDto(codeMatrix[i][j], dynamicNode.getSerial()));
}
}
}
- return nodes;
+ 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) {
--
Gitblit v1.9.1