From 5da24caea93040d9f6b95c9b88d80a0f951a93ad Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 06 一月 2026 08:42:31 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 505da1b..2c07e57 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -799,8 +799,7 @@
// 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
boolean reverse = false;
if (nextDirection.equals((workDirection + 180) % 360)) {
- if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
- // if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
+ if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
reverse = false;
lastDirection = nextDirection;
} else {
@@ -827,8 +826,7 @@
nextDirection = lastDirection;
reverse = true;
} else {
- if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
- // if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
+ if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
// turn
reverse = false;
actionList.add(new Action(
@@ -854,7 +852,7 @@
180);
} else {
Double turnDirection = nextDirection;
- if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
+ if (turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) {
turnDirection = 180.0;
reverse = false;
}
@@ -879,14 +877,13 @@
lastCode.getData(),
lastCode.getCornerBool(),
nextDirection,
- lastDirection);
+ nextDirection);
}
lastDirection = nextDirection;
}
} else {
// if (isStation && lastCode.getData().equals("00000050")) {
- if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
- // if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
+ if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
// turn
reverse = false;
actionList.add(new Action(
@@ -974,11 +971,17 @@
if (first) {
if (Cools.isEmpty(actionList) || !actionList.get(0).getActionType().equals(ActionTypeType.TurnCorner.val())) {
Double turnDirection = workDirection;
- Code nextCode = codeService.getCacheByData(lastCode.getData());
-// Double nextDirection = mapService.calculateDirection(lastCode, nextCode, angleOffsetVal);
- // if (isStation && turnCodes.contains(lastCode.getData())) {
- if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
- // if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(lastCode.getData()))) {
+ Code nextCode = null;
+ //娣诲姞鍒ゆ柇鏄惁瀛樺湪涓嬩竴涓湴鐮�
+ int index = pathList.indexOf(lastCode.getData());
+ if (index != -1 && index + 1 < pathList.size()) {
+ String nextCodeData = pathList.get(index + 1);
+ nextCode = codeService.getCacheByData(nextCodeData);
+ } else {
+ nextCode = codeService.getCacheByData(lastCode.getData());
+ }
+
+ if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
turnDirection = workDirection + 180.0;
}
if (lastCode.getCornerBool()) {
--
Gitblit v1.9.1