From 64b896950b855df50236a6aa06f1653cfd3b9bb9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 18 三月 2024 16:03:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 2844815..1d633f3 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -28,7 +28,23 @@
}};
public static final List<Integer> MERGE_STA_NO_FIVE = new ArrayList<Integer>() {{
- add(113);add(123);add(114);add(1142);
+ add(104);add(122);add(105);
+ }};
+
+ public static final List<Integer> MERGE_STA_NO_SIX = new ArrayList<Integer>() {{
+
+ }};
+
+ public static final List<Integer> MERGE_STA_NO_SEVEN = new ArrayList<Integer>() {{
+
+ }};
+
+ public static final List<Integer> MERGE_STA_NO_EIGHT = new ArrayList<Integer>() {{
+
+ }};
+
+ public static final List<Integer> MERGE_STA_NO_NINE = new ArrayList<Integer>() {{
+// add(108);add(119);add(110);add(120);
}};
// 姝ｅ簭
@@ -66,6 +82,8 @@
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;
}
@@ -147,6 +165,49 @@
}
}
+ /*
+ * 鑾峰彇鏈�杩滅珯鐐�
+ * a:褰撳墠浣嶇疆
+ * b:寮�濮嬩綅缃�
+ * c:缁撴潫浣嶇疆
+ * d:閿佸紑濮嬩綅缃�
+ * */
+ public static Integer RouteIndexFarMasNew(Integer a,Integer b,Integer c,Integer d){
+ int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(a);
+ 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;
+ }
+ }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;
+ }
+ }
+ }
+ }
+
public static Integer[] RouteIndexFarArr(Integer a,Integer b,Integer c,Integer d){
int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(a);
int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(b);
--
Gitblit v1.9.1