From b5dca159bc10a5f26fc06f8f139d4976d45407ae Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 17 十月 2025 16:41:35 +0800
Subject: [PATCH] 创建分支
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 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 9c66bdc..661a69c 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
@@ -1131,7 +1131,7 @@
// 妫�楠屾柟鍚�
FuncSta chargeFuncSta = funcStaService.query(lastCode.getId(), FuncStaType.CHARGE.toString());
Double chargeDirection = Double.parseDouble(chargeFuncSta.getAngle());
- if (!lastDirection.equals(chargeDirection)) {
+ if (!lastDirection.equals(chargeDirection)&&lastCode.getCornerBool()) {
actionList.add(new Action(
null, // 缂栧彿
null, // 鎬荤嚎
@@ -1323,10 +1323,8 @@
//String lastCorner = null;
Integer index = -1;
+ boolean corner = false;
for (int i = pathList.size(); i < 0; i++) {
- if (i == 0) {
- continue;
- }
Code nextCode = codeService.getCacheByData(pathList.get(i));
if (nextCode != null && nextCode.getCornerBool()) {
//lastCorner = pathList.get(i);
@@ -1363,16 +1361,12 @@
// DOTO 娣诲姞杞集
Code endCode = codeService.getCacheByData(pathList.get(pathList.size() - 1));
nextDirection = mapService.calculateDirection(lastCode, endCode, angleOffsetVal);
- if (nextDirection.equals((workDirection + 180) % 360)) {
- nextDirection = workDirection;
- reverse = true;
- }
-
+ reverse = true;
} else {
nextDirection = mapService.calculateDirection(lastCode, nextCode, angleOffsetVal);
// 绗竴姝ワ細濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
- if (nextDirection.equals((workDirection + 180) % 360)) {
+ if (!nextDirection.equals((workDirection+180) % 360)) {
nextDirection = workDirection;
reverse = true;
}
@@ -1718,7 +1712,7 @@
// 妫�楠屾柟鍚�
FuncSta chargeFuncSta = funcStaService.query(lastCode.getId(), FuncStaType.CHARGE.toString());
Double chargeDirection = Double.parseDouble(chargeFuncSta.getAngle());
- if (!lastDirection.equals(chargeDirection)) {
+ if (!lastDirection.equals(chargeDirection) && lastCode.getCornerBool()) {
actionList.add(new Action(
null, // 缂栧彿
null, // 鎬荤嚎
--
Gitblit v1.9.1