From 66fa0e5aa36faedce91b1d60cacccfe7e6286b65 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 03 四月 2024 11:08:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 185 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 162 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 8c5be63..5fa2133 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -105,47 +105,180 @@
public static Integer RouteIndexFarMas(int rgvNo,Integer staNo){
if (rgvNo==1){
switch (staNo){
- case 101:
- case 102: return 102;
+ case 101: return 102;
+ case 102: return 122;
case 104:
- case 122: return 118;
- case 105: return 119;
+ case 122:
+ case 105: return 105;
case 107:
- case 118: return 120;
+ case 118: return 119;
case 108:
- case 119: return 111;
+ case 119: return 120;
case 110:
- case 120: return 113;
- case 111:
- case 121: return 113;
- case 113: return 114;
+ case 120:
+ case 111: return 121;
+ case 121: return 113;
+ case 113: return 1142;
case 123:
- case 114: return 1142;
+ case 114: return 116;
default:
return 116;
}
}else {
switch (staNo){
case 117:
- case 116: return 123;
+ case 116: return 1142;
case 1142:
- case 114: return 113;
- case 123:
- case 113: return 111;
+ case 114:
+ case 123: return 113;
+ case 113: return 121;
case 121:
- case 111: return 108;
+ case 111: return 110;
case 120:
- case 110: return 107;
+ case 110: return 108;
case 119:
- case 108: return 107;
+ case 108:
case 118:
- case 107: return 105;
- case 105:
+ case 107: return 107;
+ case 105: return 104;
case 122:
- case 104: return 104;
+ case 104: return 102;
default:
return 102;
}
+ }
+// if (rgvNo==1){
+// switch (staNo){
+// case 101:
+// case 102: return 102;
+// case 104:
+// case 122: return 118;
+// case 105: return 119;
+// case 107:
+// case 118: return 120;
+// case 108:
+// case 119: return 111;
+// case 110:
+// case 120: return 113;
+// case 111:
+// case 121: return 113;
+// case 113: return 114;
+// case 123:
+// case 114: return 1142;
+// default:
+// return 116;
+// }
+// }else {
+// switch (staNo){
+// case 117:
+// case 116: return 123;
+// case 1142:
+// case 114: return 113;
+// case 123:
+// case 113: return 111;
+// case 121:
+// case 111: return 108;
+// case 120:
+// case 110: return 107;
+// case 119:
+// case 108: return 107;
+// case 118:
+// case 107: return 105;
+// case 105:
+// case 122:
+// case 104: return 104;
+// default:
+// return 102;
+// }
+// }
+ }
+
+ /*
+ * 鑾峰彇骞叉秹鏈�杩滅珯鐐�
+ * */
+ public static Integer RouteIndexFarMasReverse(int rgvNo,Integer staNo){
+ if (rgvNo==1) {
+ switch (staNo) {
+ case 101:
+ case 102: return 0;
+ case 104:
+ case 122:
+ case 105: return 102;
+ case 107:
+ case 118:
+ case 108:
+ case 119: return 105;
+ case 110:
+ case 120:
+ return 107;
+ case 111:
+ case 121:
+ return 108;
+ case 113:
+ return 111;
+ case 123:
+ case 114:
+ return 121;
+ case 1142:
+ case 116:
+ case 117:
+ return 0;
+ default:
+ return 101;
+ }
+ }else{
+ switch (staNo) {
+ case 117:
+ case 116:
+ case 1142:
+ return 0;
+ case 114:
+ case 123:
+ case 113:
+ return 117;
+ case 121:return 123;
+ case 111:
+ case 120:
+ case 110:
+ return 113;
+ case 119:
+ case 108:
+ return 111;
+ case 118:
+ case 107:
+ return 110;
+ case 105:
+ case 122:
+ case 104:
+ return 107;
+ case 102:
+ case 101:
+ return 0;
+ default:
+ return 117;
+ }
+ /*
+ * switch (staNo){
+ case 117:
+ case 116: return 1142;
+ case 1142:
+ case 114:
+ case 123: return 113;
+ case 113: return 121;
+ case 121:
+ case 111: return 110;
+ case 120:
+ case 110: return 108;
+ case 119:
+ case 108:
+ case 118:
+ case 107: return 107;
+ case 105: return 104;
+ case 122:
+ case 104: return 102;
+ default:
+ return 102;
+ }*/
}
}
@@ -353,10 +486,16 @@
int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(runStaStart);
int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(runStaEnd);
if (ia<=ib){
- return new Integer[]{runStaStart,runStaEnd};
+ return new Integer[]{TRACK_POSITION_POSITIVE_SEQUENCE.get(ia),TRACK_POSITION_POSITIVE_SEQUENCE.get(ib)};
}else {
- return new Integer[]{runStaEnd,runStaStart};
+ return new Integer[]{TRACK_POSITION_POSITIVE_SEQUENCE.get(ib),TRACK_POSITION_POSITIVE_SEQUENCE.get(ia)};
}
+// if (ia<=ib){
+// return new Integer[]{TRACK_POSITION_POSITIVE_SEQUENCE.get(ia-1),TRACK_POSITION_POSITIVE_SEQUENCE.get(ib+1)};
+// }else {
+// return new Integer[]{TRACK_POSITION_POSITIVE_SEQUENCE.get(ib+1),TRACK_POSITION_POSITIVE_SEQUENCE.get(ia-1)};
+// }
+
}
--
Gitblit v1.9.1