#

luxiaotao1123

2024-09-20 c07c14d7768098f82807d8598ad3fb5c392bd3c0

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java

@@ -1,10 +1,18 @@
package com.zy.acs.manager.manager.controller.result;

import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.TaskService;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * Created by vincent on 9/20/2024
@@ -21,8 +29,9 @@

    private String code = "-";

    private List<Long> taskIds = new ArrayList<>();

    public void sync(Object obj, CodeService codeService) {
    public void sync(Object obj, CodeService codeService, TaskService taskService) {
        if (null == obj) return;
        if (obj instanceof AgvDetail) {
            AgvDetail agvDetail = (AgvDetail) obj;
@@ -36,6 +45,13 @@
            if (null != agvDetail.getRecentCode()) {
                this.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
            }
            List<Task> tasks = taskService.selectInSts(agvDetail.getAgvId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
            if (!Cools.isEmpty(tasks)) {
                this.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
                this.getTaskIds().add(6441L);
                this.getTaskIds().add(6442L);
                this.getTaskIds().add(6443L);
            }
        }
    }