#

luxiaotao1123

2025-01-06 b9eef68cc85d30b892a1cd50829341d3dae743b9

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java

@@ -304,25 +304,25 @@
                            } else {

                                // block vehicle info
                                Agv blockAgv = agvService.selectByUuid(blockAgvNo);
                                String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgv.getId()).getRecentCode()).getData();
                                Long blockAgvId = agvService.getAgvId(blockAgvNo);
                                String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgvId).getRecentCode()).getData();

                                // create new jam if already notify the avoid vehicle
                                if (!Cools.isEmpty(jam.getAvoAgv(), jam.getAvoSeg()) && !blockAgv.getId().equals(jam.getAvoAgv())) {
                                if (!Cools.isEmpty(jam.getAvoAgv(), jam.getAvoSeg()) && !blockAgvId.equals(jam.getAvoAgv())) {
                                    jam = this.setupNewJam(jam, agv, startCode, segment, draftPath);
                                }

                                do {

                                    // 阻塞车辆正在原地作业，等待 ===>> 超过等待时间，绕路
                                    List<Segment> runningSegList = segmentService.getByAgvAndState(blockAgv.getId(), SegmentStateType.RUNNING.toString());
                                    List<Segment> runningSegList = segmentService.getByAgvAndState(blockAgvId, SegmentStateType.RUNNING.toString());
                                    if (!Cools.isEmpty(runningSegList)) {
                                        maxJamTimeoutFactor = 1;
                                        break;
                                    }

                                    // 判断下个任务是否为原地任务，如果是则等待 ===>> 超过等待时间，绕路；如果不是，让阻塞车辆避让
                                    List<Segment> waitingSegList = segmentService.getJustWaitingSeg(blockAgv.getId());
                                    List<Segment> waitingSegList = segmentService.getJustWaitingSeg(blockAgvId);
                                    if (null != waitingSegList
                                            && waitingSegList.stream().anyMatch(
                                            waitingSeg -> waitingSeg.getEndNode().equals(codeService.selectByData(blockAgvCode).getId())
@@ -336,7 +336,7 @@
                                        if (jam.getCycleAvo() == 1) {
                                            jam.setCycleCode(endCode.getId());
                                        }
                                        jam.setAvoAgv(blockAgv.getId());
                                        jam.setAvoAgv(blockAgvId);
                                        jam.setNotifyTime(new Date());
                                        if (!jamService.updateById(jam)) {
                                            throw new CoolException(jam.getUuid() + "-jam failed to update！！！");