#

luxiaotao1123

2024-11-09 20aa51767d2bcc0baf30e1eee5ccce05ace9a6fe

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

@@ -162,11 +162,42 @@
    }

    @Override
    public List<Task> findTasksByLaneHash(String laneHash) {
    public List<Task> findRunningTasksByLaneHash(String laneHash) {
        if (Cools.isEmpty(laneHash)) {
            return new ArrayList<>();
        }
        return this.list(new LambdaQueryWrapper<Task>().eq(Task::getOriLaneHash, laneHash).or().eq(Task::getDestLaneHash, laneHash));
        return this.list(new LambdaQueryWrapper<Task>()
                .in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val())
                .and(i -> {
                    i.eq(Task::getOriLaneHash, laneHash).or().eq(Task::getDestLaneHash, laneHash);
                })

        );
    }

    @Override
    public List<Task> findRunningTasksByAgv(Long agvId) {
        if (null == agvId) {
            return new ArrayList<>();
        }
        LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>().eq(Task::getAgvId, agvId);
        wrapper.in(Task::getTaskSts, TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val());
        wrapper.notIn(Task::getTaskType, TaskTypeType.MOVE.val(), TaskTypeType.TO_CHARGE.val(), TaskTypeType.TO_STANDBY.val());
        return this.list(wrapper);
    }

    @Override
    public Task findLatestTask(Long agvId, TaskStsType taskSts) {
        LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<Task>()
                .orderByDesc(Task::getCreateTime)
                .last("limit 0, 1");
        if (null != agvId) {
            wrapper.eq(Task::getAgvId, agvId);
        }
        if (null != taskSts) {
            wrapper.eq(Task::getTaskSts, taskSts.val());
        }
        return this.list(wrapper).stream().findFirst().orElse(null);
    }

    @Transactional