From 453289eef46cf688fafe2e4488d5e187c58debc5 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 12 八月 2024 13:33:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 241 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 176 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 218b507..ea72548 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -14,27 +14,33 @@
public class RouteUtils {
public static final List<Integer> MERGE_STA_NO_One = new ArrayList<Integer>() {{
- add(116);add(117);
+// add(116);add(117);
+ add(104);add(122);
}};
public static final List<Integer> MERGE_STA_NO_TWO = new ArrayList<Integer>() {{
- add(113);add(123);add(114);add(1142);
+// add(113);add(123);add(114);add(1142);
+ add(107);add(118);
}};
public static final List<Integer> MERGE_STA_NO_THREE = new ArrayList<Integer>() {{
- add(107);add(118);add(108);add(119);
+// add(107);add(118);add(108);add(119);
+ add(108);add(119);
}};
public static final List<Integer> MERGE_STA_NO_FOUR = new ArrayList<Integer>() {{
- add(110);add(120);add(111);add(121);
+// add(110);add(120);add(111);add(121);
+ add(110);add(120);
}};
public static final List<Integer> MERGE_STA_NO_FIVE = new ArrayList<Integer>() {{
- add(104);add(122);add(105);
+// add(104);add(122);add(105);
+ add(111);add(121);
}};
public static final List<Integer> MERGE_STA_NO_SIX = new ArrayList<Integer>() {{
- add(108);add(119);add(110);add(120);
+// add(108);add(119);add(110);add(120);
+ add(113);add(123);add(114);
}};
public static final List<Integer> MERGE_STA_NO_SEVEN = new ArrayList<Integer>() {{
@@ -71,38 +77,132 @@
return msgBuilder.toString();
}
}
-// /*
-// * 鑾峰彇骞叉秹鏈�杩滅珯鐐�
-// * */
-// public static Integer RouteIndexFarMas(int rgvNo,Integer staNo){
-// List<Integer> staFall = new ArrayList<>();
-// if (MERGE_STA_NO_SIX.contains(staNo)){
-// staFall = MERGE_STA_NO_SIX;
-// }else if (MERGE_STA_NO_One.contains(staNo)){
-// staFall = MERGE_STA_NO_One;
-// }else if (MERGE_STA_NO_TWO.contains(staNo)){
-// staFall = MERGE_STA_NO_TWO;
-// }else if (MERGE_STA_NO_THREE.contains(staNo)){
-// staFall = MERGE_STA_NO_THREE;
-// }else if (MERGE_STA_NO_FOUR.contains(staNo)){
-// staFall = MERGE_STA_NO_FOUR;
-// }else if (MERGE_STA_NO_FIVE.contains(staNo)){
-// staFall = MERGE_STA_NO_FIVE;
-// }else {
-// return staNo;
-// }
-//
-// int indexNo = 0;
-// if (rgvNo==1){
-// indexNo=staFall.size()-1;
-// }
-// return staFall.get(indexNo);
-// }
-
/*
* 鑾峰彇骞叉秹鏈�杩滅珯鐐�
* */
public static Integer RouteIndexFarMas(int rgvNo,Integer staNo){
+ List<Integer> staFall = new ArrayList<>();
+ if (MERGE_STA_NO_SIX.contains(staNo)){
+// staFall = MERGE_STA_NO_SIX;
+ if (rgvNo==1){
+ if (staNo==113){
+ return 123;
+ } else {
+ return 114;
+ }
+ }else {
+ if (staNo==114){
+ return 123;
+ } else {
+ return 113;
+ }
+ }
+ }else if (MERGE_STA_NO_One.contains(staNo)){
+ staFall = MERGE_STA_NO_One;
+ }else if (MERGE_STA_NO_TWO.contains(staNo)){
+ staFall = MERGE_STA_NO_TWO;
+ }else if (MERGE_STA_NO_THREE.contains(staNo)){
+ staFall = MERGE_STA_NO_THREE;
+ }else if (MERGE_STA_NO_FOUR.contains(staNo)){
+ staFall = MERGE_STA_NO_FOUR;
+ }else if (MERGE_STA_NO_FIVE.contains(staNo)){
+ staFall = MERGE_STA_NO_FIVE;
+ }else {
+ return staNo;
+ }
+
+ int indexNo = 0;
+ if (rgvNo==1){
+ indexNo=staFall.size()-1;
+ }
+ return staFall.get(indexNo);
+ }
+
+ public static Integer RouteIndexFarMasOtherNear(int rgvNo,Integer staNo){
+ if (rgvNo==1){
+ switch (staNo){
+ case 117: return 116;
+ case 116: return 1142;
+ case 1142:
+ case 114: return 114;
+ case 123: return 113;
+ case 113: return 121;
+ case 121: return 111;
+ case 111: return 110;
+ case 120:
+ case 110: return 119;
+ case 119:
+ case 108: return 118;
+ case 118:
+ case 107: return 105;
+ case 105:
+ case 122: return 122;
+ case 104: return 104;
+ case 102: return 102;
+ case 101: return 101;
+ default:
+ return 102;
+ }
+ }else {
+ switch (staNo){
+ case 117: return 117;
+ case 116: return 116;
+ case 1142: return 116;
+ case 114: return 116;
+ case 123: return 1142;
+ case 113: return 114;
+ case 121: return 113;
+ case 111: return 113;
+ case 120: return 121;
+ case 110: return 111;
+ case 119: return 110;
+ case 108: return 110;
+ case 118: return 119;
+ case 107: return 107;
+ case 105: return 107;
+ case 122: return 122;
+ case 104: return 104;
+ case 102: return 104;
+ case 101: return 102;
+ default:
+ return 116;
+ }
+ }
+ }
+
+ public static Integer RouteIndexFarMasOtherNearUpMap(int rgvNo,Integer staNo){
+// int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(staNo);
+// int ib = TRACK_POSITION_REVERSE_SEQUENCE.indexOf(staNo);
+// if (ia<=ib){
+// return new Integer[]{RouteIndexFarMasReverse(1,runStaStart),RouteIndexFarMasReverse(2,runStaEnd)};
+// }else {
+// return new Integer[]{RouteIndexFarMasReverse(1,runStaEnd),RouteIndexFarMasReverse(2,runStaStart)};
+// }
+// if (ia<=ib){
+// return new Integer[]{TRACK_POSITION_POSITIVE_SEQUENCE.get(ia),TRACK_POSITION_POSITIVE_SEQUENCE.get(ib)};
+// }else {
+// return new Integer[]{TRACK_POSITION_POSITIVE_SEQUENCE.get(ib),TRACK_POSITION_POSITIVE_SEQUENCE.get(ia)};
+// }
+// if (rgvNo==1){
+// if (ia-2>=1){
+// return TRACK_POSITION_POSITIVE_SEQUENCE.get(ia-2);
+// }else {
+// return 102;
+// }
+ return RouteIndexFarMasOther(rgvNo,staNo);
+// }else {
+// if (ib-2>=1){
+// return TRACK_POSITION_REVERSE_SEQUENCE.get(ib-2);
+// }else {
+// return 116;
+// }
+// }
+ }
+//
+ /*
+ * 鑾峰彇骞叉秹鏈�杩滅珯鐐�
+ * */
+ public static Integer RouteIndexFarMasOther(int rgvNo,Integer staNo){
if (rgvNo==1){
switch (staNo){
case 101: return 102;
@@ -200,7 +300,7 @@
if (rgvNo==1) {
switch (staNo) {
case 101:
- case 102: return 0;
+ case 102: return 102;
case 104:
case 122:
case 105: return 102;
@@ -222,7 +322,7 @@
case 1142:
case 116:
case 117:
- return 0;
+ return 102;
default:
return 101;
}
@@ -231,7 +331,7 @@
case 117:
case 116:
case 1142:
- return 0;
+ return 116;
case 114:
case 123:
case 113:
@@ -253,7 +353,7 @@
return 107;
case 102:
case 101:
- return 0;
+ return 116;
default:
return 117;
}
@@ -321,35 +421,48 @@
int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(b);
int ic = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(c);
int id = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(d);
- if (id==0){
- if (ia>ib){
- if (ia>ic){
- return a;
- }else {
- return c;
- }
+ if (id == 0){
+ if (ib>ic){
+ return b;
}else {
- if (ib>ic){
- return b;
- }else {
- return c;
- }
+ return c;
}
}else {
- if (ia<ib){
- if (ia<ic){
- return a;
- }else {
- return c;
- }
+ if (ib<ic){
+ return b;
}else {
- if (ib<ic){
- return b;
- }else {
- return c;
- }
+ return c;
}
}
+// if (id==0){
+// if (ia>ib){
+// if (ia>ic){
+// return a;
+// }else {
+// return c;
+// }
+// }else {
+// if (ib>ic){
+// return b;
+// }else {
+// return c;
+// }
+// }
+// }else {
+// if (ia<ib){
+// if (ia<ic){
+// return a;
+// }else {
+// return c;
+// }
+// }else {
+// if (ib<ic){
+// return b;
+// }else {
+// return c;
+// }
+// }
+// }
}
/*
@@ -486,9 +599,9 @@
int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(runStaStart);
int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(runStaEnd);
if (ia<=ib){
- return new Integer[]{RouteIndexFarMasReverse(runStaStart,1),RouteIndexFarMasReverse(runStaEnd,2)};
+ return new Integer[]{RouteIndexFarMasReverse(1,runStaStart),RouteIndexFarMasReverse(2,runStaEnd)};
}else {
- return new Integer[]{RouteIndexFarMasReverse(runStaEnd,1),RouteIndexFarMasReverse(runStaStart,2)};
+ return new Integer[]{RouteIndexFarMasReverse(1,runStaEnd),RouteIndexFarMasReverse(2,runStaStart)};
}
// if (ia<=ib){
// return new Integer[]{TRACK_POSITION_POSITIVE_SEQUENCE.get(ia),TRACK_POSITION_POSITIVE_SEQUENCE.get(ib)};
@@ -500,8 +613,6 @@
// }else {
// return new Integer[]{TRACK_POSITION_POSITIVE_SEQUENCE.get(ib+1),TRACK_POSITION_POSITIVE_SEQUENCE.get(ia-1)};
// }
-
-
}
public static boolean RgvRunStaSign(Integer staBow,Integer runStaEnd,Integer rgvNo){
--
Gitblit v1.9.1