From 1725fe3afb54e76d490e3efb4f14931960618eae Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 03 四月 2024 09:55:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 136 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 119 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index a4e9594..8c5be63 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
import static java.util.stream.Collectors.toList;
+
+import com.zy.asrs.entity.WrkMastSta;
import com.zy.core.enums.RouteCollectCountType;
import springfox.documentation.spring.web.json.Json;
@@ -28,7 +30,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>() {{
+ add(108);add(119);add(110);add(120);
+ }};
+
+ 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>() {{
+
}};
// 姝ｅ簭
@@ -53,28 +71,82 @@
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_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 {
- return staNo;
- }
-
- int indexNo = 0;
if (rgvNo==1){
- indexNo=staFall.size()-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;
+ }
}
- return staFall.get(indexNo);
}
@@ -277,6 +349,36 @@
return getRouteIntersection(getRoute(a, c), getRoute(b, c), RouteCollectCountType.DEDUPLICATIONUNION);
}
+ public static Integer[] RgvRunSta(Integer runStaStart,Integer runStaEnd){
+ int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(runStaStart);
+ int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(runStaEnd);
+ if (ia<=ib){
+ return new Integer[]{runStaStart,runStaEnd};
+ }else {
+ return new Integer[]{runStaEnd,runStaStart};
+ }
+
+ }
+
+ public static boolean RgvRunStaSign(Integer staBow,Integer runStaEnd,Integer rgvNo){
+ int ia = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(staBow);
+ int ib = TRACK_POSITION_POSITIVE_SEQUENCE.indexOf(runStaEnd);
+ if (rgvNo==1){
+ if (ia>ib){
+ return true;//闇�瑕侀伩璁�
+ }else {
+ return false;//涓嶉渶瑕侀伩璁�
+ }
+ }else {
+ if (ia<ib){
+ return true;//闇�瑕侀伩璁�
+ }else {
+ return false;//涓嶉渶瑕侀伩璁�
+ }
+ }
+
+ }
+
public static void main(String[] arge){
--
Gitblit v1.9.1