From 388cf4c7cb8f942332eb0ad8d3c3e1d92714b747 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 09 三月 2026 14:11:24 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 5 +++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/PathDto.java | 18 +++++++++++++-----
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/PathDto.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/PathDto.java
index a4431fa..60473c5 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/PathDto.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/PathDto.java
@@ -8,16 +8,24 @@
@Data
public class PathDto {
- private String codeData;
+ private String code;
- private int[] coordinate;
+ private Double direction;
+
+ private boolean turn = false;
public PathDto() {
}
- public PathDto(String codeData, int[] coordinate) {
- this.codeData = codeData;
- this.coordinate = coordinate;
+ public PathDto(String code, Double direction) {
+ this.code = code;
+ this.direction = direction;
+ }
+
+ public PathDto(String code, Double direction, boolean turn) {
+ this.code = code;
+ this.direction = direction;
+ this.turn = turn;
}
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
index e3110b7..8dc13fd 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
@@ -299,7 +299,7 @@
if (null == dynamicMatrix) {
dynamicMatrix = mapDataDispatcher.getDynamicMatrix(null);
}
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ AgvDetail agvDetail = agvDetailService.selectMajorByAgvId(agv.getId());
if (null == agvDetail) {
return;
}
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 82c2626..d58843f 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
@@ -20,10 +20,11 @@
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.core.domain.AgvBackpackDto;
import com.zy.acs.manager.core.domain.LaneDto;
+import com.zy.acs.manager.core.domain.PathDto;
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.core.integrate.conveyor.ConveyorStationService;
-import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.integrate.dto.OpenBusSubmitParam;
+import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
@@ -893,7 +894,7 @@
* 鏍规嵁鍒嗙墖鐢熸垚鍔ㄤ綔 ( 杞﹁締鍙兘宸茬粡鍋氳繃涓�浜涗换鍔′簡,姝ｅ湪绛夊緟涓嬩竴娈典换鍔� )
*/
@Transactional
- public synchronized void generateAction(Long agvId, List<Segment> segmentList, List<String> pathList, Date algoStartTime) {
+ public synchronized List<PathDto> generateAction(Long agvId, List<Segment> segmentList, List<String> pathList, Date algoStartTime) {
try {
if (Cools.isEmpty(agvId, segmentList)) { return; }
Date now = new Date();
--
Gitblit v1.9.1