#
luxiaotao1123
2024-11-06 bb809ceda79f25ed58ef1e764ba7ffcae3254faa
#
4个文件已修改
257 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/BlockVehicleDto.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java 236 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/BlockVehicleDto.java
@@ -1,6 +1,7 @@
package com.zy.acs.manager.core.domain;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.framework.common.Cools;
import lombok.Data;
import java.util.ArrayList;
@@ -39,6 +40,18 @@
        return Objects.hash(vehicle);
    }
    public static boolean customContain(List<BlockVehicleDto> list, String vehicle) {
        if (Cools.isEmpty(list, vehicle)) {
            return false;
        }
        for (BlockVehicleDto dto : list) {
            if (dto.getVehicle().equals(vehicle)) {
                return true;
            }
        }
        return false;
    }
    public static void main(String[] args) {
        List<BlockVehicleDto> blockVehicleList = new ArrayList<>();
        blockVehicleList.add(new BlockVehicleDto("1", true));
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/RetreatNavigateService.java
@@ -31,7 +31,7 @@
    private final RedisSupport redis = RedisSupport.defaultRedisSupport;
    public static final int WEIGHT_CALC_COEFFICIENT = 10000;
    public static final int WEIGHT_CALC_FACTOR = 10000;
    @Autowired
    private CodeService codeService;
@@ -105,7 +105,7 @@
                        if (1 < mapDataDispatcher.queryCodeListFromDynamicNode(lev, otherWave).size()) {
                            continue label;
                        } else {
                            weight += WEIGHT_CALC_COEFFICIENT;
                            weight += WEIGHT_CALC_FACTOR;
                        }
                    }
                }
@@ -245,7 +245,7 @@
                                }
                                continue label;
                            } else {
                                weight += WEIGHT_CALC_COEFFICIENT;
                                weight += WEIGHT_CALC_FACTOR;
                            }
                        }
                    }
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -11,7 +11,6 @@
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.service.astart.RetreatNavigateNode;
import com.zy.acs.manager.core.service.astart.WaveNodeType;
import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.JamStateType;
import com.zy.acs.manager.manager.enums.SegmentStateType;
@@ -23,7 +22,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
@@ -36,7 +38,7 @@
    public static final Integer MIN_SLICE_PATH_LENGTH = 3;
    public static final Integer timeoutDuration = 5 * 1000;
    public static final Integer MAX_JAM_TIMEOUT = 5 * 1000;
    private final RedisSupport redis = RedisSupport.defaultRedisSupport;
@@ -69,9 +71,6 @@
    @Autowired
    private AvoidWaveCalculator avoidWaveCalculator;
    // todo
    //  1.故障
    @Transactional
    public synchronized void trigger(Segment segment) {
        try {
@@ -216,10 +215,11 @@
            if (!Cools.isEmpty(pathList)) {
                if (!pathList.get(pathList.size() - 1).equals(endCode.getData())) {
                    assert !Cools.isEmpty(blockVehicleList);
                    if (blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable())
                            && pathList.size() <= MIN_SLICE_PATH_LENGTH) {
                    boolean hasUnavoidableBlocks  = blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable());
                    if (hasUnavoidableBlocks && pathList.size() <= MIN_SLICE_PATH_LENGTH) {
                        log.info("AGV[{}] waiting in place, because the path list is too short...", agvNo);
                        pathList.clear();
                    }
                }
@@ -227,48 +227,76 @@
            // 无可走行路径
            } else {
                // 阻塞车辆列表
                assert !Cools.isEmpty(blockVehicleList);
                Integer maxJamTimeoutFactor = null;
                String blockAgvNo = blockVehicleList.stream()
                        .filter(BlockVehicleDto::isAvoidable)
                        .map(BlockVehicleDto::getVehicle)
                        .findFirst().orElse(null);
                // 如果全是运行中的阻塞agv,则不进行避让逻辑  todo
                if (Cools.isEmpty(blockAgvNo)) {
                    return pathList;
                }
                // persist jam data
                jam = this.createOrUpdateJam(agv, startCode, segment, jam);
                if (null == jam) {
                    jam = new Jam();
                    jam.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
                    jam.setJamAgv(agv.getId());
                    jam.setJamCode(startCode.getId());
                    jam.setJamSeg(segment.getId());
                    jam.setStartTime(now);
                    jam.setState(JamStateType.RUNNING.toString());
                    if (!jamService.save(jam)) {
                        log.error("{}号车辆在{}定位被阻塞,记录阻塞状态失败!!!", agvNo, startCode.getData());
                        return pathList;
                    }
                // ? has unAvoidable block vehicles
                if (blockVehicleList.stream().anyMatch(blockVehicleDto -> !blockVehicleDto.isAvoidable())) {
                    // set factor of jam timeout
                    maxJamTimeoutFactor = 1;
                } else {
                    jam.setDuration(System.currentTimeMillis() - jam.getStartTime().getTime());
                    if (!jamService.updateById(jam)) {
                        log.error("{}编号阻塞记录更新失败!!!", jam.getUuid());
                    // ? already do notify to avoid
                    if (!Cools.isEmpty(jam.getAvoAgv())
                            && BlockVehicleDto.customContain(blockVehicleList, agvService.getById(jam.getAvoAgv()).getUuid())) {
                        maxJamTimeoutFactor = 10;
                    } else {
                        // select optimal block vehicle
                        String blockAgvNo = blockVehicleList.stream()
                                .filter(BlockVehicleDto::isAvoidable)
                                .map(BlockVehicleDto::getVehicle)
                                .findFirst().orElse(null);
                        // block vehicle info
                        Agv blockAgv = agvService.selectByUuid(blockAgvNo);
                        String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgv.getId()).getRecentCode()).getData();
                        do {
                            // 阻塞车辆正在原地作业,等待 ===>> 超过等待时间,绕路
                            List<Segment> runningSegList = segmentService.getByAgvAndState(blockAgv.getId(), SegmentStateType.RUNNING.toString());
                            if (!Cools.isEmpty(runningSegList)) {
                                maxJamTimeoutFactor = 1;
                                break;
                            }
                            // 判断下个任务是否为原地任务,如果是则等待 ===>> 超过等待时间,绕路;如果不是,让阻塞车辆避让
                            Segment waitingSeg = segmentService.getJustWaitingSeg(blockAgv.getId());
                            if (null != waitingSeg && waitingSeg.getEndNode().equals(codeService.selectByData(blockAgvCode).getId())) {
                                maxJamTimeoutFactor = 1;
                                break;
                            }
                            // notify block vehicle to avoid
                            if (this.notifyVehicleAvoid(blockAgvNo, blockAgvCode, unlockPathList, agvNo, jam)) {
                                if (jam.getCycleAvo() == 1) {
                                    jam.setCycleCode(endCode.getId());
                                }
                                jam.setAvoAgv(blockAgv.getId());
                                jam.setNotifyTime(new Date());
                                if (!jamService.updateById(jam)) {
                                    throw new CoolException(jam.getUuid() + "-jam failed to update!!!");
                                }
                            } else {
                                maxJamTimeoutFactor = 1;
                            }
                        } while (false);
                    }
                }
                long previousTimestamp = jam.getStartTime().getTime();
                // jam vehicle info
                Agv blockAgv = agvService.selectByUuid(blockAgvNo);
                String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgv.getId()).getRecentCode()).getData();
                // jam vehicle dynamic on map matrix
                List<String> blockDynamicList = mapDataDispatcher.queryCodeListFromDynamicNode(lev, blockAgvNo);
                // 路径阻塞
                if (blockDynamicList.size() > 1) {
                    if (System.currentTimeMillis() - previousTimestamp > timeoutDuration) {
                // handle jam timeout
                if (null != maxJamTimeoutFactor) {
                    if (System.currentTimeMillis() - jam.getStartTime().getTime() > MAX_JAM_TIMEOUT * maxJamTimeoutFactor) {
                        if (!Cools.isEmpty(lockPathList)) {
@@ -278,95 +306,11 @@
                                    , agvNo, startCode.getData(), endCode.getData(), "路径阻塞超时");
                        }
                    } else {
                        log.info("{}号车辆正在等待交通堵塞,阻塞车辆:【{}】", agvNo, blockAgvNo);
                        log.warn("{}号车辆正在等待交通堵塞,阻塞车辆:【{}】"
                                , agvNo
                                , blockVehicleList.stream().map(BlockVehicleDto::getVehicle).collect(Collectors.toList()).toString()
                        );
                    }
                // 车辆阻塞
                } else {
                    // 已经通知车辆避让
                    if (!Cools.isEmpty(jam.getAvoAgv())) {
                        assert !Cools.isEmpty(jam.getNotifyTime());
                        if (System.currentTimeMillis() - jam.getNotifyTime().getTime() > timeoutDuration) {
                            log.warn("{}号车辆阻塞时间过长!!!已通知避让车辆【{}】...", agvNo, jam.getAvoAgv$());
                        }
                        return pathList;
                    }
                    do {
                        // 阻塞车辆正在作业,等待 ===>> 超过等待时间,绕路
                        List<Segment> runningSegList = segmentService.getByAgvAndState(blockAgv.getId(), SegmentStateType.RUNNING.toString());
                        if (!Cools.isEmpty(runningSegList)) {
                            if (System.currentTimeMillis() - previousTimestamp > timeoutDuration) {
                                if (!Cools.isEmpty(lockPathList)) {
                                    pathList = lockPathList;
                                } else {
                                    log.error("{}号车辆检索[{}] ===>> [{}]路径失败,原因:{}"
                                            , agvNo, startCode.getData(), endCode.getData(), "车辆阻塞超时");
                                }
                            } else {
                                log.info("{}号车辆正在等待交通堵塞,阻塞车辆:【{}】", agvNo, blockAgvNo);
                            }
                            break;
                        }
                        // 判断下个任务是否为原地任务,如果是则等待 ===>> 超过等待时间,绕路;如果不是,让阻塞车辆避让
                        Segment waitingSeg = segmentService.getJustWaitingSeg(blockAgv.getId());
                        if (null != waitingSeg) {
                            // 如果阻塞车辆待执行任务处于原地,则不能通知它避让
                            if (waitingSeg.getEndNode().equals(codeService.selectByData(blockAgvCode).getId())) {
                                if (System.currentTimeMillis() - previousTimestamp > Math.max((timeoutDuration / 30), (5 * 1000))) {
                                    if (!Cools.isEmpty(lockPathList)) {
                                        pathList = lockPathList;
                                    } else {
                                        log.error("{}号车辆检索[{}] ===>> [{}]路径失败,原因:{}"
                                                , agvNo, startCode.getData(), endCode.getData(), "车辆阻塞超时");
                                    }
                                } else {
                                    log.info("{}号车辆正在等待交通堵塞,阻塞车辆:【{}】", agvNo, blockAgvNo);
                                }
                                break;
                            }
                        }
                        // 通知阻塞车辆避让
                        if (this.notifyVehicleAvoid(blockAgvNo, blockAgvCode, unlockPathList, agvNo, jam)) {
                            if (jam.getCycleAvo() == 1) {
                                jam.setCycleCode(endCode.getId());
                            }
                            jam.setAvoAgv(blockAgv.getId());
                            jam.setNotifyTime(new Date());
                            if (!jamService.updateById(jam)) {
//                                log.error("{}编号阻塞记录更新失败!!!", jam.getUuid());
                                throw new CoolException(jam.getUuid() + "编号阻塞记录更新失败!!!");
                            }
                        } else {
                            if (System.currentTimeMillis() - previousTimestamp > timeoutDuration) {
                                if (!Cools.isEmpty(lockPathList)) {
                                    pathList = lockPathList;
                                } else {
                                    log.error("{}号车辆检索[{}] ===>> [{}]路径失败,原因:{}"
                                            , agvNo, startCode.getData(), endCode.getData(), "车辆阻塞超时");
                                }
                            } else {
                                log.info("{}号车辆正在等待交通堵塞,阻塞车辆:【{}】", agvNo, blockAgvNo);
                            }
                        }
                    } while (false);
                }
            }
@@ -380,7 +324,7 @@
                jam.setUpdateTime(now);
                jam.setState(JamStateType.FINISH.toString());
                if (!jamService.updateById(jam)) {
                    log.error("{}编号阻塞记录完成修改失败!!!", jam.getUuid());
                    log.error("Jam[{}] failed to update!!!", jam.getUuid());
                }
            }
            // deal expired jam
@@ -391,7 +335,7 @@
                expiredJam.setUpdateTime(now);
                expiredJam.setState(JamStateType.FINISH.toString());
                if (!jamService.updateById(expiredJam)) {
                    log.error("{}编号阻塞记录完成修改失败!!!", expiredJam.getUuid());
                    log.error("Jam[{}] failed to update!!!", expiredJam.getUuid());
                }
            }
@@ -403,7 +347,7 @@
    private List<BlockVehicleDto> slicePathAndReturnBlockVehicleList(Integer lev, List<String> fullPathList, String agvNo, List<String> pathList) {
        List<BlockVehicleDto> blockVehicleList = new ArrayList<>();
        DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(lev);
//        DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(lev);
        String[][] waveMatrix = mapDataDispatcher.getWaveMatrix(lev);
        for (String code : fullPathList) {
            int[] node = mapDataDispatcher.getCodeMatrixIdx(lev, code);
@@ -503,4 +447,26 @@
        return true;
    }
    private Jam createOrUpdateJam(Agv agv, Code startCode, Segment segment, Jam jam) {
        if (jam == null) {
            jam = new Jam();
            jam.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
            jam.setJamAgv(agv.getId());
            jam.setJamCode(startCode.getId());
            jam.setJamSeg(segment.getId());
            jam.setStartTime(new Date());
            jam.setState(JamStateType.RUNNING.toString());
            if (!jamService.save(jam)) {
                log.error("AGV[{}] failed to save jam", agv.getUuid());
                throw new CoolException("failed to save jam");
            }
        } else {
            jam.setDuration(System.currentTimeMillis() - jam.getStartTime().getTime());
            if (!jamService.updateById(jam)) {
                log.error("AGV[{}] failed to update jam", agv.getUuid());
            }
        }
        return jam;
    }
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java
@@ -2,13 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Jam;
import com.zy.acs.manager.manager.enums.JamStateType;
import com.zy.acs.manager.manager.mapper.JamMapper;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.JamService;
import com.zy.acs.framework.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;