From a681fcad83bfcaec7c79a273659c53ba9c5502ae Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 01 十一月 2024 13:37:14 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TwTrafficService.java | 83 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 44 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TwTrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TwTrafficService.java
index 9e5701e..dbad95f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TwTrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TwTrafficService.java
@@ -1,15 +1,12 @@
package com.zy.acs.manager.core.service;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
import com.zy.acs.manager.common.utils.MapDataUtils;
import com.zy.acs.manager.core.domain.TaskPosDto;
-import com.zy.acs.manager.core.domain.TrafficJamDto;
import com.zy.acs.manager.core.service.astart.DynamicNodeType;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.service.astart.RetreatNavigateNode;
@@ -26,7 +23,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
/**
* Wavefront
@@ -188,28 +188,6 @@
}
}
- public void callback(List<Segment> segmentList) {
- Date now = new Date();
-
- segmentList.stream().max(Comparator.comparingInt(Segment::getSerial)).ifPresent(segment -> {
- Segment nextSegment = segmentService.getNextStepOfInit(segment.getTravelId(), segment.getSerial());
-
- if (null != nextSegment) {
-
- nextSegment.setState(SegmentStateType.WAITING.toString());
- nextSegment.setUpdateTime(now);
- if (!segmentService.updateById(nextSegment)) {
- log.error("Segment [{}] 鏇存柊澶辫触 锛侊紒锛�", nextSegment.getGroupId() + " - " + nextSegment.getSerial());
- }
-
- } else {
-
- travelService.checkFinish(segment.getTravelId());
- }
- });
-
- }
-
private List<String> checkoutPath(Agv agv, Code startCode, Code endCode, Segment segment) {
Integer lev = null;
String agvNo = agv.getUuid();
@@ -223,6 +201,41 @@
List<String> unlockPathList = mapService.checkoutPath(agvNo, startCode, endCode, false);
// 閬胯瑙�
List<String> lockPathList = mapService.checkoutPath(agvNo, startCode, endCode, true);
+
+ if (Cools.isEmpty(lockPathList)) {
+ return pathList;
+ }
+
+ pathList = lockPathList;
+
+
+ long currentTime = System.currentTimeMillis();
+ long estimatedTime = currentTime;
+
+ for (int i = 0; i < pathList.size() - 1; i++) {
+ String fromCode = pathList.get(i);
+ String toCode = pathList.get(i + 1);
+ String key = fromCode + "_" + toCode;
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
if (!Cools.isEmpty(lockPathList) && // 瀛樺湪閬胯瑙�
Math.abs(lockPathList.size() - unlockPathList.size()) <= Arrays.stream(mapDataDispatcher.getCodeMatrix(lev)).mapToInt(row -> row.length).sum() / 10
@@ -451,24 +464,6 @@
}
return jamVehicleList;
- }
-
- private String hasEvent(String agvNo) {
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<>());
- for (Agv agv : agvList) {
- if (agvNo.equals(agv.getUuid())) {
- continue;
- }
- String jamStr = redis.getValue(RedisConstant.AGV_TRAFFIC_JAM_FLAG, agv.getUuid());
- if (!Cools.isEmpty(jamStr)) {
-
- TrafficJamDto jamDto = JSON.parseObject(jamStr, TrafficJamDto.class);
-
-
-
- }
- }
- return null;
}
/**
--
Gitblit v1.9.1