From d4acff72f3584fea27a9a3d8bd151187393fe9c0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 11:38:45 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index d8dd70e..cf9784b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -1,23 +1,14 @@
 package com.zy.asrs.utils;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.core.common.Arith;
 import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.common.utils.NavigatePositionConvert;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.ShuttleSlave;
-import com.zy.core.model.protocol.ShuttleProtocol;
-import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.ShuttleThread;
 import java.text.DecimalFormat;
-import java.util.*;
 
-/**
- * Created by vincent on 2020/8/27
- */
 public class Utils {
 
+    private static final String LOC_NO_FLAG = "-";
     private static final DecimalFormat fmt = new DecimalFormat("##0.00");
 
     public static float scale(Float f){
@@ -46,7 +37,8 @@
      */
     public static int getRow(String locNo) {
         if (!Cools.isEmpty(locNo)) {
-            return Integer.parseInt(locNo.substring(0, 2));
+            String[] split = locNo.split(LOC_NO_FLAG);
+            return Integer.parseInt(split[0]);
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
@@ -56,7 +48,8 @@
      */
     public static int getBay(String locNo) {
         if (!Cools.isEmpty(locNo)) {
-            return Integer.parseInt(locNo.substring(2, 5));
+            String[] split = locNo.split(LOC_NO_FLAG);
+            return Integer.parseInt(split[1]);
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
@@ -66,120 +59,25 @@
      */
     public static int getLev(String locNo) {
         if (!Cools.isEmpty(locNo)) {
-            return Integer.parseInt(locNo.substring(5, 7));
+            String[] split = locNo.split(LOC_NO_FLAG);
+            return Integer.parseInt(split[2]);
         }
         throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
     }
 
     public static String getLocNo(Number row, Number bay, Number lev) {
-        return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+        return row + LOC_NO_FLAG + bay + LOC_NO_FLAG + lev;
     }
 
-    public static List<String> getGroupLoc(String locNo) {
-        return null;
-    }
-
-    //鑾峰彇闄ょ櫧鍚嶅崟澶栫殑鎸囧畾妤煎眰鍏ㄩ儴绌挎杞y鍧愭爣鐐�
-    public static List<int[]> getShuttlePoints(Integer whiteShuttle, Integer lev) {
-        SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
-        ArrayList<int[]> list = new ArrayList<>();
-        for (ShuttleSlave slave : slaveProperties.getShuttle()) {
-            if (slave.getId().intValue() == whiteShuttle) {
-                continue;//璺宠繃鐧藉悕鍗�
+    public static boolean isJSON(String value) {
+        try {
+            JSONObject jsonData = JSON.parseObject(value);
+            if (jsonData == null) {
+                return false;
             }
-
-            //鑾峰彇绌挎杞︽墍鍦ㄨ妭鐐逛綅缃�
-            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
-            if (shuttleThread == null) {
-                continue;
-            }
-            ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
-            if (shuttleProtocol == null) {
-                continue;
-            }
-
-            String currentLocNo = shuttleProtocol.getCurrentLocNo();
-            if (currentLocNo == null) {
-                continue;
-            }
-
-            if (lev != Utils.getLev(currentLocNo)) {
-                continue;//妤煎眰涓嶅悓
-            }
-
-            if (shuttleProtocol.getCurrentLocNo() == null) {
-                continue;
-            }
-            int[] xyPosition = NavigatePositionConvert.positionToXY(shuttleProtocol.getCurrentLocNo());//閫氳繃搴撲綅鍙疯幏鍙杧y鍧愭爣
-            list.add(xyPosition);
+            return true;
+        } catch (Exception e) {
+            return false;
         }
-        return list;
-    }
-
-    //妫�娴嬫ゼ灞傛槸鍚︽湁绌挎杞�
-    public static boolean checkLevHasShuttle(Integer lev) {
-        SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
-        for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
-            //鑾峰彇鍥涘悜绌挎杞︾嚎绋�
-            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
-            if (shuttleThread == null) {
-                continue;
-            }
-            ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
-            if (shuttleProtocol == null) {
-                continue;
-            }
-            String currentLocNo = shuttleProtocol.getCurrentLocNo();
-            if (currentLocNo == null) {
-                continue;
-            }
-
-            if (lev == Utils.getLev(currentLocNo)) {
-                return true;//鎸囧畾妤煎眰鏈夌┛姊溅
-            }
-        }
-
-        return false;//鎸囧畾妤煎眰娌℃湁绌挎杞�
-    }
-
-    //妫�娴嬪簱浣嶇粍鏄惁瀛樺湪灏忚溅锛屽瓨鍦ㄨ繑鍥炲皬杞﹀彿銆�
-    public static Integer checkGroupLocHasShuttle(List<String> groupLoc) {
-        if (groupLoc == null) {
-            return null;
-        }
-
-        if (groupLoc.isEmpty()) {
-            return null;
-        }
-
-        SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
-        if (slaveProperties == null) {
-            return null;
-        }
-
-        for (String loc : groupLoc) {
-            for (ShuttleSlave slave : slaveProperties.getShuttle()) {
-                ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
-                if (shuttleThread == null) {
-                    continue;
-                }
-
-                ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
-                if (shuttleProtocol == null) {
-                    continue;
-                }
-
-                if (shuttleProtocol.getCurrentLocNo() == null) {
-                    continue;
-                }
-
-                if (shuttleProtocol.getCurrentLocNo().equals(loc)) {
-                    //瀛樺湪灏忚溅
-                    return slave.getId();
-                }
-            }
-        }
-
-        return null;
     }
 }

--
Gitblit v1.9.1