#

luxiaotao1123

2024-10-28 052ee1f9c0b9e2bc8bbd4cf135ae45fed7422023

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

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.common.utils.JudgeSupport;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.common.domain.BaseParam;
@@ -67,19 +66,19 @@

    @Override
    public Boolean judgeEnable(Long agvId) {
        return this.judgeEnable(agvId, null);
        return this.judgeEnable(agvId, false);
    }

    @Override
    public Boolean judgeEnable(Long agvId, JudgeSupport<AgvDetail> support) {
    public Boolean judgeEnable(Long agvId, Boolean withBattery) {
        Agv agv = this.getById(agvId);
        AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
        if (segmentService.count(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getAgvId, agvId)
                .and( i -> {
                        .eq(Segment::getAgvId, agvId)
                        .and( i -> {
//                    i.eq(Segment::getState, SegmentStateType.WAITING.toString()).or()
                    i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
                })
                            i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
                        })
        ) > 0) {
            log.warn("[{}]号Agv正在忙碌 -segment......", agv.getUuid());
            return false;
@@ -105,17 +104,24 @@
                return false;
            }
        }
        if (support != null) {
            if (!support.execute(agvDetail)) {
                return false;
            }
        }
        if (!agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
            if (agvDetail.getPos() != 1) {
                log.warn("[{}]号Agv当前不在定位......", agv.getUuid());
                return false;
            }
        }
        // with battery
        if (withBattery) {
            if (agvDetail.getVol() < agv.getChargeLine()) {
                log.warn("[{}]号Agv电量不足......", agv.getUuid());
                return false;
            }
            if (agvDetail.getVol() < agvModel.getLowBattery()) {
                log.warn("[{}]号Agv电量不足......", agv.getUuid());
                return false;
            }
        }

        return true;
    }