#

luxiaotao1123

2024-11-06 337746fee651f91e9c63bd1c33a474c236d51889

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

@@ -189,28 +189,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();
@@ -261,7 +239,6 @@
                    return pathList;
                }

                boolean initJamCache = false;
                if (null == jam) {
                    jam = new Jam();
                    jam.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
@@ -274,7 +251,11 @@
                        log.error("{}号车辆在{}定位被阻塞，记录阻塞状态失败！！！", agvNo, startCode.getData());
                        return pathList;
                    }
                    initJamCache = true;
                } else {
                    jam.setDuration(System.currentTimeMillis() - jam.getStartTime().getTime());
                    if (!jamService.updateById(jam)) {
                        log.error("{}编号阻塞记录更新失败！！！", jam.getUuid());
                    }
                }
                long previousTimestamp = jam.getStartTime().getTime();

@@ -388,13 +369,6 @@

                }

                if (!initJamCache) {
                    jam.setDuration(System.currentTimeMillis() - jam.getStartTime().getTime());
                    if (!jamService.updateById(jam)) {
                        log.error("{}编号阻塞记录更新失败！！！", jam.getUuid());
                    }
                }

            }

        }
@@ -409,7 +383,7 @@
                    log.error("{}编号阻塞记录完成修改失败！！！", jam.getUuid());
                }
            }
            // expired jam
            // deal expired jam
            for (Jam expiredJam : jamService.list(new LambdaQueryWrapper<Jam>()
                    .eq(Jam::getJamAgv, agv.getId())
                    .eq(Jam::getState, JamStateType.RUNNING.toString()))) {