From 02b49844456ea3e650edcf03d8d6a5bad6ba9aed Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 一月 2025 14:15:05 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 103 +++++++++++++++++++++++++--------------------------
1 files changed, 51 insertions(+), 52 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
index b43c1d8..cb34cda 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
@@ -5,6 +5,8 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.utils.MapDataUtils;
import com.zy.acs.manager.core.constant.MapDataConstant;
+import com.zy.acs.manager.core.domain.SortCodeDto;
+import com.zy.acs.manager.core.domain.UnlockPathTask;
import com.zy.acs.manager.core.service.astart.*;
import com.zy.acs.manager.core.service.astart.domain.AStarNavigateNode;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
@@ -16,13 +18,16 @@
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.time.StopWatch;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
/**
* Created by vincent on 2023/6/14
@@ -45,6 +50,8 @@
private ConfigService configService;
@Autowired
private ActionService actionService;
+ @Autowired
+ private LinkedBlockingQueue<UnlockPathTask> unlockTaskQueue;
/**
* 瀵诲潃 ===>> A Star
@@ -173,61 +180,16 @@
}
public void lockPath(Integer lev, List<String> pathList, String agvNo) {
- mapDataDispatcher.modifyDynamicMatrix(lev, pathList, agvNo);
+ List<int[]> codeMatrixIdxList = mapDataDispatcher.getCodeMatrixIdxList(lev, pathList);
+ mapDataDispatcher.modifyDynamicMatrix(lev, codeMatrixIdxList, agvNo);
}
- public synchronized void unlockPath(String agvNo, String codeData) {
+ public void unlockPath(String agvNo, String codeData) {
try {
- StopWatch stopWatch = new StopWatch();
- stopWatch.start();
-
- if (Cools.isEmpty(agvNo, codeData)) {
- return;
- }
-
- Integer lev = null;
-
- String[][] codeMatrix = mapDataDispatcher.getCodeMatrix(null);
- int[] codeMatrixIdx = mapDataDispatcher.getCodeMatrixIdx(lev, codeData);
-
-
- DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(lev);
-
- DynamicNode dynamicNode = dynamicMatrix[codeMatrixIdx[0]][codeMatrixIdx[1]];
-
-
- Integer serial = dynamicNode.getSerial();
-
- List<String> resetCodeList = new ArrayList<>();
-
- for (int i = 0; i < dynamicMatrix.length; i++) {
- for (int j = 0; j < dynamicMatrix[i].length; j++) {
-
-// if (i == codeMatrixIdx[0] && j == codeMatrixIdx[1]) { continue; }
-
- DynamicNode node = dynamicMatrix[i][j];
- if (node.getVehicle().equals(agvNo)) {
- if (node.getSerial() < serial) {
- resetCodeList.add(codeMatrix[i][j]);
- }
- }
- }
- }
-
- if (!Cools.isEmpty(resetCodeList)) {
-
- mapDataDispatcher.clearDynamicMatrixByCodeList(lev, resetCodeList);
- }
-
- stopWatch.stop();
- if (stopWatch.getTime() > 50) {
- log.info("瑙ｉ攣璺緞鍑芥暟鑺辫垂鏃堕棿涓猴細{}姣......", stopWatch.getTime());
- }
-
- } catch (Exception e) {
- log.error("MapService.unlockPath", e);
+ unlockTaskQueue.offer(new UnlockPathTask(agvNo, codeData), 5, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ log.error("unlockTaskQueue", e);
}
-
}
public List<String> getWaveScopeByCodeList(Integer lev, List<String> codeList, Double radiusLen) {
@@ -406,4 +368,41 @@
return turnMatrixNode == TurnNodeType.TURN.val;
}
+ public List<String> queryCodeListFromDynamicNode(Integer lev, String nodeType) {
+ if (Cools.isEmpty(nodeType)) {
+ return new ArrayList<>();
+ }
+ lev = Optional.ofNullable(lev).orElse(MapDataDispatcher.MAP_DEFAULT_LEV);
+
+ DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(lev);
+ String[][] codeMatrix = mapDataDispatcher.getCodeMatrix(lev);
+
+ // concurrent
+ 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()));
+ }
+ }
+ });
+
+ // synchronize
+// 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()));
+// }
+// }
+// }
+
+ return codeList.stream()
+ .sorted(Comparator.comparingInt(SortCodeDto::getSerial))
+ .map(SortCodeDto::getCode)
+ .collect(Collectors.toList());
+ }
+
}
--
Gitblit v1.9.1