From 877b2519157cea762b1e63e9c57c09614216d684 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 24 七月 2025 19:27:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/ShuttleOperaUtils.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java b/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
index 170dc3e..33739d4 100644
--- a/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
@@ -17,7 +17,6 @@
import com.zy.core.enums.MapNodeType;
import com.zy.core.enums.ShuttleRunDirection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.command.ShuttleAssignCommand;
import com.zy.core.model.command.ShuttleCommand;
import com.zy.core.model.protocol.ShuttleProtocol;
@@ -91,11 +90,14 @@
lockNode.add(node.clone());
}
+ long startTime = System.currentTimeMillis();
List<ShuttleCommand> commands = new ArrayList<>();
//鑾峰彇鍒嗘璺緞
- ArrayList<ArrayList<NavigateNode>> data = navigateUtils.getSectionPath(nodeList);
+ List<List<NavigateNode>> data = navigateUtils.getSectionPath(nodeList);
+ long endTime = System.currentTimeMillis();
+ News.info("getSection path time:{}", (endTime - startTime));
//灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护
- for (ArrayList<NavigateNode> nodes : data) {
+ for (List<NavigateNode> nodes : data) {
//寮�濮嬭矾寰�
NavigateNode startPath = nodes.get(0);
@@ -114,12 +116,15 @@
assignCommand.setNodes(allNode);//褰撳墠浠诲姟鎵�鍗犵敤鐨勮妭鐐筶ist
- boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startLocNo), shuttleNo, lockNode, true);//閿佸畾璺緞
- if (!result) {
- News.error("{} dash {} can't lock path!", startLocNo, endLocNo);
- shuttleThread.offerSystemMsg("{} dash {} can't lock path!", startLocNo, endLocNo);
- return null;//璺緞閿佸畾澶辫触
+ //灏忚溅绉诲姩杩炵画涓嬪彂鎸囦护
+ boolean shuttleMoveCommandsContinuously = false;
+ Config shuttleMoveCommandsContinuouslyConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "shuttleMoveCommandsContinuously"));
+ if (shuttleMoveCommandsContinuouslyConfig != null) {
+ if (shuttleMoveCommandsContinuouslyConfig.getValue().equals("Y")) {
+ shuttleMoveCommandsContinuously = true;
+ }
}
+ assignCommand.setShuttleMoveCommandsContinuously(shuttleMoveCommandsContinuously);
return commands;
}
@@ -160,9 +165,9 @@
List<ShuttleCommand> commands = new ArrayList<>();
//鑾峰彇鍒嗘璺緞
- ArrayList<ArrayList<NavigateNode>> data = navigateUtils.getSectionPath(nodeList);
+ List<List<NavigateNode>> data = navigateUtils.getSectionPath(nodeList);
//灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护
- for (ArrayList<NavigateNode> nodes : data) {
+ for (List<NavigateNode> nodes : data) {
//寮�濮嬭矾寰�
NavigateNode startPath = nodes.get(0);
--
Gitblit v1.9.1