From fe4c6c0439e0dc00f0b09d1818735065d38d3078 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 05 十一月 2024 17:11:07 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 30 ++++++++++----
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/BlockVehicleDto.java | 49 ++++++++++++++++++++++++
2 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/BlockVehicleDto.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/BlockVehicleDto.java
index d5a8730..5d33256 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/BlockVehicleDto.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/BlockVehicleDto.java
@@ -1,6 +1,12 @@
package com.zy.acs.manager.core.domain;
+import com.zy.acs.common.utils.GsonUtils;
import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* Created by vincent on 11/5/2024
@@ -12,4 +18,47 @@
private boolean avoidable;
+ public BlockVehicleDto() {
+ }
+
+ public BlockVehicleDto(String vehicle, boolean avoidable) {
+ this.vehicle = vehicle;
+ this.avoidable = avoidable;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ BlockVehicleDto that = (BlockVehicleDto) o;
+ return Objects.equals(vehicle, that.vehicle);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(vehicle);
+ }
+
+ public static void main(String[] args) {
+ List<BlockVehicleDto> blockVehicleList = new ArrayList<>();
+ blockVehicleList.add(new BlockVehicleDto("1", true));
+ blockVehicleList.add(new BlockVehicleDto("2", true));
+// blockVehicleList.add(new BlockVehicleDto("3", false));
+// blockVehicleList.add(new BlockVehicleDto("4", false));
+// blockVehicleList.add(new BlockVehicleDto("5", false));
+// blockVehicleList.add(new BlockVehicleDto("5", true));
+// blockVehicleList.add(new BlockVehicleDto("4", true));
+
+ System.out.println(GsonUtils.toJson(blockVehicleList));
+ System.out.println(GsonUtils.toJson(blockVehicleList.stream().distinct().collect(Collectors.toList())));
+
+ System.out.println(blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable()));
+
+ String blockAgvNo = blockVehicleList.stream()
+ .filter(BlockVehicleDto::isAvoidable)
+ .map(BlockVehicleDto::getVehicle)
+ .findFirst().orElse(null);
+ System.out.println(blockAgvNo);
+ }
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index c2ed10b..b32dc23 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -6,6 +6,7 @@
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.utils.MapDataUtils;
+import com.zy.acs.manager.core.domain.BlockVehicleDto;
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.service.astart.RetreatNavigateNode;
@@ -232,13 +233,15 @@
} else {
// 鍙蛋琛岃矾寰勯泦鍚堣绠�
- List<String> blockVehicleList = this.slicePathAndReturnBlockVehicleList(lev, unlockPathList, agvNo, pathList); // jamAgvNo may was wave
+ List<BlockVehicleDto> blockVehicleList = this.slicePathAndReturnBlockVehicleList(lev, unlockPathList, agvNo, pathList); // jamAgvNo may was wave
if (!Cools.isEmpty(pathList)) {
- if (!pathList.get(pathList.size() - 1).equals(endCode.getData()) && !Cools.isEmpty(blockVehicleList)) {
- String blockAgvNo = blockVehicleList.get(0);
- if (mapDataDispatcher.queryCodeListFromDynamicNode(null, blockAgvNo).size() > 1 && pathList.size() <= MIN_SLICE_PATH_LENGTH) {
+ if (!pathList.get(pathList.size() - 1).equals(endCode.getData())) {
+
+ assert !Cools.isEmpty(blockVehicleList);
+ if (blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable())
+ && pathList.size() <= MIN_SLICE_PATH_LENGTH) {
pathList.clear();
}
}
@@ -249,7 +252,14 @@
// 闃诲杞﹁締鍒楄〃
assert !Cools.isEmpty(blockVehicleList);
- String blockAgvNo = blockVehicleList.get(0);
+ String blockAgvNo = blockVehicleList.stream()
+ .filter(BlockVehicleDto::isAvoidable)
+ .map(BlockVehicleDto::getVehicle)
+ .findFirst().orElse(null);
+ // 濡傛灉鍏ㄦ槸杩愯涓殑闃诲agv锛屽垯涓嶈繘琛岄伩璁╅�昏緫 todo
+ if (Cools.isEmpty(blockAgvNo)) {
+ return pathList;
+ }
boolean initJamCache = false;
if (null == jam) {
@@ -416,8 +426,8 @@
return pathList;
}
- private List<String> slicePathAndReturnBlockVehicleList(Integer lev, List<String> fullPathList, String agvNo, List<String> pathList) {
- List<String> blockVehicleList = new ArrayList<>();
+ private List<BlockVehicleDto> slicePathAndReturnBlockVehicleList(Integer lev, List<String> fullPathList, String agvNo, List<String> pathList) {
+ List<BlockVehicleDto> blockVehicleList = new ArrayList<>();
DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(lev);
String[][] waveMatrix = mapDataDispatcher.getWaveMatrix(lev);
@@ -431,8 +441,10 @@
List<String> otherWaveList = MapDataUtils.hasOtherWave(waveNodeList, agvNo);
if (!Cools.isEmpty(otherWaveList)) {
for (String otherWave : otherWaveList) {
- if (mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size() <= 1) {
- blockVehicleList.add(otherWave);
+ if (1 < mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size()) {
+ blockVehicleList.add(new BlockVehicleDto(otherWave, false));
+ } else {
+ blockVehicleList.add(new BlockVehicleDto(otherWave, true));
}
}
break;
--
Gitblit v1.9.1