#

vincentlu

2025-03-27 cd67e854d4715bc92a16dc7bffdbde7be1da9957

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java

@@ -8,10 +8,14 @@
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.SegmentService;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.service.TravelService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;

@Slf4j
@@ -20,6 +24,29 @@

    @Autowired
    private AgvService agvService;
    @Autowired
    private TravelService travelService;

    @Override
    public void processNext(List<Segment> segmentList) {

        segmentList.stream().max(Comparator.comparingInt(Segment::getSerial)).ifPresent(segment -> {
            Segment nextSegment = this.getNextStepOfInit(segment.getTravelId(), segment.getSerial());

            if (null != nextSegment) {

                nextSegment.setState(SegmentStateType.WAITING.toString());
                nextSegment.setUpdateTime(new Date());
                if (!this.updateById(nextSegment)) {
                    log.error("Segment [{}] failed to update ！！！", nextSegment.getGroupId() + " - " + nextSegment.getSerial());
                }

            } else {

                travelService.checkFinish(segment.getTravelId());
            }
        });
    }

    @Override
    public Segment getNextStepOfInit(Long travelId, Integer serial) {
@@ -31,7 +58,17 @@
    }

    @Override
    public Segment getJustWaitingSeg(Long agvId) {
    public Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo) {
        return this.getOne(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getTravelId, travelId)
                .eq(Segment::getSerial, serial - 1)
//                .eq(Segment::getState, SegmentStateType.FINISH.toString())
                .eq(Segment::getMemo, memo)
        );
    }

    @Override
    public List<Segment> getJustWaitingSeg(Long agvId) {
        if (null == agvId) {
            return null;
        }
@@ -42,7 +79,7 @@
            if (waitingSegList.size() > 1) {
                log.error("{}号车辆存在多个等待中的Segment！！！", agvService.getById(agvId).getUuid());
            }
            return waitingSegList.get(0);
            return waitingSegList;
        }
    }

@@ -60,4 +97,20 @@
        );
    }

    @Override
    public List<String> getGroupNo(SegmentStateType state, Long agvId, String groupNo) {
        return this.baseMapper.getGroupNo(state.toString(), agvId, groupNo);
    }

    @Override
    public List<Segment> getRunningByEndCode(Long codeId) {
        if (null == codeId) {
            return new ArrayList<>();
        }
        return this.list(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getEndNode, codeId)
                .in(Segment::getState, SegmentStateType.WAITING.toString(), SegmentStateType.RUNNING.toString())
        );
    }

}