#

luxiaotao1123

2024-11-26 c7ac2c8bb899b0785daaa9f72a69581bdb93fef1

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

@@ -13,7 +13,6 @@
import com.zy.acs.manager.manager.controller.result.AgvResult;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.SegmentStateType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.mapper.AgvMapper;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.service.ConfigService;
@@ -46,6 +45,8 @@
    private CodeService codeService;
    @Autowired
    private SegmentService segmentService;
    @Autowired
    private TaskService taskService;

    @Override
    public PageResult<AgvResult> pageRel(PageParam<Agv, BaseParam> pageParam) {
@@ -74,16 +75,24 @@
    public Boolean judgeEnable(Long agvId, Boolean withBattery) {
        Agv agv = this.getById(agvId);
        AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
        if (segmentService.count(new LambdaQueryWrapper<Segment>()
        if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
                        .eq(Segment::getAgvId, agvId)
                        .and( i -> {
//                    i.eq(Segment::getState, SegmentStateType.WAITING.toString()).or()
                            i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
                        })
        ) > 0) {
            log.warn("[{}]号Agv正在忙碌 -segment......", agv.getUuid());
        )) {
            log.warn("[{}]号Agv正在忙碌 - segment......", agv.getUuid());
            return false;
        }
//        if (0 < taskService.count(new LambdaQueryWrapper<Task>()
//                .eq(Task::getAgvId, agvId)
//                .eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val())
//                .in(Task::getTaskSts, TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
//        )){
//            log.warn("[{}]号Agv正在去充电 - task......", agv.getUuid());
//            return false;
//        }
        if (!this.judgeOnline(agv.getId())) {
            log.warn("[{}]号Agv不是在线状态......", agv.getUuid());
            return false;
@@ -107,6 +116,10 @@
        }
        if (!agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
            if (agvDetail.getPos() != 1) {
                log.warn("[{}]号Agv当前不在定位......", agv.getUuid());
                return false;
            }
            if (null == agvDetail.getRecentCode()) {
                log.warn("[{}]号Agv当前不在定位......", agv.getUuid());
                return false;
            }
@@ -149,9 +162,9 @@

    @Override
    public Integer getBackpack(Agv agv) {
        if (null != agv.getStage()) {
            return agv.getStage();
        }
//        if (null != agv.getStage()) {
//            return agv.getStage();
//        }
        AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
        assert null != agvModel;
        return agvModel.getBackpack();
@@ -159,7 +172,9 @@

    @Override
    public Agv findByPosition(Long codeId) {
        List<Agv> agvList = this.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
        List<Agv> agvList = this.list(new LambdaQueryWrapper<Agv>()
//                .eq(Agv::getStatus, StatusType.ENABLE.val)
        );
        for (Agv agv : agvList) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            if (null == agvDetail) {