#
Junjie
昨天 26143b3716bd144021f9994c96f328609914bf11
#
5个文件已修改
230 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/utils/NavigateUtils.java 216 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/sql/20260313_create_station_path_policy_tables.sql 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/stationPathPolicy/stationPathPolicy.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java
@@ -21,6 +21,8 @@
    private Integer s1MaxTurnDiff = 1;
    private Double s2BusyWeight = 2.0d;
    private Double s2QueueWeight = 2.5d;
    private Double s2WaitWeight = 1.5d;
    private Double s2RunBlockWeight = 10.0d;
    private Double s2LoopLoadWeight = 12.0d;
@@ -48,6 +50,8 @@
        if (source.s1MaxLenRatio != null) this.s1MaxLenRatio = source.s1MaxLenRatio;
        if (source.s1MaxTurnDiff != null) this.s1MaxTurnDiff = source.s1MaxTurnDiff;
        if (source.s2BusyWeight != null) this.s2BusyWeight = source.s2BusyWeight;
        if (source.s2QueueWeight != null) this.s2QueueWeight = source.s2QueueWeight;
        if (source.s2WaitWeight != null) this.s2WaitWeight = source.s2WaitWeight;
        if (source.s2RunBlockWeight != null) this.s2RunBlockWeight = source.s2RunBlockWeight;
        if (source.s2LoopLoadWeight != null) this.s2LoopLoadWeight = source.s2LoopLoadWeight;
        if (source.stationPathLenWeightPercent != null) this.stationPathLenWeightPercent = source.stationPathLenWeightPercent;
src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -11,6 +11,7 @@
import com.zy.asrs.domain.path.StationPathProfileConfig;
import com.zy.asrs.domain.path.StationPathResolvedPolicy;
import com.zy.asrs.domain.path.StationPathRuleConfig;
import com.zy.asrs.domain.vo.StationTaskTraceVo;
import com.zy.asrs.domain.vo.StationCycleCapacityVo;
import com.zy.asrs.domain.vo.StationCycleLoopVo;
import com.zy.asrs.entity.BasDevp;
@@ -36,9 +37,19 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.thread.StationThread;
import com.zy.core.trace.StationTaskTraceRegistry;
@Component
public class NavigateUtils {
    private static final double CONGESTION_BUSY_BASE = 1.0d;
    private static final double CONGESTION_ISSUED_RESERVE_BASE = 0.75d;
    private static final double CONGESTION_PENDING_QUEUE_BASE = 0.45d;
    private static final double CONGESTION_RUN_BLOCK_BASE = 1.5d;
    private static final double WAIT_BUSY_SECONDS = 10.0d;
    private static final double WAIT_ISSUED_RESERVE_SECONDS = 8.0d;
    private static final double WAIT_PENDING_QUEUE_SECONDS = 5.0d;
    private static final double WAIT_RUN_BLOCK_SECONDS = 30.0d;
    @Autowired
    private BasStationService basStationService;
@@ -46,6 +57,8 @@
    private StationPathPolicyService stationPathPolicyService;
    @Autowired
    private StationCycleCapacityService stationCycleCapacityService;
    @Autowired
    private StationTaskTraceRegistry stationTaskTraceRegistry;
    public synchronized List<NavigateNode> calcByStationId(Integer startStationId, Integer endStationId) {
        BasStation startStation = basStationService.getById(startStationId);
@@ -297,6 +310,7 @@
        Map<Integer, StationProtocol> statusMap = loadStationStatusMap();
        Map<Integer, Double> stationLoopLoadMap = loadStationLoopLoadMap();
        StationTrafficSnapshot trafficSnapshot = loadStationTrafficSnapshot(statusMap);
        Set<Integer> outStationIdSet = loadAllOutStationIdSet();
        List<PathCandidateMetrics> metricsList = new ArrayList<>();
        int skippedByOtherOutStation = 0;
@@ -304,7 +318,7 @@
            if (path == null || path.isEmpty()) {
                continue;
            }
            PathCandidateMetrics metrics = buildCandidateMetrics(path, statusMap, stationLoopLoadMap, profileConfig, ruleConfig, globalPolicy, outStationIdSet);
            PathCandidateMetrics metrics = buildCandidateMetrics(path, statusMap, stationLoopLoadMap, trafficSnapshot, profileConfig, ruleConfig, globalPolicy, outStationIdSet);
            if (globalPolicy.forceSkipPassOtherOutStation && metrics.passOtherOutStationCount > 0) {
                skippedByOtherOutStation++;
                continue;
@@ -563,6 +577,7 @@
    private PathCandidateMetrics buildCandidateMetrics(List<NavigateNode> path,
                                                       Map<Integer, StationProtocol> statusMap,
                                                       Map<Integer, Double> stationLoopLoadMap,
                                                       StationTrafficSnapshot trafficSnapshot,
                                                       StationPathProfileConfig profileConfig,
                                                       StationPathRuleConfig ruleConfig,
                                                       PathGlobalPolicy globalPolicy,
@@ -574,7 +589,9 @@
        metrics.liftTransferCount = countLiftTransferCount(path);
        List<Integer> stationIdList = extractStationIdList(path);
        metrics.busyStationCount = countBusyStationCount(stationIdList, statusMap);
        metrics.congestionScore = calcCongestionScore(stationIdList, trafficSnapshot);
        metrics.queueDepthScore = calcQueueDepthScore(stationIdList, trafficSnapshot);
        metrics.estimatedWaitSeconds = calcEstimatedWaitSeconds(stationIdList, trafficSnapshot);
        metrics.runBlockCount = countRunBlockCount(stationIdList, statusMap);
        metrics.loopPenalty = calcLoopPenalty(stationIdList, stationLoopLoadMap);
        metrics.passOtherOutStationCount = countPassOtherOutStations(path, outStationIdSet);
@@ -598,7 +615,9 @@
                        + softDeviationWeight * metrics.softDeviationCount;
        metrics.dynamicCost =
                safeDouble(profileConfig.getS2BusyWeight(), 2.0d) * congWeightFactor * metrics.busyStationCount
                safeDouble(profileConfig.getS2BusyWeight(), 2.0d) * congWeightFactor * metrics.congestionScore
                        + safeDouble(profileConfig.getS2QueueWeight(), 2.5d) * metrics.queueDepthScore
                        + safeDouble(profileConfig.getS2WaitWeight(), 1.5d) * (metrics.estimatedWaitSeconds / 60.0d)
                        + safeDouble(profileConfig.getS2RunBlockWeight(), 10.0d) * metrics.runBlockCount
                        + safeDouble(profileConfig.getS2LoopLoadWeight(), 12.0d) * metrics.loopPenalty;
        return metrics;
@@ -643,15 +662,37 @@
        return count;
    }
    private int countBusyStationCount(List<Integer> stationIdList, Map<Integer, StationProtocol> statusMap) {
        int count = 0;
        for (Integer stationId : stationIdList) {
            StationProtocol protocol = statusMap.get(stationId);
            if (protocol != null && protocol.getTaskNo() != null && protocol.getTaskNo() > 0) {
                count++;
            }
    private double calcCongestionScore(List<Integer> stationIdList, StationTrafficSnapshot trafficSnapshot) {
        if (trafficSnapshot == null || trafficSnapshot.congestionScoreMap.isEmpty()) {
            return 0.0d;
        }
        return count;
        double score = 0.0d;
        for (Integer stationId : stationIdList) {
            score += trafficSnapshot.congestionScoreMap.getOrDefault(stationId, 0.0d);
        }
        return score;
    }
    private double calcQueueDepthScore(List<Integer> stationIdList, StationTrafficSnapshot trafficSnapshot) {
        if (trafficSnapshot == null || trafficSnapshot.queueDepthMap.isEmpty()) {
            return 0.0d;
        }
        double score = 0.0d;
        for (Integer stationId : stationIdList) {
            score += trafficSnapshot.queueDepthMap.getOrDefault(stationId, 0);
        }
        return score;
    }
    private double calcEstimatedWaitSeconds(List<Integer> stationIdList, StationTrafficSnapshot trafficSnapshot) {
        if (trafficSnapshot == null || trafficSnapshot.estimatedWaitSecondsMap.isEmpty()) {
            return 0.0d;
        }
        double score = 0.0d;
        for (Integer stationId : stationIdList) {
            score += trafficSnapshot.estimatedWaitSecondsMap.getOrDefault(stationId, 0.0d);
        }
        return score;
    }
    private int countRunBlockCount(List<Integer> stationIdList, Map<Integer, StationProtocol> statusMap) {
@@ -846,6 +887,149 @@
        return stationLoopLoadMap;
    }
    private StationTrafficSnapshot loadStationTrafficSnapshot(Map<Integer, StationProtocol> statusMap) {
        StationTrafficSnapshot snapshot = new StationTrafficSnapshot();
        Map<Integer, Integer> busyMap = new HashMap<>();
        Map<Integer, Integer> issuedReserveMap = new HashMap<>();
        Map<Integer, Integer> pendingQueueMap = new HashMap<>();
        if (statusMap != null && !statusMap.isEmpty()) {
            for (Map.Entry<Integer, StationProtocol> entry : statusMap.entrySet()) {
                Integer stationId = entry.getKey();
                StationProtocol protocol = entry.getValue();
                if (stationId == null || protocol == null) {
                    continue;
                }
                if (protocol.getTaskNo() != null && protocol.getTaskNo() > 0) {
                    busyMap.put(stationId, 1);
                }
            }
        }
        for (StationTaskTraceVo traceVo : loadActiveTraceList()) {
            if (traceVo == null) {
                continue;
            }
            List<Integer> pendingStationIds = distinctPositiveStationIds(traceVo.getPendingStationIds());
            List<Integer> issuedStationIds = distinctPositiveStationIds(traceVo.getLatestIssuedSegmentPath());
            Set<Integer> pendingSet = new HashSet<>(pendingStationIds);
            for (Integer stationId : issuedStationIds) {
                if (stationId == null || !pendingSet.contains(stationId)) {
                    continue;
                }
                increaseIntMap(issuedReserveMap, stationId, 1);
            }
            Set<Integer> issuedSet = new HashSet<>(issuedStationIds);
            for (Integer stationId : pendingStationIds) {
                if (stationId == null || issuedSet.contains(stationId)) {
                    continue;
                }
                increaseIntMap(pendingQueueMap, stationId, 1);
            }
        }
        Set<Integer> stationIdSet = new HashSet<>();
        stationIdSet.addAll(busyMap.keySet());
        stationIdSet.addAll(issuedReserveMap.keySet());
        stationIdSet.addAll(pendingQueueMap.keySet());
        if (statusMap != null) {
            stationIdSet.addAll(statusMap.keySet());
        }
        for (Integer stationId : stationIdSet) {
            if (stationId == null) {
                continue;
            }
            int busyCount = busyMap.getOrDefault(stationId, 0);
            int issuedReserveCount = issuedReserveMap.getOrDefault(stationId, 0);
            int pendingQueueCount = pendingQueueMap.getOrDefault(stationId, 0);
            boolean runBlock = false;
            if (statusMap != null) {
                StationProtocol protocol = statusMap.get(stationId);
                runBlock = protocol != null && protocol.isRunBlock();
            }
            int queueDepth = issuedReserveCount + pendingQueueCount;
            double congestionScore = busyCount * CONGESTION_BUSY_BASE
                    + issuedReserveCount * CONGESTION_ISSUED_RESERVE_BASE
                    + pendingQueueCount * CONGESTION_PENDING_QUEUE_BASE
                    + (runBlock ? CONGESTION_RUN_BLOCK_BASE : 0.0d);
            double estimatedWaitSeconds = busyCount * WAIT_BUSY_SECONDS
                    + issuedReserveCount * WAIT_ISSUED_RESERVE_SECONDS
                    + pendingQueueCount * WAIT_PENDING_QUEUE_SECONDS
                    + (runBlock ? WAIT_RUN_BLOCK_SECONDS : 0.0d);
            if (queueDepth > 0) {
                snapshot.queueDepthMap.put(stationId, queueDepth);
            }
            if (congestionScore > 0.0d) {
                snapshot.congestionScoreMap.put(stationId, congestionScore);
            }
            if (estimatedWaitSeconds > 0.0d) {
                snapshot.estimatedWaitSecondsMap.put(stationId, estimatedWaitSeconds);
            }
        }
        return snapshot;
    }
    private List<StationTaskTraceVo> loadActiveTraceList() {
        if (stationTaskTraceRegistry == null) {
            return Collections.emptyList();
        }
        List<StationTaskTraceVo> traceList;
        try {
            traceList = stationTaskTraceRegistry.listLatestTraces();
        } catch (Exception ignore) {
            return Collections.emptyList();
        }
        if (traceList == null || traceList.isEmpty()) {
            return Collections.emptyList();
        }
        List<StationTaskTraceVo> result = new ArrayList<>();
        for (StationTaskTraceVo traceVo : traceList) {
            if (!isPlanningActiveTrace(traceVo)) {
                continue;
            }
            result.add(traceVo);
        }
        return result;
    }
    private boolean isPlanningActiveTrace(StationTaskTraceVo traceVo) {
        if (traceVo == null) {
            return false;
        }
        String status = traceVo.getStatus();
        return StationTaskTraceRegistry.STATUS_WAITING.equals(status)
                || StationTaskTraceRegistry.STATUS_RUNNING.equals(status)
                || StationTaskTraceRegistry.STATUS_REROUTED.equals(status);
    }
    private List<Integer> distinctPositiveStationIds(List<Integer> stationIdList) {
        if (stationIdList == null || stationIdList.isEmpty()) {
            return Collections.emptyList();
        }
        List<Integer> result = new ArrayList<>();
        Set<Integer> seen = new HashSet<>();
        for (Integer stationId : stationIdList) {
            if (stationId == null || stationId <= 0) {
                continue;
            }
            if (seen.add(stationId)) {
                result.add(stationId);
            }
        }
        return result;
    }
    private void increaseIntMap(Map<Integer, Integer> target, Integer stationId, int delta) {
        if (target == null || stationId == null || delta == 0) {
            return;
        }
        target.put(stationId, target.getOrDefault(stationId, 0) + delta);
    }
    private int compareDouble(double left, double right, int thenLeft1, int thenRight1, int thenLeft2, int thenRight2) {
        int result = Double.compare(left, right);
        if (result != 0) {
@@ -880,7 +1064,9 @@
        private int turnCount;
        private int liftTransferCount;
        private int passOtherOutStationCount;
        private int busyStationCount;
        private double congestionScore;
        private double queueDepthScore;
        private double estimatedWaitSeconds;
        private int runBlockCount;
        private int softDeviationCount;
        private double loopPenalty;
@@ -888,6 +1074,12 @@
        private double dynamicCost;
    }
    private static class StationTrafficSnapshot {
        private final Map<Integer, Double> congestionScoreMap = new HashMap<>();
        private final Map<Integer, Integer> queueDepthMap = new HashMap<>();
        private final Map<Integer, Double> estimatedWaitSecondsMap = new HashMap<>();
    }
    private static class PathGlobalPolicy {
        private double lenWeightFactor = 1.0d;
        private double congWeightFactor = 1.0d;
src/main/resources/sql/20260313_create_station_path_policy_tables.sql
@@ -45,7 +45,7 @@
  100,
  1,
  1,
  '{"calcMaxDepth":120,"calcMaxPaths":500,"calcMaxCost":300,"s1TopK":5,"s1LenWeight":1.0,"s1TurnWeight":3.0,"s1LiftWeight":8.0,"s1SoftDeviationWeight":4.0,"s1MaxLenRatio":1.15,"s1MaxTurnDiff":1,"s2BusyWeight":2.0,"s2RunBlockWeight":10.0,"s2LoopLoadWeight":12.0,"stationPathLenWeightPercent":50.0,"stationPathCongWeightPercent":50.0,"stationPathPassOtherOutStationWeightPercent":100.0,"stationPathPassOtherOutStationForceSkip":false}',
  '{"calcMaxDepth":120,"calcMaxPaths":500,"calcMaxCost":300,"s1TopK":5,"s1LenWeight":1.0,"s1TurnWeight":3.0,"s1LiftWeight":8.0,"s1SoftDeviationWeight":4.0,"s1MaxLenRatio":1.15,"s1MaxTurnDiff":1,"s2BusyWeight":2.0,"s2QueueWeight":2.5,"s2WaitWeight":1.5,"s2RunBlockWeight":10.0,"s2LoopLoadWeight":12.0,"stationPathLenWeightPercent":50.0,"stationPathCongWeightPercent":50.0,"stationPathPassOtherOutStationWeightPercent":100.0,"stationPathPassOtherOutStationForceSkip":false}',
  '默认模板'
FROM dual
WHERE NOT EXISTS (
src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js
@@ -11,6 +11,8 @@
        s1MaxLenRatio: 1.15,
        s1MaxTurnDiff: 1,
        s2BusyWeight: 2.0,
        s2QueueWeight: 2.5,
        s2WaitWeight: 1.5,
        s2RunBlockWeight: 10.0,
        s2LoopLoadWeight: 12.0,
        stationPathLenWeightPercent: 50,
src/main/webapp/views/stationPathPolicy/stationPathPolicy.html
@@ -845,7 +845,7 @@
                            </div>
                            <div class="entity-desc">
                                S1: 长度(s1LenWeight) {{ item.config.s1LenWeight }} / 拐点(s1TurnWeight) {{ item.config.s1TurnWeight }} / 顶升(s1LiftWeight) {{ item.config.s1LiftWeight }}<br>
                                S2: 忙站(s2BusyWeight) {{ item.config.s2BusyWeight }} / 堵塞(s2RunBlockWeight) {{ item.config.s2RunBlockWeight }} / 环线(s2LoopLoadWeight) {{ item.config.s2LoopLoadWeight }}<br>
                                S2: 拥堵(s2BusyWeight) {{ item.config.s2BusyWeight }} / 排队(s2QueueWeight) {{ item.config.s2QueueWeight }} / 等待(s2WaitWeight) {{ item.config.s2WaitWeight }} / 堵塞(s2RunBlockWeight) {{ item.config.s2RunBlockWeight }} / 环线(s2LoopLoadWeight) {{ item.config.s2LoopLoadWeight }}<br>
                                平衡: 长度(stationPathLenWeightPercent) {{ item.config.stationPathLenWeightPercent }}% / 承载(stationPathCongWeightPercent) {{ item.config.stationPathCongWeightPercent }}% / 他出惩罚(stationPathPassOtherOutStationWeightPercent) {{ item.config.stationPathPassOtherOutStationWeightPercent }} / 强跳(stationPathPassOtherOutStationForceSkip) {{ item.config.stationPathPassOtherOutStationForceSkip ? '是' : '否' }}
                            </div>
                            <div class="entity-actions">
@@ -1078,7 +1078,9 @@
                <div class="section-card">
                    <h3>第二阶段动态评分</h3>
                    <div class="dialog-grid">
                        <el-form-item label="忙站权重(s2BusyWeight)"><el-input-number v-model="profileForm.config.s2BusyWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
                        <el-form-item label="拥堵程度权重(s2BusyWeight)"><el-input-number v-model="profileForm.config.s2BusyWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
                        <el-form-item label="排队量权重(s2QueueWeight)"><el-input-number v-model="profileForm.config.s2QueueWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
                        <el-form-item label="预计等待时间权重(s2WaitWeight)"><el-input-number v-model="profileForm.config.s2WaitWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
                        <el-form-item label="堵塞权重(s2RunBlockWeight)"><el-input-number v-model="profileForm.config.s2RunBlockWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
                        <el-form-item label="环线负载权重(s2LoopLoadWeight)"><el-input-number v-model="profileForm.config.s2LoopLoadWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
                    </div>