#

vincentlu

2025-01-13 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f

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

@@ -137,7 +137,7 @@
            Code endCode = codeService.getById(endNode);
            long startTime = System.currentTimeMillis();
            List<String> pathList = this.checkoutPath(agv, startCode, endCode, segment);
            System.out.println("checkoutPath: " + (System.currentTimeMillis() - startTime));
//            System.out.println("checkoutPath: " + (System.currentTimeMillis() - startTime));
            if (Cools.isEmpty(pathList)) {
                return;
            }
@@ -148,7 +148,7 @@
            String lastCodeData = pathList.get(pathList.size() - 1);
            if (!endCode.getData().equals(lastCodeData)) {
                // slice
                Code lastCode = codeService.selectByData(lastCodeData);
                Code lastCode = codeService.getCacheByData(lastCodeData);

//                if (pathList.size() <= MIN_SLICE_PATH_LENGTH) {
//                    return;
@@ -204,7 +204,7 @@

            startTime = System.currentTimeMillis();
            mainService.generateAction(segment.getAgvId(), segmentList, pathList, now);
            System.out.println("generateAction: " + (System.currentTimeMillis() - startTime));
//            System.out.println("generateAction: " + (System.currentTimeMillis() - startTime));

        } catch (Exception e) {
            log.error("TrafficService.trigger", e);
@@ -329,7 +329,7 @@
                                    List<Segment> waitingSegList = segmentService.getJustWaitingSeg(blockAgvId);
                                    if (null != waitingSegList
                                            && waitingSegList.stream().anyMatch(
                                            waitingSeg -> waitingSeg.getEndNode().equals(codeService.selectByData(blockAgvCode).getId())
                                            waitingSeg -> waitingSeg.getEndNode().equals(codeService.getCacheByData(blockAgvCode).getId())
                                    )) {
                                        maxJamTimeoutFactor = 1;
                                        break;
@@ -477,8 +477,8 @@
     * avoidPathList include wave node and dynamic node
     */
    private boolean notifyVehicleAvoid(String agvNo, String agvPosCode, List<String> avoidPathList, String sponsor, Jam jam) {
        Agv agv = agvService.selectByUuid(agvNo);
        if (!Cools.isEmpty(segmentService.getByAgvAndState(agv.getId(), SegmentStateType.RUNNING.toString()))) {
        Long agvId = agvService.getAgvId(agvNo);
        if (!Cools.isEmpty(segmentService.getByAgvAndState(agvId, SegmentStateType.RUNNING.toString()))) {
            log.warn("{}号车辆避让失败，存在进行中任务！！！", agvNo);
            return false;
        }
@@ -494,9 +494,9 @@
        }

        String endCodeData = finalNode.getCodeData();
        Code endCode = codeService.selectByData(endCodeData);
        Code endCode = codeService.getCacheByData(endCodeData);

        List<Segment> waitingSegList = segmentService.getByAgvAndState(agv.getId(), SegmentStateType.WAITING.toString());
        List<Segment> waitingSegList = segmentService.getByAgvAndState(agvId, SegmentStateType.WAITING.toString());
        if (!Cools.isEmpty(waitingSegList)) {

            if (waitingSegList.size() > 1) {
@@ -517,7 +517,7 @@
            Segment insertSeg = new Segment();
            insertSeg.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
            insertSeg.setTravelId(segment.getTravelId());
            insertSeg.setAgvId(agv.getId());
            insertSeg.setAgvId(agvId);
            insertSeg.setTaskId(segment.getTaskId());
            insertSeg.setSerial(segment.getSerial() - 1);
            insertSeg.setEndNode(endCode.getId());
@@ -533,7 +533,7 @@

        } else {

            return mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, endCodeData, jam);
            return mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, endCodeData, jam);
        }

        return true;