From e039dbc9aa07fabb13be9673cbb7dfccfecda870 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 23 十一月 2024 08:14:28 +0800
Subject: [PATCH] #读取地图文件优化
---
src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java
index cc59243..fc00b05 100644
--- a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java
+++ b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java
@@ -1,5 +1,6 @@
package com.zy.common.utils;
+import com.core.common.SpringUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.NavigateNode;
import com.zy.common.model.NyShuttleOperaResult;
@@ -21,14 +22,14 @@
* @param startPoint 璧风偣锛堝皬杞﹀綋鍓嶄綅缃級
* @param targetPoint 鐩爣鐐癸紙璐х墿鐩爣浣嶇疆锛�
*/
- public static NyShuttleOperaResult getShuttleTransportCommands(Integer shuttleNo, Integer wrkNo, String startPoint, String targetPoint) {
+ public static synchronized NyShuttleOperaResult getShuttleTransportCommands(Integer shuttleNo, Integer wrkNo, String startPoint, String targetPoint) {
//琛岃蛋璺緞
ArrayList<NavigateNode> nodes = new ArrayList<>();
//鍛戒护闆嗗悎
ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
//璁＄畻璧风偣鍒扮洰鏍囩偣鍛戒护
- NyShuttleOperaResult result = getStartToTargetCommands(shuttleNo, wrkNo, startPoint, targetPoint);
+ NyShuttleOperaResult result = getStartToTargetCommands(shuttleNo, wrkNo, startPoint, targetPoint, NavigationMapType.DFX.id);
if (result == null) {
//璁＄畻缁撴灉蹇呴』涓嶄负绌猴紝鍚﹀垯璁＄畻澶辫触
return null;
@@ -50,7 +51,7 @@
* @param middlePoint 涓棿鐐癸紙璐х墿浣嶇疆锛�
* @param targetPoint 鐩爣鐐癸紙璐х墿鐩爣浣嶇疆锛�
*/
- public static NyShuttleOperaResult getShuttleTransportCommands(Integer shuttleNo, Integer wrkNo, String startPoint, String middlePoint, String targetPoint) {
+ public static synchronized NyShuttleOperaResult getShuttleTransportCommands(Integer shuttleNo, Integer wrkNo, String startPoint, String middlePoint, String targetPoint) {
//琛岃蛋璺緞
ArrayList<NavigateNode> nodes = new ArrayList<>();
//鍛戒护闆嗗悎
@@ -58,7 +59,7 @@
if (!startPoint.equals(middlePoint)) {//璧风偣鍜屼腑闂寸偣涓嶄竴鑷达紝闇�瑕佽绠楄捣鐐瑰埌涓棿鐐硅矾寰�
//璁＄畻璧风偣鍒颁腑闂寸偣鍛戒护
- NyShuttleOperaResult result1 = getStartToTargetCommands(shuttleNo, wrkNo, startPoint, middlePoint);
+ NyShuttleOperaResult result1 = getStartToTargetCommands(shuttleNo, wrkNo, startPoint, middlePoint, NavigationMapType.NORMAL.id);
if (result1 == null) {
//璁＄畻缁撴灉蹇呴』涓嶄负绌猴紝鍚﹀垯璁＄畻澶辫触
return null;
@@ -68,7 +69,7 @@
}
//璁＄畻涓棿鐐瑰埌鐩爣鐐瑰懡浠�
- NyShuttleOperaResult result2 = getStartToTargetCommands(shuttleNo, wrkNo, middlePoint, targetPoint);
+ NyShuttleOperaResult result2 = getStartToTargetCommands(shuttleNo, wrkNo, middlePoint, targetPoint, NavigationMapType.DFX.id);
if (result2 == null) {
//璁＄畻缁撴灉蹇呴』涓嶄负绌猴紝鍚﹀垯璁＄畻澶辫触
return null;
@@ -85,15 +86,17 @@
/**
* 鑾峰彇璧风偣鍒扮洰鏍囩偣琛岃蛋鍛戒护
*/
- public static NyShuttleOperaResult getStartToTargetCommands(Integer shuttleNo, Integer wrkNo, String startPoint, String targetPoint) {
+ public static synchronized NyShuttleOperaResult getStartToTargetCommands(Integer shuttleNo, Integer wrkNo, String startPoint, String targetPoint, Integer mapType) {
+ NavigateMapUtils navigateMapUtils = SpringUtils.getBean(NavigateMapUtils.class);
//璁＄畻璧风偣鍒扮洰鏍囩偣琛岃蛋鑺傜偣
- List<NavigateNode> calc = NavigateUtils.calc(startPoint, targetPoint, NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleNo, Utils.getLev(startPoint)));
+ List<NavigateNode> calc = NavigateUtils.calc(startPoint, targetPoint, mapType, Utils.getShuttlePoints(shuttleNo, Utils.getLev(startPoint)), null);
if (calc == null) {
return null;
}
//鍛戒护闆嗗悎
ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
+ List<NavigateNode> allNode = new ArrayList<>();
//鑾峰彇鍒嗘璺緞
ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc);
@@ -107,8 +110,67 @@
NyShuttleHttpCommand moveCommand = NyHttpUtils.getMoveCommand(shuttleNo, wrkNo, startPath, targetPath);
moveCommand.setNodes(nodes);//灏嗚璧拌妭鐐规坊鍔犲埌姣忎竴姝ュ懡浠や腑
commands.add(moveCommand);
+
+ allNode.addAll(nodes);
}
+ boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startPoint), shuttleNo, allNode, true);//閿佸畾璺緞
+ if (!result) {
+ return null;//璺緞閿佸畾澶辫触
+ }
+ return result(commands, calc);
+ }
+
+ /**
+ * 鑾峰彇璧风偣鍒扮洰鏍囩偣琛岃蛋鍛戒护(鍙紶鐧藉悕鍗�)
+ */
+ public static synchronized NyShuttleOperaResult getStartToTargetCommandsByWhites(Integer shuttleNo, Integer wrkNo, String startPoint, String targetPoint, Integer mapType, List<int[]> whites) {
+ NavigateMapUtils navigateMapUtils = SpringUtils.getBean(NavigateMapUtils.class);
+ //璁＄畻璧风偣鍒扮洰鏍囩偣琛岃蛋鑺傜偣
+ List<NavigateNode> calc = NavigateUtils.calc(startPoint, targetPoint, mapType, Utils.getShuttlePoints(shuttleNo, Utils.getLev(startPoint)), whites);
+ if (calc == null) {
+ return null;
+ }
+
+ //鍛戒护闆嗗悎
+ ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
+ List<NavigateNode> allNode = new ArrayList<>();
+
+ //鑾峰彇鍒嗘璺緞
+ ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc);
+ //灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护
+ for (ArrayList<NavigateNode> nodes : data) {
+ //寮�濮嬭矾寰�
+ NavigateNode startPath = nodes.get(0);
+ //鐩爣璺緞
+ NavigateNode targetPath = nodes.get(nodes.size() - 1);
+ //鑾峰彇绉诲姩鍛戒护
+ NyShuttleHttpCommand moveCommand = NyHttpUtils.getMoveCommand(shuttleNo, wrkNo, startPath, targetPath);
+ moveCommand.setNodes(nodes);//灏嗚璧拌妭鐐规坊鍔犲埌姣忎竴姝ュ懡浠や腑
+ commands.add(moveCommand);
+
+ allNode.addAll(nodes);
+ }
+
+ //閿佸畾璺緞鏃跺墧闄ょ櫧鍚嶅崟鑺傜偣
+ ArrayList<NavigateNode> nodes = new ArrayList<>();
+ for (NavigateNode node : allNode) {
+ boolean flag = false;
+ for (int[] white : whites) {
+ if (node.getX() == white[0] && node.getY() == white[1]) {
+ flag = true;//瀛樺湪鐧藉悕鍗曡妭鐐�
+ break;//璺宠繃鐧藉悕鍗曡妭鐐�
+ }
+ }
+
+ if (!flag) {
+ nodes.add(node);
+ }
+ }
+ boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startPoint), shuttleNo, nodes, true);//閿佸畾璺緞
+ if (!result) {
+ return null;//璺緞閿佸畾澶辫触
+ }
return result(commands, calc);
}
--
Gitblit v1.9.1