From 28ea25cc817e78f1023b8a7c7826441a4acadfc1 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期一, 08 十二月 2025 15:59:08 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/RouteUtils.java |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index c161495..5d2d239 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -47,6 +47,15 @@
     static {
         Collections.reverse(TRACK_POSITION_REVERSE_SEQUENCE);
     }
+    //1妤兼垬绔欑偣
+    public static final List<Integer> TRACK_POSITION_ONE = Arrays.asList(
+            1004, 1007, 1010, 1014, 1018, 1021, 1024, 1028, 1031, 1035,1042,1105,1106,1041,
+            1038,1036,1108,1109
+    );
+    //2妤兼垬绔欑偣
+    public static final List<Integer> TRACK_POSITION_TWO = Arrays.asList(
+            2003,2006,2009,2012,2015,2018,2021,2024,2027,2030,2037,2031
+    );
 
     // 杞ㄩ亾鏄犲皠锛堟妸鏄犲皠绔欑偣鏇挎崲鎴愪富绔欑偣锛�
     public static final Map<Integer, Integer> SITE_MAPPING = new HashMap<>();
@@ -156,6 +165,20 @@
             return null;
         }
         return result;
+    }
+    public static List<Integer> getRouteOne(){
+
+        List<Integer> groupRoute = new ArrayList<>();
+        groupRoute = TRACK_POSITION_ONE;
+
+        return groupRoute;
+    }
+    public static List<Integer> getRouteTwo(){
+
+        List<Integer> groupRoute = new ArrayList<>();
+        groupRoute = TRACK_POSITION_TWO;
+
+        return groupRoute;
     }
 
     /*
@@ -286,21 +309,26 @@
 
     public static Short CrnStaEnd(Integer endSta,Integer souSta) {
         switch (endSta) {
-            case 100:
-            case 102:
+            case 103:
+            case 107:
             case 111:
-                if (souSta == 118 || souSta == 127){
-                    return (short)119;
-                }
-                return 149;
+            case 113:
+            case 203:
+            case 207:
+            case 211:
+            case 213:
+                return (short)(endSta+1);
             default:
                 return endSta.shortValue();
         }
     }
 
     public static  Short SouStaEnd(Integer endSta,Integer souSta){
-       if (souSta == 159) {
-           return (short)161;
+       if (souSta == 1103) {
+           return (short)1105;
+       }
+       if(souSta == 1047){
+           return (short)1042;
        }
        return souSta.shortValue();
     }

--
Gitblit v1.9.1