#
vincentlu
2025-01-20 b0855265d373b2dd46e34815e90887fb89d89b54
#
7个文件已修改
197 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/cache/CoreCache.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java 171 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/CodeMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/CodeService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/resources/mapper/manager/CodeMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/cache/CoreCache.java
@@ -5,6 +5,6 @@
public class CoreCache {
    public static final Map<Long, Integer> AGV_BACKPACK_CACHE = new ConcurrentHashMap<>();
    public static final Map<Long, Integer> AGV_BACKPACK_USED_CACHE = new ConcurrentHashMap<>();
}
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -4,9 +4,9 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.core.cache.CoreCache;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.enums.TravelStateType;
import com.zy.acs.manager.manager.service.*;
@@ -38,6 +38,25 @@
    private List<String> CODE_DATA_CACHE = new ArrayList<>();
    private List<String> LOC_CODE_DATA_CACHE = new ArrayList<>();
    private List<String> CONVEYOR_DROP_CODE_DATA_CACHE = new ArrayList<String>(){{
        add("00000048");
    }};
    private List<String> CONVEYOR_PICK_CODE_DATA_CACHE = new ArrayList<String>(){{
        add("00000246");
    }};
    private Map<String, JobType> agvJobMap = new ConcurrentHashMap<>();
    public enum JobType {
        CONVEYOR_PICK,
        CONVEYOR_DROP,
        LOC_PICK,
        LOCK_DROP,
        ;
    }
    @Autowired
    private AgvService agvService;
    @Autowired
@@ -56,6 +75,137 @@
    private AllocateService allocateService;
    @Autowired
    private ConfigService configService;
    @Autowired
    private AgvModelService agvModelService;
    // pick & drop logic --------------------------------------------------
    private void executeUShapeConveyor(String agvNo) {
        Long agvId = agvService.getAgvId(agvNo);
        if (0 < travelService.count(new LambdaQueryWrapper<Travel>()
                .eq(Travel::getAgvId, agvId)
                .eq(Travel::getState, TravelStateType.RUNNING.toString()))) {
            return;
        }
        if (!agvService.judgeEnable(agvId)) {
            return;
        }
//        // 已使用背篓数量
//        Integer usedSlots = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
//        if (null == usedSlots) {
//            return;
//        }
//        AgvModel agvModel = agvModelService.getByAgvId(agvId);
//        // 背篓空闲数
//        int remainingBackpack = Math.max(agvModel.getBackpack() - usedSlots, 0);
        String destinationCodeData = null;
        JobType jobType = this.agvJobMap.get(agvNo);
        if (null == jobType) {
            this.agvJobMap.put(agvNo, JobType.LOC_PICK);
            CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, 0);
            jobType = JobType.LOC_PICK;
        }
        switch (jobType) {
            case LOC_PICK:
                int locPickRemaining = agvService.getBackpackRemainingCapacity(agvId);
                if (0 < locPickRemaining) {
                    destinationCodeData = this.getLocCode(agvNo, null);
                }
                break;
            case CONVEYOR_DROP:
                destinationCodeData = this.getConveyorDropCode(agvNo);
                break;
            case CONVEYOR_PICK:
                destinationCodeData = this.getConveyorPickCode(agvNo);
                break;
            case LOCK_DROP:
                int locDropRemaining = agvService.getBackpackRemainingCapacity(agvId);
                if (0 < locDropRemaining) {
                    destinationCodeData = this.getLocCode(agvNo, null);
                }
                break;
            default:
                log.warn("AGV {}: 未知阶段: {}", agvNo, jobType);
                break;
        }
        if (Cools.isEmpty(destinationCodeData)) {
            return;
        }
        if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null)) {
            log.info( "{}开始作业演示...", agvNo);
            switch (jobType) {
                case LOC_PICK:
                    Integer usedSlotsByLocPick = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
                    usedSlotsByLocPick++;
                    if (Objects.equals(agvModelService.getByAgvId(agvId).getBackpack(), usedSlotsByLocPick)) {
                        this.agvJobMap.put(agvNo, JobType.CONVEYOR_DROP);
                    } else {
                        CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, usedSlotsByLocPick);
                    }
                    break;
                case CONVEYOR_DROP:
                    CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, 0);
                    this.agvJobMap.put(agvNo, JobType.CONVEYOR_PICK);
                    break;
                case CONVEYOR_PICK:
                    CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, agvModelService.getByAgvId(agvId).getBackpack());
                    this.agvJobMap.put(agvNo, JobType.LOCK_DROP);
                    break;
                case LOCK_DROP:
                    Integer usedSlotsByLocDrop = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
                    usedSlotsByLocDrop--;
                    if (usedSlotsByLocDrop == 0) {
                        this.agvJobMap.put(agvNo, JobType.LOC_PICK);
                    } else {
                        CoreCache.AGV_BACKPACK_USED_CACHE.put(agvId, usedSlotsByLocDrop);
                    }
                    break;
                default:
                    break;
            }
        }
    }
    public String getLocCode(String agvNo, AgvDetail agvDetail) {
        if (LOC_CODE_DATA_CACHE.isEmpty()) {
            return null;
        }
        Collections.shuffle(LOC_CODE_DATA_CACHE);
        for (String locCodeData : LOC_CODE_DATA_CACHE) {
            Code locCode = codeService.getCacheByData(locCodeData);
            // valid lane
            if (!allocateService.validCapacityOfLane(agvNo, locCode)) {
                continue;
            }
            return locCodeData;
        }
        return LOC_CODE_DATA_CACHE.stream().findFirst().orElse(null);
    }
    public String getConveyorDropCode(String agvNo) {
        return CONVEYOR_DROP_CODE_DATA_CACHE.stream().findFirst().orElse(null);
    }
    public String getConveyorPickCode(String agvNo) {
        return CONVEYOR_PICK_CODE_DATA_CACHE.stream().findFirst().orElse(null);
    }
    // pure move logic --------------------------------------------------
    private void executePatrolLogic(String agvNo) {
        this.patrolOfMove(agvNo);
@@ -77,7 +227,7 @@
            return;
        }
        if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null)) {
            log.info(agvNo + "开始走行演示...");
            log.info( "{}开始走行演示...", agvNo);
        }
    }
@@ -154,22 +304,23 @@
        Runnable patrolTask = () -> {
            try {
                executePatrolLogic(agvNo);
//                executePatrolLogic(agvNo);
                executeUShapeConveyor(agvNo);
            } catch (Exception e) {
                log.error("执行AGV " + agvNo + " 跑库任务时发生异常: " + e.getMessage());
                e.printStackTrace();
                log.error("执行AGV{}跑库任务时发生异常: {}", agvNo, e.getMessage());
            }
        };
        ScheduledFuture<?> scheduledFuture = scheduler.scheduleAtFixedRate(patrolTask, 0, SCHEDULE_TIME_INTERVAL, TimeUnit.MILLISECONDS);
        AGV_PATROL_MAP.put(agvNo, scheduledFuture);
        log.info("已启动AGV " + agvNo + " 的跑库任务。");
        log.info("已启动AGV{}的跑库任务。", agvNo);
        return R.ok();
    }
    public R shutdownPatrol(String agvNo) {
        Long agvId = agvService.getAgvId(agvNo);
        ScheduledFuture<?> scheduledFuture = AGV_PATROL_MAP.get(agvNo);
        if (scheduledFuture == null) {
            return R.error("AGV " + agvNo + " 没有正在运行的跑库任务。");
@@ -178,6 +329,8 @@
        boolean cancelled = scheduledFuture.cancel(true);
        if (cancelled) {
            AGV_PATROL_MAP.remove(agvNo);
            CoreCache.AGV_BACKPACK_USED_CACHE.remove(agvId);
            this.agvJobMap.remove(agvNo);
            log.info("已停止AGV " + agvNo + " 的跑库任务。");
            return R.ok("已停止AGV " + agvNo + " 的跑库任务。");
        } else {
@@ -192,8 +345,14 @@
        if (count > 0) {
            this.scheduler = Executors.newScheduledThreadPool(count);
        }
        // init all code data
        List<Code> codeList = codeService.list(new LambdaQueryWrapper<Code>().eq(Code::getStatus, StatusType.ENABLE.val));
        this.CODE_DATA_CACHE = codeList.stream().map(Code::getData).distinct().collect(Collectors.toList());
        // int all loc code data
        List<Code> locCodeList = codeService.getAllLocCode();
        this.LOC_CODE_DATA_CACHE = locCodeList.stream().map(Code::getData).distinct().collect(Collectors.toList());
    }
    @PreDestroy
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/CodeMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.acs.manager.manager.entity.Code;
import java.util.List;
import java.util.Map;
public interface CodeMapper extends BaseMapper<Code> {
@@ -13,4 +14,6 @@
    int selectDistinctCountFromY();
    List<Long> selectAllLocCode();
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/CodeService.java
@@ -22,4 +22,6 @@
    int selectDistinctCountFromY();
    List<Code> getAllLocCode();
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -211,8 +211,8 @@
    @Override
    public int getBackpackRemainingCapacity(Long agvId) {
        int usedSlots = 0;
        Integer backpackCache = CoreCache.AGV_BACKPACK_CACHE.get(agvId);
        if (null != backpackCache) {
        Integer usedBackpack = CoreCache.AGV_BACKPACK_USED_CACHE.get(agvId);
        if (null == usedBackpack) {
            usedSlots = taskService.findTransportTasksCountByAgv(agvId);
        }
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -201,4 +202,14 @@
        return this.baseMapper.selectDistinctCountFromY();
    }
    @Override
    public List<Code> getAllLocCode() {
        List<Long> ids = this.baseMapper.selectAllLocCode();
        List<Code> codeList = new ArrayList<>();
        for (Long id : ids) {
            codeList.add(this.getById(id));
        }
        return codeList;
    }
}
zy-acs-manager/src/main/resources/mapper/manager/CodeMapper.xml
@@ -53,4 +53,8 @@
        AND deleted = 0
    </select>
    <select id="selectAllLocCode" resultType="java.lang.Long">
        select distinct code from man_loc where 1=1 and code is not null
    </select>
</mapper>