From 7d27521ed74a1439d108ab0440345bb3539b5bb3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 05 一月 2026 19:23:47 +0800
Subject: [PATCH] no message
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 c5a9b1c..e4edd91 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,7 +799,8 @@
// 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
boolean reverse = false;
if (nextDirection.equals((workDirection + 180) % 360)) {
- if ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.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(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
reverse = false;
lastDirection = nextDirection;
} else {
@@ -826,7 +827,8 @@
nextDirection = lastDirection;
reverse = true;
} else {
- if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
+ 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"))) {
// turn
reverse = false;
actionList.add(new Action(
@@ -852,8 +854,9 @@
180);
} else {
Double turnDirection = nextDirection;
- if (turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) {
+ if ((turnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000050")) || (isLoc && locTurnCodes.contains(nextCode.getData()) && lastCode.getData().equals("00000080"))) {
turnDirection = 180.0;
+ nextDirection = turnDirection;
}
// turn
actionList.add(new Action(
@@ -876,13 +879,14 @@
lastCode.getData(),
lastCode.getCornerBool(),
nextDirection,
- nextDirection);
+ lastDirection);
}
lastDirection = nextDirection;
}
} else {
// if (isStation && lastCode.getData().equals("00000050")) {
- if ((isStation && lastCode.getData().equals("00000050")) || (isLoc && lastCode.getData().equals("00000080"))) {
+ 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"))) {
// turn
reverse = false;
actionList.add(new Action(
@@ -971,8 +975,11 @@
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 ((isStation && turnCodes.contains(lastCode.getData())) || (isLoc && locTurnCodes.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()))) {
turnDirection = workDirection + 180.0;
}
if (lastCode.getCornerBool()) {
--
Gitblit v1.9.1