From 6694bb8752aced4b818f2976442d66ae3a52e9e8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 25 七月 2025 13:25:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/action/ShuttleAction.java | 36 +++++-------------------------------
1 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/core/action/ShuttleAction.java b/src/main/java/com/zy/core/action/ShuttleAction.java
index 393d2cb..a47484b 100644
--- a/src/main/java/com/zy/core/action/ShuttleAction.java
+++ b/src/main/java/com/zy/core/action/ShuttleAction.java
@@ -16,14 +16,12 @@
import com.zy.common.model.NavigateNode;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NavigateMapUtils;
-import com.zy.common.utils.NavigatePositionConvert;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.dispatcher.ShuttleDispatchUtils;
import com.zy.core.enums.*;
import com.zy.core.model.CommandResponse;
-import com.zy.core.model.TrafficControlDataModel;
import com.zy.core.model.command.ShuttleAssignCommand;
import com.zy.core.model.command.ShuttleCommand;
import com.zy.core.model.command.ShuttleRedisCommand;
@@ -420,25 +418,8 @@
if (trafficControlThread == null) {
return false;
}
-
- TrafficControlDataModel trafficControlDataModel = trafficControlThread.queryTrafficControl(shuttleNo);
- if (trafficControlDataModel != null) {
- //鏈夌鍒朵俊鎭紝杩涜妫�娴�
- if (!trafficControlDataModel.getTaskNo().equals(shuttleProtocol.getTaskNo())) {
- return false;//浠诲姟涓嶄竴鑷�
- }
-
- //妫�娴嬫槸鍚﹀埌缁堢偣
- List<NavigateNode> totalNodeList = trafficControlDataModel.getTotalNodeList();
- NavigateNode trafficTargetNode = totalNodeList.get(totalNodeList.size() - 1);
- String trafficTargetLoc = Utils.getLocNo(trafficTargetNode.getX(), trafficTargetNode.getY(), trafficTargetNode.getZ());
-
- //鍒ゆ柇灏忚溅鏄惁鍒扮粓鐐�
- if(shuttleProtocol.getCurrentLocNo().equals(trafficTargetLoc)) {
- //涓婃姤浜ょ
- trafficControlThread.trafficReport(command.getNodesDeepCopy(), shuttleNo, shuttleProtocol.getTaskNo());
- }
- }
+ //涓婃姤浜ょ
+ trafficControlThread.trafficReport(command.getNodesDeepCopy(), shuttleNo, shuttleProtocol.getTaskNo());
String currentLocNo = shuttleProtocol.getCurrentLocNo();
if (targetPoints.contains(Utils.getRow(currentLocNo) + "-" + Utils.getBay(currentLocNo))) {
@@ -503,19 +484,12 @@
return false;
}
- NavigateNode startNode = nodeList.get(0);
- Long linePartFlag = startNode.getLinePartFlag();
-
List<NavigateNode> totalNodeList = new ArrayList<>();
for (ShuttleCommand command : commands) {
if (command.getMode() == ShuttleCommandModeType.MOVE.id) {
- NavigateNode node = command.getNodes().get(0);
- Long nodeLinePartFlag = node.getLinePartFlag();
- if (nodeLinePartFlag.equals(linePartFlag)) {
- List<NavigateNode> deepCopy = command.getNodesDeepCopy();
- if (deepCopy != null) {
- totalNodeList.addAll(deepCopy);
- }
+ List<NavigateNode> deepCopy = command.getNodesDeepCopy();
+ if (deepCopy != null) {
+ totalNodeList.addAll(deepCopy);
}
}
}
--
Gitblit v1.9.1