From e064028d87f0d9335d095c2f646a7ce7635e13f1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 18 十二月 2025 13:38:54 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 98 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 27d50c9..c5567bd 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -47,6 +47,32 @@
}};
+ // 姝ｅ簭
+ public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE1 = new ArrayList<Integer>() {{
+ add(101);add(102);add(104);add(122);add(105);add(107);add(118);add(108);
+ }};
+ // 鍙嶅簭
+ public static final List<Integer> TRACK_POSITION_REVERSE_SEQUENCE2 = new ArrayList<Integer>() {{
+ add(117);add(116);add(171);add(1142);add(114);add(123);add(113);add(121);add(111);add(120);add(110);
+ }};
+
+ public static Integer getEndRoute(Integer endRoute,Integer rgvNo){
+ if (rgvNo == 1){
+ if (TRACK_POSITION_POSITIVE_SEQUENCE1.contains(endRoute)){
+ return endRoute;
+ } else {
+ return 108;
+ }
+ } else if (rgvNo == 2){
+ if (TRACK_POSITION_REVERSE_SEQUENCE2.contains(endRoute)){
+ return endRoute;
+ } else {
+ return 110;
+ }
+ }
+ return endRoute;
+ }
+
// 姝ｅ簭
public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE = new ArrayList<Integer>() {{
add(101);add(102);add(104);add(122);add(105);add(107);add(118);add(108);add(119);add(110);add(120);add(111);add(121);add(113);add(123);add(114);add(1142);add(171);add(116);add(117);
@@ -109,7 +135,7 @@
case 122: return 118;
case 105: return 119;
case 107:
- case 118: return 120;
+ case 118: return 108;
case 108:
case 119: return 111;
case 110:
@@ -132,10 +158,10 @@
case 114: return 113;
case 123:
case 113: return 111;
- case 121:
- case 111: return 108;
+ case 121: return 110;
+ case 111: return 110;
case 120:
- case 110: return 107;
+ case 110: return 108;
case 119:
case 108: return 107;
case 118:
@@ -160,6 +186,7 @@
case 122:
case 105:
case 107:
+ return 118;
case 118:
return staNo;
default:
@@ -175,6 +202,7 @@
case 123:
case 113:
case 121:
+ return 121;
case 111:
return staNo;
default:
@@ -437,44 +465,49 @@
case 2:
return 102;
case 3:
+ return 1907;
case 4:
- return 122;
case 5:
case 6:
- return 105;
+ return 104;
case 7:
case 8:
- return 118;
+ return 105;
case 9:
+ return 122;
case 10:
case 11:
- return 119;
case 12:
+ return 107;
case 13:
case 14:
- return 110;
+ return 118;
case 15:
- return 120;
+ return 108;
case 16:
case 17:
case 18:
- return 111;
+ return 110;
case 19:
- return 121;
+ return 120;
case 20:
case 21:
case 22:
- return 113;
+ return 111;
case 23:
+ return 121;
case 24:
- return 123;
case 25:
- return 114;
case 26:
+ return 113;
case 27:
- return 1142;
case 28:
- return 116;
+ return 123;
+ case 29:
+ return 114;
+ case 30:
+ case 31:
+ return 1142;
default:
return 1142;
}
@@ -483,46 +516,53 @@
public static short RgvPosStaTwo(Short posId){
switch (posId.intValue()){
case 1:
- return 116;
case 2:
- return 1142;
+ return 116;
case 3:
case 4:
- return 114;
+ return 171;
case 5:
- return 123;
case 6:
+ return 114;
case 7:
+ return 123;
case 8:
- return 113;
case 9:
case 10:
- return 121;
+ return 113;
case 11:
case 12:
+ return 121;
case 13:
+ return 111;
case 14:
- return 120;
case 15:
- return 110;
case 16:
+ return 120;
case 17:
+ return 110;
case 18:
- return 119;
case 19:
- return 108;
case 20:
+ return 108;
case 21:
+ return 118;
case 22:
- return 107;
case 23:
case 24:
- return 105;
+ return 107;
case 25:
case 26:
+ return 122;
case 27:
+ return 105;
case 28:
+ case 29:
+ case 30:
return 104;
+ case 31:
+ case 32:
+ return 1901;
default:
return 104;
}
--
Gitblit v1.9.1