From 3372040097ad2c01aeb6fd6485e89f19bf81b316 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 18 三月 2026 17:02:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java | 9
src/main/webapp/views/stationPathPolicy/stationPathPolicy.html | 33 +
src/main/resources/sql/20260318_remove_station_path_score_mode.sql | 4
src/main/java/com/zy/asrs/service/impl/StationPathPolicyServiceImpl.java | 2
src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js | 25 +
src/main/java/com/zy/asrs/controller/BasStationPathPolicyController.java | 9
src/main/java/com/zy/asrs/domain/path/StationPathResolvedPolicy.java | 6
src/main/java/com/zy/common/utils/NavigateUtils.java | 465 ++++++++++++++++++-----------------
src/main/resources/sql/20260313_create_station_path_policy_tables.sql | 13
src/main/resources/sql/20260318_migrate_station_path_weight_config_to_profile_config.sql | 48 +++
src/main/java/com/zy/common/utils/NavigateSolution.java | 132 +++++++++
11 files changed, 487 insertions(+), 259 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasStationPathPolicyController.java b/src/main/java/com/zy/asrs/controller/BasStationPathPolicyController.java
index 17fffc3..1d5ae33 100644
--- a/src/main/java/com/zy/asrs/controller/BasStationPathPolicyController.java
+++ b/src/main/java/com/zy/asrs/controller/BasStationPathPolicyController.java
@@ -41,6 +41,8 @@
@RequestMapping("/basStationPathPolicy")
public class BasStationPathPolicyController extends BaseController {
+ private static final String CFG_DEFAULT_PROFILE_CODE = "stationPathDefaultProfileCode";
+
@Autowired
private BasStationPathProfileService basStationPathProfileService;
@Autowired
@@ -64,8 +66,8 @@
Map<String, Object> data = new HashMap<>();
data.put("profiles", basStationPathProfileService.list(new QueryWrapper<BasStationPathProfile>().orderByAsc("priority", "id")));
data.put("rules", basStationPathRuleService.list(new QueryWrapper<BasStationPathRule>().orderByAsc("priority", "id")));
- data.put("scoreMode", getSystemConfig("stationPathScoreMode", "legacy"));
- data.put("defaultProfileCode", getSystemConfig("stationPathDefaultProfileCode", "default"));
+ data.put("scoreMode", "twoStage");
+ data.put("defaultProfileCode", getSystemConfig(CFG_DEFAULT_PROFILE_CODE, "default"));
data.put("stations", buildStationSummaryList());
data.put("levList", basMapService.getLevList());
return R.ok(data);
@@ -77,8 +79,7 @@
JSONArray profiles = payload.getJSONArray("profiles");
JSONArray rules = payload.getJSONArray("rules");
- upsertSystemConfig("绔欑偣璺緞璇勫垎妯″紡", "stationPathScoreMode", defaultIfBlank(payload.getString("scoreMode"), "legacy"), "String");
- upsertSystemConfig("绔欑偣璺緞榛樿妯℃澘缂栫爜", "stationPathDefaultProfileCode", defaultIfBlank(payload.getString("defaultProfileCode"), "default"), "String");
+ upsertSystemConfig("绔欑偣璺緞榛樿妯℃澘缂栫爜", CFG_DEFAULT_PROFILE_CODE, defaultIfBlank(payload.getString("defaultProfileCode"), "default"), "String");
basStationPathProfileService.remove(new QueryWrapper<>());
basStationPathRuleService.remove(new QueryWrapper<>());
diff --git a/src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java b/src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java
index bfc066c..f49863d 100644
--- a/src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java
+++ b/src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java
@@ -24,6 +24,11 @@
private Double s2RunBlockWeight = 10.0d;
private Double s2LoopLoadWeight = 12.0d;
+ private Double stationPathLenWeightPercent = 50.0d;
+ private Double stationPathCongWeightPercent = 50.0d;
+ private Double stationPathPassOtherOutStationWeightPercent = 100.0d;
+ private Boolean stationPathPassOtherOutStationForceSkip = false;
+
public static StationPathProfileConfig defaultConfig() {
return new StationPathProfileConfig();
}
@@ -45,5 +50,9 @@
if (source.s2BusyWeight != null) this.s2BusyWeight = source.s2BusyWeight;
if (source.s2RunBlockWeight != null) this.s2RunBlockWeight = source.s2RunBlockWeight;
if (source.s2LoopLoadWeight != null) this.s2LoopLoadWeight = source.s2LoopLoadWeight;
+ if (source.stationPathLenWeightPercent != null) this.stationPathLenWeightPercent = source.stationPathLenWeightPercent;
+ if (source.stationPathCongWeightPercent != null) this.stationPathCongWeightPercent = source.stationPathCongWeightPercent;
+ if (source.stationPathPassOtherOutStationWeightPercent != null) this.stationPathPassOtherOutStationWeightPercent = source.stationPathPassOtherOutStationWeightPercent;
+ if (source.stationPathPassOtherOutStationForceSkip != null) this.stationPathPassOtherOutStationForceSkip = source.stationPathPassOtherOutStationForceSkip;
}
}
diff --git a/src/main/java/com/zy/asrs/domain/path/StationPathResolvedPolicy.java b/src/main/java/com/zy/asrs/domain/path/StationPathResolvedPolicy.java
index a5d18b9..f602390 100644
--- a/src/main/java/com/zy/asrs/domain/path/StationPathResolvedPolicy.java
+++ b/src/main/java/com/zy/asrs/domain/path/StationPathResolvedPolicy.java
@@ -10,16 +10,12 @@
public class StationPathResolvedPolicy implements Serializable {
private static final long serialVersionUID = 1L;
- private String scoreMode = "legacy";
+ private String scoreMode = "twoStage";
private String defaultProfileCode = "default";
private BasStationPathProfile profileEntity;
private BasStationPathRule ruleEntity;
private StationPathProfileConfig profileConfig = StationPathProfileConfig.defaultConfig();
private StationPathRuleConfig ruleConfig = new StationPathRuleConfig();
-
- public boolean useTwoStage() {
- return "twoStage".equalsIgnoreCase(scoreMode);
- }
public boolean matchedRule() {
return ruleEntity != null;
diff --git a/src/main/java/com/zy/asrs/service/impl/StationPathPolicyServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StationPathPolicyServiceImpl.java
index 2e82a25..a5735a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/StationPathPolicyServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StationPathPolicyServiceImpl.java
@@ -41,7 +41,7 @@
@Override
public StationPathResolvedPolicy resolvePolicy(Integer startStationId, Integer endStationId) {
StationPathResolvedPolicy resolved = new StationPathResolvedPolicy();
- resolved.setScoreMode(getSystemConfig("stationPathScoreMode", "legacy"));
+ resolved.setScoreMode("twoStage");
resolved.setDefaultProfileCode(getSystemConfig("stationPathDefaultProfileCode", "default"));
CacheSnapshot snapshot = getCacheSnapshot();
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index 8ddeabe..6dd6c57 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -183,6 +183,18 @@
int maxPaths, // 鏈�澶ц繑鍥炴潯鏁�. 寤鸿锛�100/500/2000锛�<=0 琛ㄧず涓嶉檺鍒讹紙涓嶅缓璁級
int maxCost // 鏈�澶ф�讳唬浠�(鍚嫄鐐规儵缃�). <=0 琛ㄧず涓嶉檺鍒�
) {
+ return allSimplePaths(map, start, end, maxDepth, maxPaths, maxCost, Collections.emptyList());
+ }
+
+ public List<List<NavigateNode>> allSimplePaths(
+ List<List<NavigateNode>> map,
+ NavigateNode start,
+ NavigateNode end,
+ int maxDepth,
+ int maxPaths,
+ int maxCost,
+ List<Integer> guideStationIds
+ ) {
List<List<NavigateNode>> results = new ArrayList<>();
if (map == null || map.isEmpty() || map.get(0).isEmpty()) return results;
if (start == null || end == null) return results;
@@ -197,13 +209,16 @@
path.add(start);
AtomicInteger pathCount = new AtomicInteger(0);
+ Map<Integer, NavigateNode> guideNodeMap = buildGuideNodeMap(map, guideStationIds);
dfsAllSimplePaths(map, start, end,
visited, path, results,
0, // depth
0, // cost
maxDepth, maxPaths, maxCost,
- pathCount
+ pathCount,
+ guideStationIds,
+ guideNodeMap
);
return results;
@@ -224,7 +239,9 @@
int maxDepth,
int maxPaths,
int maxCost,
- AtomicInteger pathCount
+ AtomicInteger pathCount,
+ List<Integer> guideStationIds,
+ Map<Integer, NavigateNode> guideNodeMap
) {
// 闃茬垎锛氭潯鏁伴檺鍒�
if (maxPaths > 0 && pathCount.get() >= maxPaths) return;
@@ -242,6 +259,7 @@
// 鎵╁睍閭诲眳锛堜弗鏍煎鐢ㄤ綘鑷繁鐨勫彲琛岃蛋鏂瑰悜瑙勫垯锛�
ArrayList<NavigateNode> neighbors = extend_current_node(map, current);
if (neighbors == null || neighbors.isEmpty()) return;
+ neighbors = sortNeighborsByGuide(current, path, neighbors, guideStationIds, guideNodeMap);
for (NavigateNode next : neighbors) {
// 闃茬垎锛氭潯鏁伴檺鍒�
@@ -271,7 +289,9 @@
depth + 1,
newCost,
maxDepth, maxPaths, maxCost,
- pathCount
+ pathCount,
+ guideStationIds,
+ guideNodeMap
);
// 鍥炴函
@@ -284,6 +304,112 @@
return n.getX() + "_" + n.getY();
}
+ private Map<Integer, NavigateNode> buildGuideNodeMap(List<List<NavigateNode>> map, List<Integer> guideStationIds) {
+ Map<Integer, NavigateNode> guideNodeMap = new HashMap<>();
+ if (map == null || map.isEmpty() || guideStationIds == null || guideStationIds.isEmpty()) {
+ return guideNodeMap;
+ }
+ for (Integer stationId : guideStationIds) {
+ if (stationId == null || guideNodeMap.containsKey(stationId)) {
+ continue;
+ }
+ NavigateNode stationNode = findStationNavigateNode(map, stationId);
+ if (stationNode != null) {
+ guideNodeMap.put(stationId, stationNode);
+ }
+ }
+ return guideNodeMap;
+ }
+
+ private ArrayList<NavigateNode> sortNeighborsByGuide(NavigateNode current,
+ LinkedList<NavigateNode> path,
+ ArrayList<NavigateNode> neighbors,
+ List<Integer> guideStationIds,
+ Map<Integer, NavigateNode> guideNodeMap) {
+ if (current == null || neighbors == null || neighbors.size() <= 1
+ || guideStationIds == null || guideStationIds.isEmpty()
+ || guideNodeMap == null || guideNodeMap.isEmpty()) {
+ return neighbors;
+ }
+
+ Integer nextGuideStationId = resolveNextGuideStationId(path, guideStationIds);
+ if (nextGuideStationId == null) {
+ return neighbors;
+ }
+ NavigateNode guideTargetNode = guideNodeMap.get(nextGuideStationId);
+ if (guideTargetNode == null) {
+ return neighbors;
+ }
+
+ neighbors.sort((left, right) -> compareGuideNeighbor(current, left, right, nextGuideStationId, guideTargetNode));
+ return neighbors;
+ }
+
+ private Integer resolveNextGuideStationId(LinkedList<NavigateNode> path, List<Integer> guideStationIds) {
+ if (path == null || path.isEmpty() || guideStationIds == null || guideStationIds.isEmpty()) {
+ return null;
+ }
+
+ int cursor = 0;
+ Set<Integer> seen = new HashSet<>();
+ for (NavigateNode node : path) {
+ Integer stationId = extractStationId(node);
+ if (stationId == null || !seen.add(stationId)) {
+ continue;
+ }
+ if (cursor < guideStationIds.size() && stationId.equals(guideStationIds.get(cursor))) {
+ cursor++;
+ }
+ }
+ if (cursor >= guideStationIds.size()) {
+ return null;
+ }
+ return guideStationIds.get(cursor);
+ }
+
+ private int compareGuideNeighbor(NavigateNode current,
+ NavigateNode left,
+ NavigateNode right,
+ Integer nextGuideStationId,
+ NavigateNode guideTargetNode) {
+ int leftDirect = isGuideStation(left, nextGuideStationId) ? 0 : 1;
+ int rightDirect = isGuideStation(right, nextGuideStationId) ? 0 : 1;
+ if (leftDirect != rightDirect) {
+ return Integer.compare(leftDirect, rightDirect);
+ }
+
+ int leftDistance = calcNodeCost(left, guideTargetNode);
+ int rightDistance = calcNodeCost(right, guideTargetNode);
+ if (leftDistance != rightDistance) {
+ return Integer.compare(leftDistance, rightDistance);
+ }
+
+ int leftTurnCost = calcNodeExtraCost(current, left, guideTargetNode);
+ int rightTurnCost = calcNodeExtraCost(current, right, guideTargetNode);
+ if (leftTurnCost != rightTurnCost) {
+ return Integer.compare(leftTurnCost, rightTurnCost);
+ }
+
+ return 0;
+ }
+
+ private boolean isGuideStation(NavigateNode node, Integer stationId) {
+ Integer nodeStationId = extractStationId(node);
+ return nodeStationId != null && nodeStationId.equals(stationId);
+ }
+
+ private Integer extractStationId(NavigateNode node) {
+ if (node == null || !"devp".equals(node.getNodeType())) {
+ return null;
+ }
+ try {
+ JSONObject valueObj = JSON.parseObject(node.getNodeValue());
+ return valueObj == null ? null : valueObj.getInteger("stationId");
+ } catch (Exception ignore) {
+ return null;
+ }
+ }
+
public ArrayList<NavigateNode> extend_current_node(List<List<NavigateNode>> map, NavigateNode current_node) {
//鑾峰彇褰撳墠缁撶偣鐨剎, y
int x = current_node.getX();
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index 56e7fd5..0ec6e2c 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -36,16 +36,9 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.thread.StationThread;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
@Component
public class NavigateUtils {
-
- private static final String CFG_STATION_PATH_LEN_WEIGHT_PERCENT = "stationPathLenWeightPercent";
- private static final String CFG_STATION_PATH_CONG_WEIGHT_PERCENT = "stationPathCongWeightPercent";
- private static final String CFG_STATION_PATH_PASS_OTHER_OUT_STATION_WEIGHT_PERCENT = "stationPathPassOtherOutStationWeightPercent";
- private static final String CFG_STATION_PATH_PASS_OTHER_OUT_STATION_FORCE_SKIP = "stationPathPassOtherOutStationForceSkip";
@Autowired
private BasStationService basStationService;
@@ -81,10 +74,19 @@
long startTime = System.currentTimeMillis();
News.info("[WCS Debug] 绔欑偣璺緞寮�濮嬭绠�,startStationId={},endStationId={}", startStationId, endStationId);
- int calcMaxDepth = resolvedPolicy.useTwoStage() ? safeInt(profileConfig.getCalcMaxDepth(), 120) : 120;
- int calcMaxPaths = resolvedPolicy.useTwoStage() ? safeInt(profileConfig.getCalcMaxPaths(), 500) : 500;
- int calcMaxCost = resolvedPolicy.useTwoStage() ? safeInt(profileConfig.getCalcMaxCost(), 300) : 300;
- List<List<NavigateNode>> allList = navigateSolution.allSimplePaths(stationMap, startNode, endNode, calcMaxDepth, calcMaxPaths, calcMaxCost);
+ int calcMaxDepth = safeInt(profileConfig.getCalcMaxDepth(), 120);
+ int calcMaxPaths = safeInt(profileConfig.getCalcMaxPaths(), 500);
+ int calcMaxCost = safeInt(profileConfig.getCalcMaxCost(), 300);
+ List<Integer> guideStationSequence = buildGuideStationSequence(startStationId, endStationId, resolvedPolicy.getRuleConfig());
+ List<List<NavigateNode>> allList = navigateSolution.allSimplePaths(
+ stationMap,
+ startNode,
+ endNode,
+ calcMaxDepth,
+ calcMaxPaths,
+ calcMaxCost,
+ guideStationSequence
+ );
if (allList.isEmpty()) {
// throw new CoolException("鏈壘鍒拌璺緞");
return new ArrayList<>();
@@ -99,9 +101,7 @@
startTime = System.currentTimeMillis();
News.info("[WCS Debug] 绔欑偣璺緞鏉冮噸寮�濮嬪垎鏋�,startStationId={},endStationId={}", startStationId, endStationId);
- List<NavigateNode> list = resolvedPolicy.useTwoStage()
- ? findStationBestPathTwoStage(allList, resolvedPolicy)
- : findStationBestPath(allList);
+ List<NavigateNode> list = findStationBestPathTwoStage(allList, resolvedPolicy);
News.info("[WCS Debug] 绔欑偣璺緞鏉冮噸鍒嗘瀽瀹屾垚锛岃�楁椂锛歿}ms", System.currentTimeMillis() - startTime);
//鍘婚噸
@@ -254,7 +254,7 @@
}
}
} catch (Exception e) {
- News.warn("绔欑偣璺緞绛栫暐鍔犺浇澶辫触锛屽洖閫� legacy: {}", e.getMessage());
+ News.warn("绔欑偣璺緞绛栫暐鍔犺浇澶辫触锛屽洖閫�榛樿 twoStage: {}", e.getMessage());
}
return new StationPathResolvedPolicy();
}
@@ -270,11 +270,21 @@
StationPathProfileConfig profileConfig = resolvedPolicy.getProfileConfig() == null
? StationPathProfileConfig.defaultConfig()
: resolvedPolicy.getProfileConfig();
+ PathGlobalPolicy globalPolicy = loadPathGlobalPolicy(profileConfig);
List<List<NavigateNode>> filteredCandidates = applyRuleFilters(allList, ruleConfig, true);
if (filteredCandidates.isEmpty() && hasWaypoint(ruleConfig) && !strictWaypoint(ruleConfig)) {
filteredCandidates = applyRuleFilters(allList, ruleConfig, false);
News.info("[WCS Debug] 绔欑偣璺緞瑙勫垯宸查檷绾э紝蹇界暐鍏抽敭閫旂粡鐐圭害鏉熷悗閲嶈瘯");
+ }
+ List<List<NavigateNode>> softFilteredCandidates = applySoftPreferenceFilter(filteredCandidates, ruleConfig);
+ if (!softFilteredCandidates.isEmpty()) {
+ filteredCandidates = softFilteredCandidates;
+ } else if (hasSoftPreference(ruleConfig) && !allowSoftDegrade(ruleConfig)) {
+ News.warn("[WCS Debug] 绔欑偣璺緞杞亸濂藉懡涓絾鏃犲彲琛岃矾寰勶紝涓斾笉鍏佽闄嶇骇");
+ return new ArrayList<>();
+ } else if (hasSoftPreference(ruleConfig)) {
+ News.info("[WCS Debug] 绔欑偣璺緞瑙勫垯宸查檷绾э紝蹇界暐杞亸濂界害鏉熷悗閲嶈瘯");
}
if (filteredCandidates.isEmpty()) {
if (resolvedPolicy.matchedRule()) {
@@ -287,14 +297,26 @@
Map<Integer, StationProtocol> statusMap = loadStationStatusMap();
Map<Integer, Double> stationLoopLoadMap = loadStationLoopLoadMap();
+ Set<Integer> outStationIdSet = loadAllOutStationIdSet();
List<PathCandidateMetrics> metricsList = new ArrayList<>();
+ int skippedByOtherOutStation = 0;
for (List<NavigateNode> path : filteredCandidates) {
if (path == null || path.isEmpty()) {
continue;
}
- metricsList.add(buildCandidateMetrics(path, statusMap, stationLoopLoadMap, profileConfig, ruleConfig));
+ PathCandidateMetrics metrics = buildCandidateMetrics(path, statusMap, stationLoopLoadMap, profileConfig, ruleConfig, globalPolicy, outStationIdSet);
+ if (globalPolicy.forceSkipPassOtherOutStation && metrics.passOtherOutStationCount > 0) {
+ skippedByOtherOutStation++;
+ continue;
+ }
+ metricsList.add(metrics);
}
if (metricsList.isEmpty()) {
+ if (globalPolicy.forceSkipPassOtherOutStation && skippedByOtherOutStation > 0) {
+ News.warn("[WCS Debug] 绔欑偣璺緞鍊欓�夊叏閮ㄨ杩囨护锛屽洜缁忚繃鍏朵粬鍑哄簱绔欑偣,startStationId={},endStationId={}",
+ resolvedPolicy.getRuleEntity() == null ? null : resolvedPolicy.getRuleEntity().getStartStationId(),
+ resolvedPolicy.getRuleEntity() == null ? null : resolvedPolicy.getRuleEntity().getEndStationId());
+ }
return new ArrayList<>();
}
@@ -342,6 +364,31 @@
continue;
}
if (includeWaypoint && !matchWaypointConstraint(stationIdList, ruleConfig.getWaypoint())) {
+ continue;
+ }
+ result.add(path);
+ }
+ return result;
+ }
+
+ private List<List<NavigateNode>> applySoftPreferenceFilter(List<List<NavigateNode>> allList,
+ StationPathRuleConfig ruleConfig) {
+ if (allList == null || allList.isEmpty() || ruleConfig == null) {
+ return new ArrayList<>();
+ }
+ StationPathRuleConfig.SoftPreference soft = ruleConfig.getSoft();
+ List<Integer> preferredPath = getSoftReferencePath(soft);
+ if (preferredPath.isEmpty()) {
+ return allList;
+ }
+
+ List<List<NavigateNode>> result = new ArrayList<>();
+ for (List<NavigateNode> path : allList) {
+ if (path == null || path.isEmpty()) {
+ continue;
+ }
+ List<Integer> stationIdList = extractStationIdList(path);
+ if (!matchSoftConstraint(stationIdList, soft)) {
continue;
}
result.add(path);
@@ -397,6 +444,24 @@
return false;
}
+ private boolean matchSoftConstraint(List<Integer> stationIdList, StationPathRuleConfig.SoftPreference soft) {
+ List<Integer> preferredPath = getSoftReferencePath(soft);
+ if (preferredPath.isEmpty()) {
+ return true;
+ }
+ if (!containsOrderedStations(stationIdList, preferredPath)) {
+ return false;
+ }
+ Integer maxOffPathCount = soft == null ? null : soft.getMaxOffPathCount();
+ if (maxOffPathCount == null || maxOffPathCount < 0) {
+ return true;
+ }
+ if (!isFullSoftPreferredPath(stationIdList, preferredPath)) {
+ return true;
+ }
+ return countOffPathStations(stationIdList, preferredPath) <= maxOffPathCount;
+ }
+
private boolean hasWaypoint(StationPathRuleConfig ruleConfig) {
return ruleConfig != null
&& ruleConfig.getWaypoint() != null
@@ -404,10 +469,64 @@
&& !ruleConfig.getWaypoint().getStations().isEmpty();
}
+ private boolean hasSoftPreference(StationPathRuleConfig ruleConfig) {
+ return !getSoftReferencePath(ruleConfig == null ? null : ruleConfig.getSoft()).isEmpty();
+ }
+
private boolean strictWaypoint(StationPathRuleConfig ruleConfig) {
return ruleConfig != null
&& ruleConfig.getFallback() != null
&& Boolean.TRUE.equals(ruleConfig.getFallback().getStrictWaypoint());
+ }
+
+ private boolean allowSoftDegrade(StationPathRuleConfig ruleConfig) {
+ return ruleConfig == null
+ || ruleConfig.getFallback() == null
+ || !Boolean.FALSE.equals(ruleConfig.getFallback().getAllowSoftDegrade());
+ }
+
+ private List<Integer> buildGuideStationSequence(Integer startStationId,
+ Integer endStationId,
+ StationPathRuleConfig ruleConfig) {
+ if (startStationId == null || endStationId == null || ruleConfig == null) {
+ return Collections.emptyList();
+ }
+
+ List<Integer> sequence = new ArrayList<>();
+ appendGuideStation(sequence, startStationId);
+
+ List<Integer> preferredPath = safeList(ruleConfig.getSoft() == null ? null : ruleConfig.getSoft().getPreferredPath());
+ if (!preferredPath.isEmpty()) {
+ if (startStationId.equals(preferredPath.get(0))) {
+ for (int i = 1; i < preferredPath.size(); i++) {
+ appendGuideStation(sequence, preferredPath.get(i));
+ }
+ if (sequence.get(sequence.size() - 1).equals(endStationId)) {
+ return sequence;
+ }
+ }
+ sequence.clear();
+ appendGuideStation(sequence, startStationId);
+ }
+
+ for (Integer stationId : safeList(ruleConfig.getWaypoint() == null ? null : ruleConfig.getWaypoint().getStations())) {
+ appendGuideStation(sequence, stationId);
+ }
+ for (Integer stationId : safeList(ruleConfig.getSoft() == null ? null : ruleConfig.getSoft().getKeyStations())) {
+ appendGuideStation(sequence, stationId);
+ }
+ appendGuideStation(sequence, endStationId);
+ return sequence.size() <= 2 ? Collections.emptyList() : sequence;
+ }
+
+ private void appendGuideStation(List<Integer> sequence, Integer stationId) {
+ if (sequence == null || stationId == null) {
+ return;
+ }
+ if (!sequence.isEmpty() && stationId.equals(sequence.get(sequence.size() - 1))) {
+ return;
+ }
+ sequence.add(stationId);
}
private boolean containsEdge(List<Integer> stationIdList, String edgeText) {
@@ -445,7 +564,9 @@
Map<Integer, StationProtocol> statusMap,
Map<Integer, Double> stationLoopLoadMap,
StationPathProfileConfig profileConfig,
- StationPathRuleConfig ruleConfig) {
+ StationPathRuleConfig ruleConfig,
+ PathGlobalPolicy globalPolicy,
+ Set<Integer> outStationIdSet) {
PathCandidateMetrics metrics = new PathCandidateMetrics();
metrics.path = path;
metrics.pathLen = path.size();
@@ -456,22 +577,28 @@
metrics.busyStationCount = countBusyStationCount(stationIdList, statusMap);
metrics.runBlockCount = countRunBlockCount(stationIdList, statusMap);
metrics.loopPenalty = calcLoopPenalty(stationIdList, stationLoopLoadMap);
+ metrics.passOtherOutStationCount = countPassOtherOutStations(path, outStationIdSet);
metrics.softDeviationCount = calcSoftDeviationCount(stationIdList,
- ruleConfig == null || ruleConfig.getSoft() == null ? null : ruleConfig.getSoft().getPreferredPath());
+ ruleConfig == null ? null : ruleConfig.getSoft());
double softDeviationWeight = safeDouble(profileConfig.getS1SoftDeviationWeight(), 4.0d);
if (ruleConfig != null && ruleConfig.getSoft() != null && ruleConfig.getSoft().getDeviationWeight() != null) {
softDeviationWeight = ruleConfig.getSoft().getDeviationWeight();
}
+ double lenWeightFactor = globalPolicy == null ? 1.0d : globalPolicy.lenWeightFactor;
+ double congWeightFactor = globalPolicy == null ? 1.0d : globalPolicy.congWeightFactor;
+ double passOtherOutStationPenaltyWeight = globalPolicy == null ? 0.0d : globalPolicy.passOtherOutStationPenaltyWeight;
+
metrics.staticCost =
- safeDouble(profileConfig.getS1LenWeight(), 1.0d) * metrics.pathLen
+ safeDouble(profileConfig.getS1LenWeight(), 1.0d) * lenWeightFactor * metrics.pathLen
+ safeDouble(profileConfig.getS1TurnWeight(), 3.0d) * metrics.turnCount
+ safeDouble(profileConfig.getS1LiftWeight(), 8.0d) * metrics.liftTransferCount
+ + passOtherOutStationPenaltyWeight * metrics.passOtherOutStationCount
+ softDeviationWeight * metrics.softDeviationCount;
metrics.dynamicCost =
- safeDouble(profileConfig.getS2BusyWeight(), 2.0d) * metrics.busyStationCount
+ safeDouble(profileConfig.getS2BusyWeight(), 2.0d) * congWeightFactor * metrics.busyStationCount
+ safeDouble(profileConfig.getS2RunBlockWeight(), 10.0d) * metrics.runBlockCount
+ safeDouble(profileConfig.getS2LoopLoadWeight(), 12.0d) * metrics.loopPenalty;
return metrics;
@@ -549,19 +676,19 @@
return maxLoad;
}
- private int calcSoftDeviationCount(List<Integer> stationIdList, List<Integer> preferredPath) {
- if (preferredPath == null || preferredPath.isEmpty() || stationIdList == null || stationIdList.isEmpty()) {
+ private int calcSoftDeviationCount(List<Integer> stationIdList, StationPathRuleConfig.SoftPreference soft) {
+ List<Integer> preferredPath = getSoftReferencePath(soft);
+ if (preferredPath.isEmpty() || stationIdList == null || stationIdList.isEmpty()) {
return 0;
}
- Set<Integer> preferredSet = new HashSet<>(preferredPath);
- int count = 0;
- for (int i = 1; i < stationIdList.size() - 1; i++) {
- Integer stationId = stationIdList.get(i);
- if (stationId != null && !preferredSet.contains(stationId)) {
- count++;
- }
+ int missingCount = countMissingOrderedStations(stationIdList, preferredPath);
+ if (missingCount > 0) {
+ return missingCount;
}
- return count;
+ if (isFullSoftPreferredPath(stationIdList, preferredPath)) {
+ return countOffPathStations(stationIdList, preferredPath);
+ }
+ return 0;
}
private List<Integer> extractStationIdList(List<NavigateNode> path) {
@@ -577,6 +704,67 @@
}
}
return stationIdList;
+ }
+
+ private List<Integer> getSoftReferencePath(StationPathRuleConfig.SoftPreference soft) {
+ if (soft == null) {
+ return Collections.emptyList();
+ }
+ if (soft.getPreferredPath() != null && !soft.getPreferredPath().isEmpty()) {
+ return soft.getPreferredPath();
+ }
+ if (soft.getKeyStations() != null && !soft.getKeyStations().isEmpty()) {
+ return soft.getKeyStations();
+ }
+ return Collections.emptyList();
+ }
+
+ private boolean containsOrderedStations(List<Integer> stationIdList, List<Integer> targetStations) {
+ return countMissingOrderedStations(stationIdList, targetStations) == 0;
+ }
+
+ private int countMissingOrderedStations(List<Integer> stationIdList, List<Integer> targetStations) {
+ if (stationIdList == null || stationIdList.isEmpty() || targetStations == null || targetStations.isEmpty()) {
+ return 0;
+ }
+ int cursor = 0;
+ for (Integer stationId : stationIdList) {
+ Integer expected = targetStations.get(cursor);
+ if (expected != null && expected.equals(stationId)) {
+ cursor++;
+ if (cursor >= targetStations.size()) {
+ return 0;
+ }
+ }
+ }
+ return targetStations.size() - cursor;
+ }
+
+ private boolean isFullSoftPreferredPath(List<Integer> stationIdList, List<Integer> preferredPath) {
+ if (stationIdList == null || stationIdList.isEmpty() || preferredPath == null || preferredPath.isEmpty()) {
+ return false;
+ }
+ Integer actualStart = stationIdList.get(0);
+ Integer actualEnd = stationIdList.get(stationIdList.size() - 1);
+ Integer preferredStart = preferredPath.get(0);
+ Integer preferredEnd = preferredPath.get(preferredPath.size() - 1);
+ return (actualStart == null ? preferredStart == null : actualStart.equals(preferredStart))
+ && (actualEnd == null ? preferredEnd == null : actualEnd.equals(preferredEnd));
+ }
+
+ private int countOffPathStations(List<Integer> stationIdList, List<Integer> preferredPath) {
+ if (stationIdList == null || stationIdList.isEmpty() || preferredPath == null || preferredPath.isEmpty()) {
+ return 0;
+ }
+ Set<Integer> preferredSet = new HashSet<>(preferredPath);
+ int count = 0;
+ for (int i = 1; i < stationIdList.size() - 1; i++) {
+ Integer stationId = stationIdList.get(i);
+ if (stationId != null && !preferredSet.contains(stationId)) {
+ count++;
+ }
+ }
+ return count;
}
private List<List<NavigateNode>> filterNonAutoStationPaths(List<List<NavigateNode>> allList,
@@ -691,6 +879,7 @@
private int pathLen;
private int turnCount;
private int liftTransferCount;
+ private int passOtherOutStationCount;
private int busyStationCount;
private int runBlockCount;
private int softDeviationCount;
@@ -699,162 +888,33 @@
private double dynamicCost;
}
- public synchronized List<NavigateNode> findStationBestPath(List<List<NavigateNode>> allList) {
- if (allList == null || allList.isEmpty()) {
- return new ArrayList<>();
+ private static class PathGlobalPolicy {
+ private double lenWeightFactor = 1.0d;
+ private double congWeightFactor = 1.0d;
+ private double passOtherOutStationPenaltyWeight = 0.0d;
+ private boolean forceSkipPassOtherOutStation = false;
+ }
+ private PathGlobalPolicy loadPathGlobalPolicy(StationPathProfileConfig profileConfig) {
+ PathGlobalPolicy weights = new PathGlobalPolicy();
+ StationPathProfileConfig source = profileConfig == null ? StationPathProfileConfig.defaultConfig() : profileConfig;
+ double lenWeightPercent = safeDouble(source.getStationPathLenWeightPercent(), 50.0d);
+ double congWeightPercent = safeDouble(source.getStationPathCongWeightPercent(), 50.0d);
+ double passOtherOutStationWeightPercent = safeDouble(source.getStationPathPassOtherOutStationWeightPercent(), 100.0d);
+ weights.forceSkipPassOtherOutStation = Boolean.TRUE.equals(source.getStationPathPassOtherOutStationForceSkip());
+
+ lenWeightPercent = Math.max(lenWeightPercent, 0.0d);
+ congWeightPercent = Math.max(congWeightPercent, 0.0d);
+ passOtherOutStationWeightPercent = Math.max(passOtherOutStationWeightPercent, 0.0d);
+ double weightSum = lenWeightPercent + congWeightPercent;
+ if (weightSum <= 0) {
+ weights.passOtherOutStationPenaltyWeight = passOtherOutStationWeightPercent / 100.0d * 8.0d;
+ return weights;
}
- Map<Integer, StationProtocol> statusMap = new HashMap<>();
- try {
- DeviceConfigService deviceConfigService = SpringUtils.getBean(DeviceConfigService.class);
- if (deviceConfigService != null) {
- List<DeviceConfig> devpList = deviceConfigService.list(new QueryWrapper<DeviceConfig>()
- .eq("device_type", String.valueOf(SlaveType.Devp)));
- for (DeviceConfig deviceConfig : devpList) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, deviceConfig.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
- Map<Integer, StationProtocol> m = stationThread.getStatusMap();
- if (m != null && !m.isEmpty()) {
- statusMap.putAll(m);
- }
- }
- }
- } catch (Exception ignore) {}
-
- Set<Integer> outStationIdSet = loadAllOutStationIdSet();
-
- double lenWeightPercent = 50.0;
- double congWeightPercent = 50.0;
- double passOtherOutStationWeightPercent = 100.0;
- boolean forceSkipPassOtherOutStation = false;
- try {
- ConfigService configService = SpringUtils.getBean(ConfigService.class);
- if (configService != null) {
- lenWeightPercent = loadDoubleConfig(configService, CFG_STATION_PATH_LEN_WEIGHT_PERCENT, lenWeightPercent);
- congWeightPercent = loadDoubleConfig(configService, CFG_STATION_PATH_CONG_WEIGHT_PERCENT, congWeightPercent);
- passOtherOutStationWeightPercent = loadDoubleConfig(configService, CFG_STATION_PATH_PASS_OTHER_OUT_STATION_WEIGHT_PERCENT, passOtherOutStationWeightPercent);
- forceSkipPassOtherOutStation = loadBooleanConfig(configService, CFG_STATION_PATH_PASS_OTHER_OUT_STATION_FORCE_SKIP, false);
- }
- } catch (Exception ignore) {}
-
- List<List<NavigateNode>> candidates = new ArrayList<>();
- List<Integer> lens = new ArrayList<>();
- List<Integer> tasksList = new ArrayList<>();
- List<Double> congs = new ArrayList<>();
- List<Integer> passOtherOutStationCounts = new ArrayList<>();
- int skippedByPassOtherOutStation = 0;
-
- for (List<NavigateNode> path : allList) {
- if (path == null || path.isEmpty()) {
- continue;
- }
- int len = path.size();
- int tasks = 0;
- HashSet<Integer> stationIdSet = new HashSet<>();
- for (NavigateNode node : path) {
- JSONObject value = null;
- try {
- value = JSON.parseObject(node.getNodeValue());
- } catch (Exception ignore) {}
- if (value == null) {
- continue;
- }
- Integer stationId = value.getInteger("stationId");
- if (stationId == null) {
- continue;
- }
- if (!stationIdSet.add(stationId)) {
- continue;
- }
- StationProtocol protocol = statusMap.get(stationId);
- if (protocol != null && protocol.getTaskNo() != null && protocol.getTaskNo() > 0) {
- tasks++;
- }
- }
- double cong = len <= 0 ? 0.0 : (double) tasks / (double) len;
- int passOtherOutStationCount = countPassOtherOutStations(path, outStationIdSet);
- if (forceSkipPassOtherOutStation && passOtherOutStationCount > 0) {
- skippedByPassOtherOutStation++;
- News.info("[WCS Debug] 绔欑偣璺緞鍊欓�夊凡璺宠繃锛屽洜缁忚繃鍏朵粬鍑哄簱绔欑偣,startStationId={},endStationId={},passOtherOutStationCount={}",
- extractStationId(path.get(0)),
- extractStationId(path.get(path.size() - 1)),
- passOtherOutStationCount);
- continue;
- }
- candidates.add(path);
- lens.add(len);
- tasksList.add(tasks);
- congs.add(cong);
- passOtherOutStationCounts.add(passOtherOutStationCount);
- }
-
- if (candidates.isEmpty()) {
- if (forceSkipPassOtherOutStation && skippedByPassOtherOutStation > 0) {
- News.info("[WCS Debug] 鎵�鏈夌珯鐐硅矾寰勫�欓�夊潎鍥犵粡杩囧叾浠栧嚭搴撶珯鐐硅寮哄埗璺宠繃");
- return new ArrayList<>();
- }
- return allList.get(0);
- }
-
- int minLen = Integer.MAX_VALUE;
- int maxLen = Integer.MIN_VALUE;
- double minCong = Double.MAX_VALUE;
- double maxCong = -Double.MAX_VALUE;
- int minPassOtherOutStationCount = Integer.MAX_VALUE;
- int maxPassOtherOutStationCount = Integer.MIN_VALUE;
- for (int i = 0; i < candidates.size(); i++) {
- int l = lens.get(i);
- double c = congs.get(i);
- int p = passOtherOutStationCounts.get(i);
- if (l < minLen) minLen = l;
- if (l > maxLen) maxLen = l;
- if (c < minCong) minCong = c;
- if (c > maxCong) maxCong = c;
- if (p < minPassOtherOutStationCount) minPassOtherOutStationCount = p;
- if (p > maxPassOtherOutStationCount) maxPassOtherOutStationCount = p;
- }
-
- double weightSum = lenWeightPercent + congWeightPercent + passOtherOutStationWeightPercent;
- double lenW = weightSum <= 0 ? 0.5 : lenWeightPercent / weightSum;
- double congW = weightSum <= 0 ? 0.5 : congWeightPercent / weightSum;
- double passOtherOutStationW = weightSum <= 0 ? 0.0 : passOtherOutStationWeightPercent / weightSum;
-
- List<NavigateNode> best = null;
- double bestCost = Double.MAX_VALUE;
- int bestPassOtherOutStationCount = Integer.MAX_VALUE;
- int bestTasks = Integer.MAX_VALUE;
- int bestLen = Integer.MAX_VALUE;
- for (int i = 0; i < candidates.size(); i++) {
- int l = lens.get(i);
- int t = tasksList.get(i);
- double c = congs.get(i);
- int p = passOtherOutStationCounts.get(i);
- //褰掍竴鍖�
- double lenNorm = (maxLen - minLen) <= 0 ? 0.0 : (l - minLen) / (double) (maxLen - minLen);
- double congNorm = (maxCong - minCong) <= 0 ? 0.0 : (c - minCong) / (double) (maxCong - minCong);
- double passOtherOutStationNorm = (maxPassOtherOutStationCount - minPassOtherOutStationCount) <= 0
- ? 0.0
- : (p - minPassOtherOutStationCount) / (double) (maxPassOtherOutStationCount - minPassOtherOutStationCount);
- //鑾峰彇鏉冮噸
- double cost = lenNorm * lenW + congNorm * congW + passOtherOutStationNorm * passOtherOutStationW;
- if (cost < bestCost
- || (cost == bestCost && p < bestPassOtherOutStationCount)
- || (cost == bestCost && p == bestPassOtherOutStationCount && t < bestTasks)
- || (cost == bestCost && p == bestPassOtherOutStationCount && t == bestTasks && l < bestLen)) {
- best = candidates.get(i);
- bestCost = cost;
- bestPassOtherOutStationCount = p;
- bestTasks = t;
- bestLen = l;
- }
- }
-
- if (best == null) {
- return allList.get(0);
- }
- return best;
+ weights.lenWeightFactor = (lenWeightPercent / weightSum) * 2.0d;
+ weights.congWeightFactor = (congWeightPercent / weightSum) * 2.0d;
+ weights.passOtherOutStationPenaltyWeight = passOtherOutStationWeightPercent / 100.0d * 8.0d;
+ return weights;
}
private Set<Integer> loadAllOutStationIdSet() {
@@ -914,43 +974,6 @@
return value.getInteger("stationId");
} catch (Exception ignore) {}
return null;
- }
-
- private double loadDoubleConfig(ConfigService configService, String code, double defaultValue) {
- if (configService == null || code == null) {
- return defaultValue;
- }
- Config config = configService.getOne(new QueryWrapper<Config>().eq("code", code));
- if (config == null || config.getValue() == null) {
- return defaultValue;
- }
- String value = config.getValue().trim();
- if (value.endsWith("%")) {
- value = value.substring(0, value.length() - 1);
- }
- try {
- return Double.parseDouble(value);
- } catch (Exception ignore) {}
- return defaultValue;
- }
-
- private boolean loadBooleanConfig(ConfigService configService, String code, boolean defaultValue) {
- if (configService == null || code == null) {
- return defaultValue;
- }
- Config config = configService.getOne(new QueryWrapper<Config>().eq("code", code));
- if (config == null || config.getValue() == null) {
- return defaultValue;
- }
- String value = config.getValue().trim();
- if (value.isEmpty()) {
- return defaultValue;
- }
- return "1".equals(value)
- || "true".equalsIgnoreCase(value)
- || "yes".equalsIgnoreCase(value)
- || "y".equalsIgnoreCase(value)
- || "on".equalsIgnoreCase(value);
}
//鍒ゆ柇褰撳墠鑺傜偣鍒颁笅涓�涓妭鐐规槸鍚︿负鎷愮偣
diff --git a/src/main/resources/sql/20260313_create_station_path_policy_tables.sql b/src/main/resources/sql/20260313_create_station_path_policy_tables.sql
index 215d486..2574b2b 100644
--- a/src/main/resources/sql/20260313_create_station_path_policy_tables.sql
+++ b/src/main/resources/sql/20260313_create_station_path_policy_tables.sql
@@ -40,21 +40,14 @@
(`profile_code`, `profile_name`, `priority`, `status`, `config_json`, `memo`)
SELECT
'default',
- '榛樿涓ら樁娈佃瘎鍒嗘ā鏉�',
+ '榛樿妯℃澘',
100,
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}',
- '榛樿妯℃澘锛屾湭鍛戒腑瑙勫垯鏃跺厹搴�'
+ '{"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}',
+ '榛樿妯℃澘'
FROM dual
WHERE NOT EXISTS (
SELECT 1 FROM `asr_bas_station_path_profile` WHERE `profile_code` = 'default'
-);
-
-INSERT INTO `sys_config`(`name`, `code`, `value`, `type`, `status`, `select_type`)
-SELECT '绔欑偣璺緞璇勫垎妯″紡', 'stationPathScoreMode', 'legacy', 1, 1, 'system'
-FROM dual
-WHERE NOT EXISTS (
- SELECT 1 FROM `sys_config` WHERE `code` = 'stationPathScoreMode'
);
INSERT INTO `sys_config`(`name`, `code`, `value`, `type`, `status`, `select_type`)
diff --git a/src/main/resources/sql/20260318_migrate_station_path_weight_config_to_profile_config.sql b/src/main/resources/sql/20260318_migrate_station_path_weight_config_to_profile_config.sql
new file mode 100644
index 0000000..4447829
--- /dev/null
+++ b/src/main/resources/sql/20260318_migrate_station_path_weight_config_to_profile_config.sql
@@ -0,0 +1,48 @@
+SET @station_path_len_weight_percent = (
+ SELECT COALESCE(MAX(REPLACE(TRIM(`value`), '%', '')), '50')
+ FROM `sys_config`
+ WHERE `code` = 'stationPathLenWeightPercent'
+);
+
+SET @station_path_cong_weight_percent = (
+ SELECT COALESCE(MAX(REPLACE(TRIM(`value`), '%', '')), '50')
+ FROM `sys_config`
+ WHERE `code` = 'stationPathCongWeightPercent'
+);
+
+SET @station_path_pass_other_out_station_weight_percent = (
+ SELECT COALESCE(MAX(REPLACE(TRIM(`value`), '%', '')), '100')
+ FROM `sys_config`
+ WHERE `code` = 'stationPathPassOtherOutStationWeightPercent'
+);
+
+SET @station_path_pass_other_out_station_force_skip = (
+ SELECT COALESCE(MAX(TRIM(`value`)), '0')
+ FROM `sys_config`
+ WHERE `code` = 'stationPathPassOtherOutStationForceSkip'
+);
+
+UPDATE `asr_bas_station_path_profile`
+SET `config_json` = JSON_SET(
+ CASE
+ WHEN `config_json` IS NULL OR TRIM(`config_json`) = '' THEN '{}'
+ ELSE `config_json`
+ END,
+ '$.stationPathLenWeightPercent', CAST(@station_path_len_weight_percent AS DECIMAL(10,2)),
+ '$.stationPathCongWeightPercent', CAST(@station_path_cong_weight_percent AS DECIMAL(10,2)),
+ '$.stationPathPassOtherOutStationWeightPercent', CAST(@station_path_pass_other_out_station_weight_percent AS DECIMAL(10,2)),
+ '$.stationPathPassOtherOutStationForceSkip',
+ CASE
+ WHEN LOWER(@station_path_pass_other_out_station_force_skip) IN ('1', 'true', 'yes', 'y', 'on') THEN TRUE
+ ELSE FALSE
+ END
+)
+WHERE `id` IS NOT NULL;
+
+DELETE FROM `sys_config`
+WHERE `code` IN (
+ 'stationPathLenWeightPercent',
+ 'stationPathCongWeightPercent',
+ 'stationPathPassOtherOutStationWeightPercent',
+ 'stationPathPassOtherOutStationForceSkip'
+);
diff --git a/src/main/resources/sql/20260318_remove_station_path_score_mode.sql b/src/main/resources/sql/20260318_remove_station_path_score_mode.sql
new file mode 100644
index 0000000..84fc009
--- /dev/null
+++ b/src/main/resources/sql/20260318_remove_station_path_score_mode.sql
@@ -0,0 +1,4 @@
+-- 绔欑偣璺緞绠楁硶缁熶竴鍥哄畾涓� twoStage锛屾竻鐞� legacy 妯″紡閰嶇疆椤�
+
+DELETE FROM sys_config
+WHERE code = 'stationPathScoreMode';
diff --git a/src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js b/src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js
index eb9db67..5918461 100644
--- a/src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js
+++ b/src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js
@@ -12,7 +12,11 @@
s1MaxTurnDiff: 1,
s2BusyWeight: 2.0,
s2RunBlockWeight: 10.0,
- s2LoopLoadWeight: 12.0
+ s2LoopLoadWeight: 12.0,
+ stationPathLenWeightPercent: 50,
+ stationPathCongWeightPercent: 50,
+ stationPathPassOtherOutStationWeightPercent: 100,
+ stationPathPassOtherOutStationForceSkip: false
}
}
@@ -72,7 +76,7 @@
return {
loading: false,
saving: false,
- scoreMode: 'legacy',
+ scoreMode: 'twoStage',
defaultProfileCode: 'default',
profiles: [],
rules: [],
@@ -315,7 +319,7 @@
return
}
var data = res.data || {}
- that.scoreMode = data.scoreMode || 'legacy'
+ that.scoreMode = data.scoreMode || 'twoStage'
that.defaultProfileCode = data.defaultProfileCode || 'default'
that.showRuleJson = false
that.showAllPathTags = false
@@ -362,7 +366,6 @@
return
}
var payload = {
- scoreMode: this.scoreMode,
defaultProfileCode: this.defaultProfileCode,
profiles: this.profiles.map(this.sanitizeProfileForSave),
rules: this.rules.map(this.sanitizeRuleForSave)
@@ -1140,6 +1143,13 @@
},
normalizeProfile: function (raw) {
var config = Object.assign({}, this.defaultProfileConfig(), this.parseJson(raw.configJson) || raw.config || {})
+ config.stationPathLenWeightPercent = this.toNumberSafe(config.stationPathLenWeightPercent)
+ config.stationPathCongWeightPercent = this.toNumberSafe(config.stationPathCongWeightPercent)
+ config.stationPathPassOtherOutStationWeightPercent = this.toNumberSafe(config.stationPathPassOtherOutStationWeightPercent)
+ config.stationPathLenWeightPercent = config.stationPathLenWeightPercent == null ? 50 : config.stationPathLenWeightPercent
+ config.stationPathCongWeightPercent = config.stationPathCongWeightPercent == null ? 50 : config.stationPathCongWeightPercent
+ config.stationPathPassOtherOutStationWeightPercent = config.stationPathPassOtherOutStationWeightPercent == null ? 100 : config.stationPathPassOtherOutStationWeightPercent
+ config.stationPathPassOtherOutStationForceSkip = !!config.stationPathPassOtherOutStationForceSkip
return {
id: raw.id || null,
profileCode: raw.profileCode || '',
@@ -1185,6 +1195,11 @@
return JSON.parse(JSON.stringify(model))
},
sanitizeProfileForSave: function (item) {
+ var config = Object.assign({}, item.config || {})
+ config.stationPathLenWeightPercent = this.toNumberSafe(config.stationPathLenWeightPercent) == null ? 50 : this.toNumberSafe(config.stationPathLenWeightPercent)
+ config.stationPathCongWeightPercent = this.toNumberSafe(config.stationPathCongWeightPercent) == null ? 50 : this.toNumberSafe(config.stationPathCongWeightPercent)
+ config.stationPathPassOtherOutStationWeightPercent = this.toNumberSafe(config.stationPathPassOtherOutStationWeightPercent) == null ? 100 : this.toNumberSafe(config.stationPathPassOtherOutStationWeightPercent)
+ config.stationPathPassOtherOutStationForceSkip = !!config.stationPathPassOtherOutStationForceSkip
return {
id: item.id || null,
profileCode: item.profileCode,
@@ -1192,7 +1207,7 @@
priority: Number(item.priority || 100),
status: Number(item.status || 0),
memo: item.memo || '',
- config: Object.assign({}, item.config || {})
+ config: config
}
},
sanitizeRuleForSave: function (item) {
diff --git a/src/main/webapp/views/stationPathPolicy/stationPathPolicy.html b/src/main/webapp/views/stationPathPolicy/stationPathPolicy.html
index 1bbd1a0..e11fc4e 100644
--- a/src/main/webapp/views/stationPathPolicy/stationPathPolicy.html
+++ b/src/main/webapp/views/stationPathPolicy/stationPathPolicy.html
@@ -718,6 +718,14 @@
grid-column: span 2;
}
+ .profile-dialog-layout {
+ width: 100%;
+ }
+
+ .profile-dialog-layout .el-form {
+ width: 100%;
+ }
+
.section-card {
border: 1px solid rgba(219, 229, 238, 0.96);
border-radius: 18px;
@@ -818,21 +826,15 @@
<div class="hero-grid">
<div class="panel-card profile-panel">
<div class="panel-head">
- <div><h2>妯℃澘涓庢ā寮�</h2></div>
+ <div><h2>妯℃澘閰嶇疆</h2></div>
<el-button type="primary" plain size="small" icon="el-icon-plus" @click="openProfileDialog()">鏂板妯℃澘</el-button>
</div>
<div class="panel-body">
<div class="setting-grid">
<div class="section-card">
- <h3>鍏ㄥ眬寮�鍏�</h3>
+ <h3>鍏ㄥ眬閰嶇疆</h3>
<el-form label-position="top">
<div class="dialog-grid">
- <el-form-item label="璇勫垎妯″紡" class="span-2">
- <el-radio-group v-model="scoreMode">
- <el-radio-button label="legacy">legacy</el-radio-button>
- <el-radio-button label="twoStage">twoStage</el-radio-button>
- </el-radio-group>
- </el-form-item>
<el-form-item label="榛樿妯℃澘" class="span-2">
<el-select v-model="defaultProfileCode" placeholder="璇烽�夋嫨榛樿妯℃澘" filterable style="width: 100%;">
<el-option v-for="item in profiles" :key="item.profileCode" :label="item.profileName + ' (' + item.profileCode + ')'" :value="item.profileCode"></el-option>
@@ -868,7 +870,8 @@
</div>
<div class="entity-desc">
S1: 闀垮害 {{ item.config.s1LenWeight }} / 鎷愮偣 {{ item.config.s1TurnWeight }} / 椤跺崌 {{ item.config.s1LiftWeight }}<br>
- S2: 蹇欑珯 {{ item.config.s2BusyWeight }} / 鍫靛 {{ item.config.s2RunBlockWeight }} / 鐜嚎 {{ item.config.s2LoopLoadWeight }}
+ S2: 蹇欑珯 {{ item.config.s2BusyWeight }} / 鍫靛 {{ item.config.s2RunBlockWeight }} / 鐜嚎 {{ item.config.s2LoopLoadWeight }}<br>
+ 骞宠 : 闀垮害 {{ item.config.stationPathLenWeightPercent }}% / 鎵胯浇 {{ item.config.stationPathCongWeightPercent }}% / 浠栧嚭鎯╃綒 {{ item.config.stationPathPassOtherOutStationWeightPercent }} / 寮鸿烦 {{ item.config.stationPathPassOtherOutStationForceSkip ? '鏄�' : '鍚�' }}
</div>
<div class="entity-actions">
<el-button size="mini" @click.stop="openProfileDialog(item)">缂栬緫</el-button>
@@ -1049,7 +1052,7 @@
</div>
<el-dialog title="璺緞妯℃澘" :visible.sync="profileDialogVisible" width="820px" class="dialog-panel" append-to-body :destroy-on-close="true">
- <div class="dialog-grid">
+ <div class="profile-dialog-layout">
<el-form label-position="top" label-width="120px" style="width: 100%;">
<div class="section-card">
<h3>鍩虹淇℃伅</h3>
@@ -1095,6 +1098,16 @@
</div>
<div class="section-card">
+ <h3>璺緞骞宠 鍙傛暟</h3>
+ <div class="dialog-grid">
+ <el-form-item label="璺緞闀垮害鏉冮噸鍗犳瘮(%)"><el-input-number v-model="profileForm.config.stationPathLenWeightPercent" :min="0" :step="5" style="width: 100%;"></el-input-number></el-form-item>
+ <el-form-item label="浠诲姟鎵胯浇鏉冮噸鍗犳瘮(%)"><el-input-number v-model="profileForm.config.stationPathCongWeightPercent" :min="0" :step="5" style="width: 100%;"></el-input-number></el-form-item>
+ <el-form-item label="鍏朵粬鍑哄簱绔欑偣鎯╃綒鏉冮噸"><el-input-number v-model="profileForm.config.stationPathPassOtherOutStationWeightPercent" :min="0" :step="10" style="width: 100%;"></el-input-number></el-form-item>
+ <el-form-item label="鍏朵粬鍑哄簱绔欑偣寮哄埗璺宠繃"><el-switch v-model="profileForm.config.stationPathPassOtherOutStationForceSkip"></el-switch></el-form-item>
+ </div>
+ </div>
+
+ <div class="section-card">
<h3>绗簩闃舵鍔ㄦ�佽瘎鍒�</h3>
<div class="dialog-grid">
<el-form-item label="蹇欑珯鏉冮噸"><el-input-number v-model="profileForm.config.s2BusyWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
--
Gitblit v1.9.1