#

vincentlu

8 天以前 efabc6ba991acfd01d38bb0bf4e8cfd772416617

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

@@ -2,7 +2,9 @@

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.framework.exception.CoolException;
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.manager.entity.Segment;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.ActionStsType;
@@ -10,7 +12,6 @@
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.mapper.SegmentMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,6 +34,8 @@
    private TaskService taskService;
    @Autowired
    private ActionService actionService;
    @Autowired
    private CodeService codeService;

    @Override
    public void processNext(List<Segment> segmentList) {
@@ -65,12 +68,12 @@
    }

    @Override
    public Segment getPreviousStepOfFinish(Long travelId, Integer serial, String memo) {
    public Segment getPreviousStepOfFinish(Long travelId, Integer serial) {
        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)
                .eq(Segment::getState, SegmentStateType.FINISH.toString())
                .orderByDesc(Segment::getId)
        );
    }

@@ -131,7 +134,7 @@
        for (Segment seg : segmentList) {
            Task task = taskService.getById(segment.getTaskId());
            if (task != null &&
                    (!task.getTaskTypeEl().equals(TaskStsType.COMPLETE.toString()) || !task.getTaskTypeEl().equals(TaskStsType.CANCEL.toString()))) {
                    (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) && !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
                throw new CoolException("the task is not finish");
            }
            seg.setState(SegmentStateType.FINISH.toString());
@@ -146,4 +149,49 @@
        return Boolean.TRUE;
    }

    @Override
    public Segment getCurrRunningSeg(Long agvId, Long codeId) {
        List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getAgvId, agvId)
                .eq(Segment::getState, SegmentStateType.RUNNING.toString())
                .eq(Segment::getEndNode, codeId)
                .orderByDesc(Segment::getId)
        );

        if (Cools.isEmpty(segments)) {

        }
        return segments.stream().findFirst().orElse(null);
    }

    @Override
    public List<Integer> selectUsedBackpacks(Long travelId, Long agvId) {
        return this.baseMapper.selectUsedBackpacks(agvId, travelId);
    }

    @Override
    public Segment getRollerWaiting(Long agvId, Long codeId, TaskPosDto.PosType posType) {
        List<Segment> segments = this.list(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getAgvId, agvId)
                .eq(Segment::getState, SegmentStateType.WAITING.toString())
                .eq(Segment::getEndNode, codeId)
                .eq(Segment::getPosType, posType.toString())
                .eq(Segment::getRollerWaiting, 1)
                .orderByDesc(Segment::getId)
        );
        if (Cools.isEmpty(segments)) {
            return null;
        }
        return segments.get(0);
    }

    @Override
    public Boolean isRollerWaiting(Long agvId) {
        return 0 < this.count(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getAgvId, agvId)
                .eq(Segment::getState, SegmentStateType.WAITING.toString())
                .eq(Segment::getRollerWaiting, 1)
        );
    }

}