#
luxiaotao1123
2024-10-28 bcbb624e1621fcd82ca081009a4d8097c662feac
#
4个文件已修改
74 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/Lane.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/Lane.java
@@ -13,6 +13,8 @@
    private String laneId;
    private String hashCode;
    private List<String> codes = new ArrayList<>();
    public Lane() {
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
@@ -15,10 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * Created by vincent on 8/12/2024
@@ -72,9 +69,21 @@
    public synchronized Agv execute(Task task) {
        List<Agv> availableAgvList = getAvailableAgv();
        if (Cools.isEmpty(availableAgvList)) {
            log.warn("No available agv to assign the task[{}]", task.getSeqNum());
            return null;
        }
        Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
        /**
         * 1.   判断task的起始点和目的点所在的巷道承载任务数量,
         *      如果数量已经达到负载,则判断负载任务的AGV是否还有空背篓,如果有则优先派发给它,
         *      如果没有了,那么则阻塞任务,直到该巷道释放
         *
         * 2.   轮询空闲小车,目标是让每台小车都动起来
         *      判断逻辑:背篓数量最少的小车轮询的时候,优先级最高
         */
        return null;
    }
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java
@@ -1,17 +1,21 @@
package com.zy.acs.manager.core.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.core.domain.Lane;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.RouteService;
import com.zy.acs.manager.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.stream.Collectors;
@@ -34,6 +38,8 @@
    private RouteService routeService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private ConfigService configService;
    public Boolean isInitialized() {
        return this.initialized;
@@ -53,7 +59,7 @@
    @PostConstruct
    public synchronized void init() {
        log.info("the rcs system is starting to initialze lane data...");
        log.info("the rcs system is starting to initialize lane data...");
        List<Code> codeList = codeService.list(new LambdaQueryWrapper<Code>().eq(Code::getStatus, 1));
        this.fillAdjacencyCodeMap(codeList);
@@ -66,8 +72,12 @@
        this.filterLanesWithFewPoints();
        this.generateLaneHash();
        this.initialized = Boolean.TRUE;
        log.info("the lane data initialzation has been completed in rcs system.");
        log.info("the lane data initialization has been completed in rcs system.");
        System.out.println(GsonUtils.toJson(this.lanes));
    }
    private void fillAdjacencyCodeMap(List<Code> codeList) {
@@ -259,7 +269,34 @@
    }
    private void filterLanesWithFewPoints() {
        this.lanes.removeIf(next -> next.getCodes().size() <= 2);
        Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
        this.lanes.removeIf(next -> next.getCodes().size() <= Optional.ofNullable(maxAgvCountInLane).orElse(2));
    }
    private void generateLaneHash() {
        for (Lane lane : this.lanes) {
            String hashCode = generateDigest(lane.getCodes());
            lane.setHashCode(hashCode);
        }
    }
    public static String generateDigest(List<String> list) {
        MessageDigest md = null;
        try {
            md = MessageDigest.getInstance("SHA-256");
        } catch (NoSuchAlgorithmException e) {
            log.error("generateDigest", e);
            throw new RuntimeException(e);
        }
        String combined = list.stream().sorted().collect(Collectors.joining(","));
        byte[] hashBytes = md.digest(combined.getBytes());
        StringBuilder sb = new StringBuilder();
        for (byte b : hashBytes) {
            sb.append(String.format("%02x", b));
        }
        return sb.toString();
    }
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -116,6 +116,12 @@
    private Long oriCode;
    /**
     * 起始巷道哈希
     */
    @ApiModelProperty(value= "起始巷道哈希")
    private Long oriLaneHash;
    /**
     * 目标站
     */
    @ApiModelProperty(value= "目标站")
@@ -134,6 +140,12 @@
    private Long destCode;
    /**
     * 目标巷道哈希
     */
    @ApiModelProperty(value= "目标巷道哈希")
    private Long destLaneHash;
    /**
     * 空板
     */
    @ApiModelProperty(value= "空板")