From f641bad60c3c50f2bf66845252e73fa28ecaab67 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 10 九月 2024 13:19:08 +0800
Subject: [PATCH] #fs

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

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 07f4084..0f8c14a 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -22,158 +22,6 @@
         return (float) Arith.multiplys(2, f, 1);
     }
 
-    public static String zerofill(String msg, Integer count){
-        if (msg.length() == count){
-            return msg;
-        } else if (msg.length() > count){
-            return msg.substring(0, 16);
-        } else {
-            StringBuilder msgBuilder = new StringBuilder(msg);
-            for (int i = 0; i<count-msg.length(); i++){
-                msgBuilder.insert(0,"0");
-            }
-            return msgBuilder.toString();
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘繁搴撲綅
-     */
-    public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
-        if (slaveProperties.isDoubleDeep()) {
-            int row = getRow(locNo);
-            return slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘繁搴撲綅
-     */
-    public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
-        if (slaveProperties.isDoubleDeep()) {
-            return slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘祬搴撲綅  骞跺瓨鍦ㄦ繁搴撲綅
-     */
-    public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
-        if (slaveProperties.isDoubleDeep()) {
-            int row = getRow(locNo);
-            if (!slaveProperties.getDoubleLocs().contains(row)){
-                boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
-                if (deepLocLeft){
-                    return true;
-                }
-                return isDeepLocRight(slaveProperties, row+1);//鍒ゆ柇鏄惁涓哄彸娴呭簱浣�
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘祬搴撲綅
-     */
-    public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
-        if (slaveProperties.isDoubleDeep()) {
-            if (!slaveProperties.getDoubleLocs().contains(row)){
-                boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
-                if (deepLocLeft){
-                    return true;
-                }
-                return isDeepLocRight(slaveProperties, row+1);//鍒ゆ柇鏄惁涓哄彸娴呭簱浣�
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
-     */
-    public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
-        int row = getRow(deepLoc);
-        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
-        int shallowRow = deepLocLeft? (row + 1) : (row - 1);
-        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
-    }
-
-    /**
-     * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
-     */
-    public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
-//        int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
-//        return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
-        boolean deepLocLeft = isDeepLocLeft(slaveProperties, deepRow);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
-        return deepLocLeft ? (deepRow + 1) : (deepRow - 1);
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
-     */
-    public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row) {
-        if (slaveProperties.isDoubleDeep()) {
-            return slaveProperties.getDoubleLocsLeft().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * 鍒ゆ柇鏄惁涓哄彸娣卞簱浣�
-     */
-    public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row) {
-        if (slaveProperties.isDoubleDeep()) {
-            return slaveProperties.getDoubleLocsRight().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
-     */
-    public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
-//        int row = getRow(shallowLoc);
-//        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
-//        int targetRow;
-//        if (remainder == 2) {
-//            targetRow = row - 1;
-//        } else if (remainder == 3) {
-//            targetRow = row + 1;
-//        } else {
-//            throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
-//        }
-//        return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
-        int row = getRow(shallowLoc);
-        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
-        int shallowRow = deepLocLeft? (row - 1) : (row + 1);
-        return zerofill(String.valueOf(shallowRow), 2) + shallowLoc.substring(2);
-    }
-
-    /**
-     * 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
-     */
-    public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
-//        int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
-//        int targetRow;
-//        if (remainder == 2) {
-//            targetRow = shallowRow - 1;
-//        } else if (remainder == 3) {
-//            targetRow = shallowRow + 1;
-//        } else {
-//            throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
-//        }
-//        return targetRow;
-        boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
-        return deepLocLeft? (shallowRow - 1) : (shallowRow + 1);
-    }
-
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
      */
@@ -204,33 +52,5 @@
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
 
-    /**
-     * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
-     */
-    public static void toDeepIfEmptyByShallow(String shallowLoc) {
-        int row = getRow(shallowLoc);
-        int remainder = (int) Arith.remainder(row, 4);
-        int targetRow = 0;
-        if (remainder == 2) {
-            targetRow = row - 1;
-        } else if (remainder == 3) {
-            targetRow = row + 1;
-        } else {
-            throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
-        }
-        String targetLoc = zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
 
-    }
-
-    public static void main(String[] args) {
-        SlaveProperties slaveProperties = new SlaveProperties();
-        slaveProperties.setDoubleDeep(true);
-        List<Integer> list = new ArrayList<>();
-        list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
-        slaveProperties.setDoubleLocs(list);
-        slaveProperties.setGroupCount(4);
-        Integer deepRow = getDeepRow(slaveProperties, 6);
-        System.out.println(deepRow);
-
-    }
 }

--
Gitblit v1.9.1