From 71116a04f1617d317b80fcc327a01929b13b1d2a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 29 二月 2024 16:08:40 +0800
Subject: [PATCH] #双车
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index cba980b..e769506 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -14,7 +14,7 @@
//闂2 鍛ㄤ繆鏉�
public static final List<Integer> MERGE_STA_NO_One = new ArrayList<Integer>() {{
-// add(116);add(117);
+ add(113);add(119);
}};
public static final List<Integer> MERGE_STA_NO_TWO = new ArrayList<Integer>() {{
@@ -31,7 +31,7 @@
// 姝ｅ簭
public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE = new ArrayList<Integer>() {{
- add(161);add(157);add(153);add(149);add(124);add(119);add(113);add(999);;add(112);add(107);add(106);add(101);add(100);
+ add(161);add(157);add(153);add(149);add(124);add(119);add(113);add(999);add(112);add(107);add(106);add(101);add(100);
}};
// 鍙嶅簭
public static final List<Integer> TRACK_POSITION_REVERSE_SEQUENCE = new ArrayList<Integer>() {{
@@ -110,10 +110,10 @@
* 鑾峰彇鏈�杩滅珯鐐�
* */
public static Integer RouteIndexFarMas(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);
+ 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){
@@ -232,6 +232,28 @@
return getRouteIntersection(getRoute(a, c), getRoute(b, c), RouteCollectCountType.DEDUPLICATIONUNION);
}
+ public static Short CrnStaEnd(Integer endSta,Integer souSta) {
+ switch (endSta) {
+ case 100:
+ if (souSta == 118){
+ return (short)119;
+ }
+ return (short)149;
+ case 102:
+ case 111:
+ return 149;
+ default:
+ return endSta.shortValue();
+ }
+ }
+
+ public static Short SouStaEnd(Integer endSta,Integer souSta){
+ if (souSta == 159) {
+ return (short)161;
+ }
+ return souSta.shortValue();
+ }
+
public static void main(String[] arge){
--
Gitblit v1.9.1