#

luxiaotao1123

2024-12-17 d3d3857cda8b4307d8f03bf15ec9fb2c98c34b64

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

@@ -2,13 +2,16 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Agv;
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;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.JamService;
import com.zy.acs.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,6 +25,8 @@

    @Autowired
    private CodeService codeService;
    @Autowired
    private AgvService agvService;

    @Override
    public Jam getJam(Long agvId, Long jamCode, Long jamSeg) {
@@ -35,6 +40,55 @@
            return jams.stream().findFirst().orElse(null);
        }
        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::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) {
        Agv avoAgv = agvService.selectByUuid(avoAgvNo);
        return this.baseMapper.selectJamFromSegmentByAvo(jamSeg.getId(), avoAgv.getId());
    }

    @Override
    public List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg) {
        Agv avoAgv = agvService.selectByUuid(avoAgvNo);
        return this.baseMapper.selectUnfinishedAvoSegByAvo(avoAgv.getId(), null);
    }

    @Override
    public List<Jam> queryByAvoid(Long avoAgv, JamStateType jamState) {
        if (null == avoAgv) {
            return null;
        }
        LambdaQueryWrapper<Jam> wrapper = new LambdaQueryWrapper<Jam>().eq(Jam::getAvoAgv, avoAgv);
        if (null != jamState) {
            wrapper.eq(Jam::getState, jamState.toString());
        }
        return this.list(wrapper);
    }

    @Override
@@ -62,7 +116,16 @@

    @Override
    public boolean deprecate(Long id, Long loginUserId) {
        return false;
        Jam jam = this.getById(id);
        if (null == jam) {
            return false;
        }
        Date now = new Date();
        jam.setState(JamStateType.DEPRECATED.toString());
        jam.setUpdateTime(now);
        jam.setEndTime(now);
        jam.setUpdateBy(loginUserId);
        return this.updateById(jam);
    }

}