From ccc38e955d12c9f39faf9fadd82cec9b60904795 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 02 十一月 2024 10:29:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a41eae0..0ce21f2 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -9,6 +9,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Created by vincent on 2020/8/27
@@ -19,13 +20,18 @@
 
     public static short getRgvStaNo(Integer rgvNo,Integer staNo){
         Map<Integer, Short> rgv1Map = new HashMap<>();
+        rgv1Map.put(1014,(short)1);rgv1Map.put(1020,(short)2);
+        rgv1Map.put(1023,(short)3);rgv1Map.put(1017,(short)4);
+        rgv1Map.put(2013,(short)5);rgv1Map.put(2401,(short)6);
+        rgv1Map.put(2114,(short)7);
         Map<Integer, Short> rgv2Map = new HashMap<>();
         rgv2Map.put(4007, (short) 1);rgv2Map.put(4001, (short) 2);
         rgv2Map.put(2003, (short) 3);rgv2Map.put(2103, (short) 4);
-        rgv2Map.put(4016, (short) 5);rgv2Map.put(4010, (short) 6);
-        rgv2Map.put(2301, (short) 7);rgv2Map.put(2002, (short) 8);
-        rgv2Map.put(2001, (short) 9);
+        rgv2Map.put(4016, (short) 6);rgv2Map.put(4010, (short) 7);
+        rgv2Map.put(2301, (short) 5);rgv2Map.put(2002, (short) 8);
+        rgv2Map.put(2102, (short) 9);
         Map<Integer, Short> rgv3Map = new HashMap<>();
+        rgv3Map.put(2402,(short)1);rgv3Map.put(3001,(short)2);
         switch (rgvNo){
             case 1:
                 return rgv1Map.get(staNo);
@@ -37,12 +43,46 @@
         return 0;
     }
 
+    public static Integer getStaNo(Integer rgvNo,Integer staNo){
+        Map<Integer, Short> rgv1Map = new HashMap<>();
+        rgv1Map.put(1014,(short)1);rgv1Map.put(1020,(short)2);
+        rgv1Map.put(1023,(short)3);rgv1Map.put(1017,(short)4);
+        rgv1Map.put(2013,(short)5);rgv1Map.put(2401,(short)6);
+        rgv1Map.put(2114,(short)7);
+        Map<Integer, Short> rgv2Map = new HashMap<>();
+        rgv2Map.put(4007, (short) 1);rgv2Map.put(4001, (short) 2);
+        rgv2Map.put(2003, (short) 3);rgv2Map.put(2103, (short) 4);
+        rgv2Map.put(4016, (short) 6);rgv2Map.put(4010, (short) 7);
+        rgv2Map.put(2301, (short) 5);rgv2Map.put(2002, (short) 8);
+        rgv2Map.put(2102, (short) 9);
+        Map<Integer, Short> rgv3Map = new HashMap<>();
+        rgv3Map.put(2402,(short)1);rgv3Map.put(3001,(short)2);
+        rgv1Map.entrySet().stream().collect(Collectors.toMap(entity ->entity.getValue(),entity-> entity.getKey())).get(staNo);
+        switch (rgvNo){
+            case 1:
+                return rgv1Map.entrySet().stream().collect(Collectors.toMap(entity ->entity.getValue(),entity-> entity.getKey())).get(staNo.shortValue());
+            case 2:
+                return rgv2Map.entrySet().stream().collect(Collectors.toMap(entity ->entity.getValue(),entity-> entity.getKey())).get(staNo.shortValue());
+            case 3:
+                return rgv3Map.entrySet().stream().collect(Collectors.toMap(entity ->entity.getValue(),entity-> entity.getKey())).get(staNo.shortValue());
+        }
+        return 0;
+    }
+
     public static short getRgvEndStaNo(Integer rgvNo,Integer staNo){
         Map<Integer, Integer> rgv1Map = new HashMap<>();
+        rgv1Map.put(3007,2401);rgv1Map.put(3012,2401);
+        rgv1Map.put(4002,2013); rgv1Map.put(4011,2013);
+        rgv1Map.put(2101,2013);rgv1Map.put(2001,2013);
+        rgv1Map.put(1022,1020);rgv1Map.put(1025,1023);
+        rgv1Map.put(1016,1014);rgv1Map.put(1019,1017);
         Map<Integer, Integer> rgv2Map = new HashMap<>();
         rgv2Map.put(4002,4001); rgv2Map.put(4011,4010);
-        rgv2Map.put(2101,2102);
+        rgv2Map.put(2101,2102);rgv2Map.put(2001,2002);
         Map<Integer, Integer> rgv3Map = new HashMap<>();
+        rgv3Map.put(3007,3001);rgv3Map.put(3012,3001);
+        rgv3Map.put(1022,2402);rgv3Map.put(1025,2402);
+        rgv3Map.put(1016,2402);rgv3Map.put(1019,2402);
         switch (rgvNo){
             case 1:
                 return getRgvStaNo(rgvNo,rgv1Map.get(staNo));

--
Gitblit v1.9.1