#

luxiaotao1123

2024-10-07 5efde10d84194cb7e5ace0336f5d694898e4652b

#

 version/logical-line.xmind

Binary files differ

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

@@ -12,6 +12,7 @@
import com.zy.acs.manager.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.stream.Collectors;
@@ -32,6 +33,8 @@
    private AgvDetailService agvDetailService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private BusService busService;

    @Override
    public List<MissionVo> getList(Long agvId, String groupNo) {
@@ -116,6 +119,7 @@
    }

    @Override
    @Transactional
    public Boolean resend(List<Action> actionList) {
        if (Cools.isEmpty(actionList)) {
            return Boolean.FALSE;
@@ -135,7 +139,7 @@
        for (Action action : newActionList) {
            action.setPriority(i);
            if (!actionService.save(action)) {
                throw new BusinessException(action.getName() + "动作更新失败");
                throw new BusinessException(action.getName() + " Action Update Fail!");
            }
            i -= 1;
        }
@@ -149,7 +153,7 @@
                task.setUpdateTime(now);
                task.setIoTime(now);
                if (!taskService.updateById(task)) {
                    throw new BusinessException(task.getUuid() + "任务更新失败");
                    throw new BusinessException(task.getUuid() + " Task Update Fail!");
                }
                busIds.add(task.getBusId());
            }
@@ -160,7 +164,7 @@
                bus.setBusSts(BusStsType.PROGRESS.val());
                bus.setUpdateTime(now);
                if (!busService.updateById(bus)) {
                    throw new BusinessException(bus.getUuid() + "总线更新失败");
                    throw new BusinessException(bus.getUuid() + " Bus Update Fail!");
                }
            }
        }