From 0031e41fb8dd0367c9d6237deda6ca7091523f68 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 30 三月 2025 09:08:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |  129 ++++++++++++++++++++++++++----------------
 1 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 9ae5dff..f4306d5 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -16,10 +16,7 @@
 
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by vincent on 2020/8/27
@@ -27,6 +24,31 @@
 public class Utils {
 
     private static final DecimalFormat fmt = new DecimalFormat("##0.00");
+
+    public static String getStaName(Integer sta){
+        HashMap<Integer, String> map = new HashMap<>();
+        map.put(113,"Ctu搴�102");map.put(115,"Ctu搴�101");
+        map.put(204,"Ctu搴�201");map.put(304,"Ctu搴�301");
+        map.put(31001,"鍥涘悜搴�101");
+
+        map.put(1024,"鍫嗗灈鏈哄簱鍖�1鍙峰嚭搴撳彛");map.put(1028,"鍫嗗灈鏈哄簱鍖�2鍙峰嚭搴撳彛");
+        map.put(1040,"鍫嗗灈鏈哄簱鍗�1鍙峰叆搴撳彛");map.put(1042,"鍫嗗灈鏈哄簱鍗�1鍙峰嚭搴撳彛");
+
+        map.put(2000,"鍫嗗灈鏈哄簱鍖�2妤煎嚭鍏ュ簱鍙�");map.put(2002,"鍫嗗灈鏈哄簱鍖椾簩妤煎嚭搴撳彛");
+        map.put(2010,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭鍏ュ簱鍙�");map.put(2012,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭搴撳彛");
+
+
+        map.put(3010,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭鍏ュ簱鍙�");map.put(3012,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭搴撳彛");
+
+        return map.get(sta)==null?sta.toString():map.get(sta);
+    }
+
+    public static boolean isNorth(Integer sourceStaNo){
+        if ((sourceStaNo>1000 && sourceStaNo < 1040) || (sourceStaNo>2000 && sourceStaNo > 2010)|| (sourceStaNo > 3000 && sourceStaNo < 3010)){
+            return true;
+        }
+        return false;
+    }
 
     public static float scale(Float f) {
         if (f == null || f == 0f || Float.isNaN(f)) {
@@ -143,10 +165,10 @@
         int row = getRow(shallowLoc);
         int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
         int targetRow;
-        if (remainder == 2) {
-            targetRow = row - 1;
-        } else if (remainder == 3) {
+        if (remainder == 0  ) {
             targetRow = row + 1;
+        } else if (remainder == 3) {
+            targetRow = row - 1;
         } else {
             throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
         }
@@ -256,27 +278,34 @@
         return false;
     }
 
+    public static boolean BooleanWhsTypeSta2(Integer whsType) {
+        if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4 || whsType == 9) {
+            return true;
+        }
+        return false;
+    }
+
     public static int RowCount(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
-        return LocNecessaryParameters(rowLastno, curRow, crnNumber)[0];
+        return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[0];
     }
 
     public static int getCurRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
-        return LocNecessaryParameters(rowLastno, curRow, crnNumber)[1];
+        return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[1];
     }
 
     public static int getCrnNo(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
-        return LocNecessaryParameters(rowLastno, curRow, crnNumber)[2];
+        return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[2];
     }
 
     public static int getNearRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
-        return LocNecessaryParameters(rowLastno, curRow, crnNumber)[3];
+        return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[3];
     }
 
     //搴撲綅鎺掑彿鍒嗛厤
-    public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+    public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber,Integer whsType) {
         switch (rowLastno.getTypeId()) {
             case 1://缁忓吀鍙屼几搴撲綅
-                return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠�
+                return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
             case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
                 return LocNecessaryParametersDoubleExtension2(rowLastno, curRow, crnNumber); //宸插畬鍠�
             case 3://缁忓吀鍗曞弻浼稿簱浣�  宸﹀崟鍙冲弻(灏忓崟澶у弻)
@@ -295,39 +324,41 @@
     }
 
     //缁忓吀鍙屼几搴撲綅
-    public static int[] LocNecessaryParametersDoubleExtension(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
+    public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
         int[] necessaryParameters = new int[]{0, 0, 0, 0};
-
-        Integer sRow = rowLastno.getsRow();
-        Integer sCrnNo = rowLastno.getsCrnNo();
-        necessaryParameters[0] = crnNumber; // 杞娆℃暟
-        //婊℃澘姝e父鍏ュ簱
-        if (curRow.equals(crnNumber * 4 + sRow - 1)) {
-            necessaryParameters[1] = sRow;    //curRow   鏈�娣卞簱浣嶆帓
-            necessaryParameters[2] = sCrnNo;     //crnNo     鍫嗗灈鏈哄彿
-            necessaryParameters[3] = sRow + 1;    //nearRow  鏈�娴呭簱浣嶆帓
-        } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
-            necessaryParameters[1] = sRow + 3;    //curRow   鏈�娣卞簱浣嶆帓
-            necessaryParameters[2] = sCrnNo;     //crnNo     鍫嗗灈鏈哄彿
-            necessaryParameters[3] = sRow + 2;    //nearRow  鏈�娴呭簱浣嶆帓
-        } else {
-            curRow = curRow + 4;
-            if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
-                throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
-            }
-            if ((curRow - sRow) % 4 == 0) {
-                necessaryParameters[1] = curRow;    //curRow   鏈�娣卞簱浣嶆帓
-                necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1;     //crnNo     鍫嗗灈鏈哄彿
-                necessaryParameters[3] = curRow + 1;    //nearRow  鏈�娴呭簱浣嶆帓
-            } else if ((curRow - sRow + 1) % 4 == 0) {
-                necessaryParameters[1] = curRow;    //curRow   鏈�娣卞簱浣嶆帓
-                necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1;     //crnNo     鍫嗗灈鏈哄彿
-                necessaryParameters[3] = curRow - 1;    //nearRow  鏈�娴呭簱浣嶆帓
+        if (BooleanWhsTypeSta2(whsType)) {
+            necessaryParameters[0] = crnNumber; // 杞娆℃暟
+            //婊℃澘姝e父鍏ュ簱
+            if (curRow.equals(crnNumber * 4)) {
+                necessaryParameters[1] = 1;    //curRow   鏈�娣卞簱浣嶆帓
+                necessaryParameters[2] = 1;     //crnNo     鍫嗗灈鏈哄彿
+                necessaryParameters[3] = 2;    //nearRow  鏈�娴呭簱浣嶆帓
+            } else if (curRow.equals(crnNumber * 4 - 3)) {
+                necessaryParameters[1] = 4;    //curRow   鏈�娣卞簱浣嶆帓
+                necessaryParameters[2] = 1;     //crnNo     鍫嗗灈鏈哄彿
+                necessaryParameters[3] = 3;    //nearRow  鏈�娴呭簱浣嶆帓
             } else {
-                throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+                curRow = curRow + 4;
+                if (curRow < 1 || curRow > (crnNumber * 4)) {
+                    throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+                }
+                if ((curRow - 1) % 4 == 0) {
+                    necessaryParameters[1] = curRow;    //curRow   鏈�娣卞簱浣嶆帓
+                    necessaryParameters[2] = (curRow + 3) / 4;     //crnNo     鍫嗗灈鏈哄彿
+                    necessaryParameters[3] = curRow + 1;    //nearRow  鏈�娴呭簱浣嶆帓
+                } else if (curRow % 4 == 0) {
+                    necessaryParameters[1] = curRow;    //curRow   鏈�娣卞簱浣嶆帓
+                    necessaryParameters[2] = curRow / 4;     //crnNo     鍫嗗灈鏈哄彿
+                    necessaryParameters[3] = curRow - 1;    //nearRow  鏈�娴呭簱浣嶆帓
+                } else {
+                    throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+                }
             }
         }
 
+        //鍫嗗灈鏈哄簱浣嶄粠14鎺掑紑濮�
+        necessaryParameters[1] = necessaryParameters[1]+13;    //curRow   鏈�娣卞簱浣嶆帓
+        necessaryParameters[3] = necessaryParameters[3]+13;    //nearRow  鏈�娴呭簱浣嶆帓
         return necessaryParameters;
     }
 
@@ -502,22 +533,22 @@
             case 1:
                 necessaryParameters[1] = 4;    //curRow   鏈�娣卞簱浣嶆帓
                 necessaryParameters[2] = sCrnNo;     //crnNo     鍫嗗灈鏈哄彿
-                necessaryParameters[3] = 7;    //nearRow  鏈�娴呭簱浣嶆帓
+                necessaryParameters[3] = 3;    //nearRow  鏈�娴呭簱浣嶆帓
                 break;
             case 4:
-                necessaryParameters[1] = 9;    //curRow   鏈�娣卞簱浣嶆帓
+                necessaryParameters[1] = 5;    //curRow   鏈�娣卞簱浣嶆帓
                 necessaryParameters[2] = sCrnNo;     //crnNo     鍫嗗灈鏈哄彿
-                necessaryParameters[3] = 12;    //nearRow  鏈�娴呭簱浣嶆帓
+                necessaryParameters[3] = 6;    //nearRow  鏈�娴呭簱浣嶆帓
                 break;
-            case 9:
-                necessaryParameters[1] = 14;    //curRow   鏈�娣卞簱浣嶆帓
+            case 5:
+                necessaryParameters[1] = 8;    //curRow   鏈�娣卞簱浣嶆帓
                 necessaryParameters[2] = sCrnNo;     //crnNo     鍫嗗灈鏈哄彿
-                necessaryParameters[3] = 14;    //nearRow  鏈�娴呭簱浣嶆帓
+                necessaryParameters[3] = 8;    //nearRow  鏈�娴呭簱浣嶆帓
                 break;
-            case 14:
+            case 8:
                 necessaryParameters[1] = 1;    //curRow   鏈�娣卞簱浣嶆帓
                 necessaryParameters[2] = sCrnNo;     //crnNo     鍫嗗灈鏈哄彿
-                necessaryParameters[3] = 2;    //nearRow  鏈�娴呭簱浣嶆帓
+                necessaryParameters[3] = 1;    //nearRow  鏈�娴呭簱浣嶆帓
                 break;
             default:
                 throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);

--
Gitblit v1.9.1