From b63790fa580ea78777f16bff6bc79373d675dd10 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 八月 2025 16:50:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/ShuttleOperaUtils.java | 118 +++++++++++++++++++++--------------------------------------
1 files changed, 42 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java b/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
index 33739d4..db9ab33 100644
--- a/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
@@ -51,10 +51,14 @@
private DeviceConfigService deviceConfigService;
public synchronized List<ShuttleCommand> getStartToTargetCommands(String startLocNo, String endLocNo, List<NavigationMapType> mapTypes, ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread) {
- return getStartToTargetCommands(startLocNo, endLocNo, mapTypes, null, assignCommand, shuttleThread);
+ return getStartToTargetCommands(startLocNo, endLocNo, mapTypes, null, assignCommand, shuttleThread, "move");
}
- public synchronized List<ShuttleCommand> getStartToTargetCommands(String startLocNo, String endLocNo, List<NavigationMapType> mapTypes, List<int[]> whites, ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread) {
+ public synchronized List<ShuttleCommand> getStartToTargetCommands(String startLocNo, String endLocNo, List<NavigationMapType> mapTypes, ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread, String moveType) {
+ return getStartToTargetCommands(startLocNo, endLocNo, mapTypes, null, assignCommand, shuttleThread, moveType);
+ }
+
+ public synchronized List<ShuttleCommand> getStartToTargetCommands(String startLocNo, String endLocNo, List<NavigationMapType> mapTypes, List<int[]> whites, ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread, String moveType) {
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
if (shuttleProtocol == null) {
return null;
@@ -77,7 +81,7 @@
if (whites != null) {
boolean flag = false;
for (int[] white : whites) {
- if(white[0] == node.getX() && white[1] == node.getY()) {
+ if (white[0] == node.getX() && white[1] == node.getY()) {
flag = true;
break;
}
@@ -97,7 +101,9 @@
long endTime = System.currentTimeMillis();
News.info("getSection path time:{}", (endTime - startTime));
//灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护
- for (List<NavigateNode> nodes : data) {
+ for (int i = 0; i < data.size(); i++) {
+ List<NavigateNode> nodes = data.get(i);
+
//寮�濮嬭矾寰�
NavigateNode startPath = nodes.get(0);
@@ -110,11 +116,21 @@
String distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
//鑾峰彇绉诲姩鍛戒护
ShuttleCommand command = shuttleThread.getMoveCommand(assignCommand.getDeviceTaskNo(), startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id.intValue(), runSpeed, nodes);
+
+ if (i + 1 == data.size()) {
+ if (moveType.equals("inLift")) {
+ command = shuttleThread.getMoveLiftCommand(assignCommand.getDeviceTaskNo(), startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id.intValue(), runSpeed, nodes, true);
+ }else if (moveType.equals("outLift")) {
+ command = shuttleThread.getMoveLiftCommand(assignCommand.getDeviceTaskNo(), startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id.intValue(), runSpeed, nodes, false);
+ }
+ }
+
command.setNodes(nodes);//灏嗚璧拌妭鐐规坊鍔犲埌姣忎竴姝ュ懡浠や腑
commands.add(command);
}
assignCommand.setNodes(allNode);//褰撳墠浠诲姟鎵�鍗犵敤鐨勮妭鐐筶ist
+ assignCommand.setMapTypes(mapTypes);
//灏忚溅绉诲姩杩炵画涓嬪彂鎸囦护
boolean shuttleMoveCommandsContinuously = false;
@@ -125,67 +141,6 @@
}
}
assignCommand.setShuttleMoveCommandsContinuously(shuttleMoveCommandsContinuously);
- return commands;
- }
-
- public synchronized List<ShuttleCommand> shuttleInOutLiftCommand(String startLocNo, String endLocNo, List<NavigationMapType> mapTypes, ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread) {
- NavigateNode startNode = NavigatePositionConvert.locNoToNode(startLocNo);
- NavigateNode endNode = NavigatePositionConvert.locNoToNode(endLocNo);
- List<NavigateNode> unlockPath = new ArrayList<>();
- unlockPath.add(startNode);
- unlockPath.add(endNode);
-
- ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
- if (shuttleProtocol == null) {
- return null;
- }
-
- Integer shuttleNo = shuttleProtocol.getShuttleNo();
- //鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹�/瑙ｉ攣
- boolean lockResult = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(endLocNo), shuttleProtocol.getShuttleNo(), unlockPath, false);//鎵�浣跨敤鐨勮矾寰勮繘琛岃В閿�
- if (!lockResult) {
- News.error("{} dash {} can't find unlock path!", startLocNo, endLocNo);
- shuttleThread.offerSystemMsg("{} dash {} can't find unlock path!", startLocNo, endLocNo);
- return null;//瑙ｉ攣澶辫触
- }
-
- //鑾峰彇灏忚溅绉诲姩閫熷害
- Integer runSpeed = Optional.ofNullable(basShuttleService.selectOne(new EntityWrapper<BasShuttle>().eq("shuttle_no", shuttleNo)).getRunSpeed()).orElse(1000);
- List<NavigateNode> nodeList = navigateUtils.calc(startLocNo, endLocNo, mapTypes, Utils.getShuttlePoints(shuttleNo, Utils.getLev(startLocNo)), null);
- if (nodeList == null) {
- News.error("{} dash {} can't find navigate path!", startLocNo, endLocNo);
- shuttleThread.offerSystemMsg("{} dash {} can't find navigate path!", startLocNo, endLocNo);
- return null;
- }
-
- List<NavigateNode> allNode = new ArrayList<>();
- for (NavigateNode node : nodeList) {
- allNode.add(node.clone());
- }
-
- List<ShuttleCommand> commands = new ArrayList<>();
- //鑾峰彇鍒嗘璺緞
- List<List<NavigateNode>> data = navigateUtils.getSectionPath(nodeList);
- //灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护
- for (List<NavigateNode> nodes : data) {
- //寮�濮嬭矾寰�
- NavigateNode startPath = nodes.get(0);
-
- //鐩爣璺緞
- NavigateNode endPath = nodes.get(nodes.size() - 1);
- Integer allDistance = navigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- String startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ());
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- String distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
- //鑾峰彇绉诲姩鍛戒护
- ShuttleCommand command = shuttleThread.getMoveCommand(assignCommand.getDeviceTaskNo(), startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id.intValue(), runSpeed, nodes);
- command.setNodes(nodes);//灏嗚璧拌妭鐐规坊鍔犲埌姣忎竴姝ュ懡浠や腑
- commands.add(command);
- }
-
- assignCommand.setNodes(allNode);//褰撳墠浠诲姟鎵�鍗犵敤鐨勮妭鐐筶ist
-
return commands;
}
@@ -214,16 +169,16 @@
}
//妫�娴嬮殰纰嶇墿杞�
- public synchronized boolean checkObstacle(String locNo, List<Integer> whiteShuttles) {
+ public synchronized boolean checkObstacle(String locNo, List<Integer> whiteShuttles, List<NavigateNode> whiteNodes) {
int innerCircle = 0;
int outerCircle = 3;
Config avoidInnerCircleConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "avoidInnerCircle"));
- if(avoidInnerCircleConfig != null) {
+ if (avoidInnerCircleConfig != null) {
innerCircle = Integer.parseInt(avoidInnerCircleConfig.getValue());
}
Config avoidOuterCircleConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "avoidOuterCircle"));
- if(avoidOuterCircleConfig != null) {
+ if (avoidOuterCircleConfig != null) {
outerCircle = Integer.parseInt(avoidOuterCircleConfig.getValue());
}
@@ -251,7 +206,7 @@
}
//鑾峰彇澶栧湀鑺傜偣
- List<NavigateNode> outerNodes = getOuterNodes(locNo, outerCircle, whiteShuttlePointList, innerNodes);
+ List<NavigateNode> outerNodes = getOuterNodes(locNo, outerCircle, whiteShuttlePointList, innerNodes, whiteNodes);
//灏嗗唴鍦堣妭鐐逛腑闅滅灏忚溅璋冪
for (Integer shuttleNo : nodesCar) {
@@ -274,14 +229,14 @@
List<NavigateNode> avoidInnerNodes = getInnerNodes(dispatchLocNo, innerCircle, new ArrayList<>());
//璁＄畻鍐呭湀鏄惁鏈夊皬杞�
List<Integer> avoidNodesCar = findNodesCar(avoidInnerNodes);
- if(!avoidNodesCar.isEmpty()) {
- continue;
+ if (!avoidNodesCar.isEmpty()) {
+ continue;
}
targetLocNo = dispatchLocNo;
break;
}
- if(targetLocNo == null) {
+ if (targetLocNo == null) {
continue;
}
shuttleDispatchUtils.dispatchShuttle(null, targetLocNo, shuttleNo);
@@ -328,7 +283,7 @@
return list;
}
- private List<NavigateNode> getOuterNodes(String locNo, int outerCircle, List<int[]> whiteShuttlePointList, List<NavigateNode> innerNodes) {
+ private List<NavigateNode> getOuterNodes(String locNo, int outerCircle, List<int[]> whiteShuttlePointList, List<NavigateNode> innerNodes, List<NavigateNode> whiteNodes) {
List<NavigateNode> outerNodes = new ArrayList<>();
List<NavigateNode> outerNodesTmp = new ArrayList<>();
int lev = Utils.getLev(locNo);
@@ -353,13 +308,24 @@
for (NavigateNode node : outerNodesTmp) {
boolean flag = false;
for (NavigateNode innerNode : innerNodes) {
- if(node.getX() == innerNode.getX() && node.getY() == innerNode.getY()) {
+ if (node.getX() == innerNode.getX() && node.getY() == innerNode.getY()) {
flag = true;
break;
}
}
- if(flag) {
+ if (flag) {
+ continue;
+ }
+
+ for (NavigateNode whiteNode : whiteNodes) {
+ if (node.getX() == whiteNode.getX() && node.getY() == whiteNode.getY()) {
+ flag = true;
+ break;
+ }
+ }
+
+ if (flag) {
continue;
}
@@ -560,7 +526,7 @@
private boolean is_valid(int[][] map, int x, int y) {
if (x < 0 || x >= map.length
- || y < 0 || y >= map[0].length) {
+ || y < 0 || y >= map[1].length) {
return false;
}
// 濡傛灉缁撶偣鐨勪綅缃皬浜�0锛屽垯涓嶅悎娉�
--
Gitblit v1.9.1