#

luxiaotao1123

2025-01-08 36dcec12994c82fffe2a86a6acf12ecbd071fffb

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

@@ -5,6 +5,7 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.enums.JamStateType;
import com.zy.acs.manager.manager.mapper.JamMapper;
import com.zy.acs.manager.manager.service.AgvService;
@@ -40,13 +41,23 @@
        return null;
    }

    /**
     * 因为你而阻塞的车,现在你已经在避让点了
     * 你的下一个segment是不是又会导致阻塞
     */
    @Override
    public List<Jam> getUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) {
        return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, currCode, null);
    }

    @Override
    public Jam getCycleJam(Long jamAgv, Long jamSeg, String avoAgvNo) {
        List<Jam> jams = this.list(new LambdaQueryWrapper<Jam>()
                .eq(Jam::getJamAgv, jamAgv)
                .eq(Jam::getJamSeg, jamSeg)
                .eq(Jam::getAvoAgv, agvService.selectByUuid(avoAgvNo).getId())
                .eq(Jam::getAvoAgv, agvService.getAgvId(avoAgvNo))
                .eq(Jam::getCycleAvo, 1)
                .ne(Jam::getState, JamStateType.DEPRECATED.toString())
//                .eq(Jam::getState, JamStateType.RUNNING.toString())
        );
        if (!Cools.isEmpty(jams)) {
@@ -56,6 +67,18 @@
    }

    @Override
    public List<Jam> getJamFromSegmentByAvo(Segment jamSeg, String avoAgvNo) {
        Long avoAgvId = agvService.getAgvId(avoAgvNo);
        return this.baseMapper.selectJamFromSegmentByAvo(jamSeg.getId(), avoAgvId);
    }

    @Override
    public List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg) {
        Long agvId = agvService.getAgvId(avoAgvNo);
        return this.baseMapper.selectUnfinishedAvoSegByAvo(agvId, null);
    }

    @Override
    public List<Jam> queryByAvoid(Long avoAgv, JamStateType jamState) {
        if (null == avoAgv) {
            return null;