#

vincentlu

2025-01-13 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f

 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;
@@ -45,8 +46,8 @@
     * 你的下一个segment是不是又会导致阻塞
     */
    @Override
    public List<Jam> hasUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) {
        return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, null, null);
    public List<Jam> getUnfinishedOriginJamByAvo(Long avoAgv, Long currCode, Long currSeg) {
        return this.baseMapper.selectUnfinishedJamByAvo(avoAgv, currCode, null);
    }

    @Override
@@ -54,14 +55,27 @@
        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)) {
            return jams.stream().findFirst().orElse(null);
        }
        return null;
    }

    @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
@@ -82,7 +96,7 @@
            return null;
        }
        Date now = new Date();
        Code code = codeService.selectByData(currCodeData);
        Code code = codeService.getCacheByData(currCodeData);
        List<Jam> jams = this.list(new LambdaQueryWrapper<Jam>()
                .eq(Jam::getAvoAgv, avoAgv)
                .eq(Jam::getAvoCode, code.getId())