From 7c893c661975dd03600113d84d3d5fadd33d1cb2 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 12 一月 2026 14:57:23 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 18 +++++++++++++++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LaneServiceImpl.java | 22 ++++++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LaneService.java | 2 ++
3 files changed, 41 insertions(+), 1 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 815c73f..c6c48e3 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
@@ -90,7 +90,7 @@
@Autowired
private SegmentService segmentService;
@Autowired
- private TrafficService trafficService;
+ private LaneService laneService;
@Autowired
private AgvModelService agvModelService;
@Autowired
@@ -950,6 +950,22 @@
// 鍙嶅悜瑙�
final double oppLastDir = (lastDirection + 180) % 360;
+ // 宸烽亾閫昏緫
+ if (!laneBuilder.isInitialized()) {
+ throw new BusinessException("lanes are not initialized");
+ }
+ LaneDto lastLaneDto = laneBuilder.search(lastCode.getData());
+ LaneDto nextLaneDto = laneBuilder.search(nextCode.getData());
+ // 杩涘叆宸烽亾瑙掑害
+ Double laneDir = laneService.getLaneDirection(nextLaneDto);
+ // 绗竴娆¤繘鍏ユ宸烽亾
+ boolean firstEnteringLane = null != laneDir && (
+ lastLaneDto == null
+ || !Objects.equals(lastLaneDto.getHashCode(), nextLaneDto.getHashCode())
+ );
+
+
+
// 濡傛灉涓嬩竴涓柟鍚戞濂芥槸浣滀笟鏂瑰悜鐨勭浉鍙嶆柟鍚戯紝鍒欓噸缃笅涓�涓柟鍚戜负浣滀笟鏂瑰悜锛屾爣璁� reverse = true
boolean reverse = false;
if (nextDirection.equals(oppWorkDir)) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LaneService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LaneService.java
index 331edfc..17d2d12 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LaneService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LaneService.java
@@ -10,4 +10,6 @@
List<Lane> batchSaveByLaneDtoList(Long zonedId, List<LaneDto> laneDtoList);
+ Double getLaneDirection(LaneDto laneDto);
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LaneServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LaneServiceImpl.java
index 80aeb37..ae91f79 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LaneServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LaneServiceImpl.java
@@ -6,6 +6,7 @@
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.core.domain.LaneDto;
+import com.zy.acs.manager.core.service.MapService;
import com.zy.acs.manager.manager.entity.Lane;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.mapper.LaneMapper;
@@ -55,4 +56,25 @@
return lanes;
}
+ @Override
+ public Double getLaneDirection(LaneDto laneDto) {
+ if (null == laneDto) {
+ return null;
+ }
+ Lane lane = this.getById(laneDto.getLaneId());
+ if (null == lane) {
+ return null;
+ }
+ Integer entryAngle = lane.getEntryAngle();
+ if (null == entryAngle) {
+ return null;
+ }
+ if (entryAngle < 0) {
+ return null;
+ }
+ double entryAngleDouble = entryAngle.doubleValue();
+ return MapService.mapToNearest(entryAngleDouble);
+// return entryAngleDouble;
+ }
+
}
--
Gitblit v1.9.1