From 946b8c5f52fd508890e65cd2c016c7f5174a0a35 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 25 七月 2025 14:41:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/utils/NavigatePositionConvert.java |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index 7c5aa60..ac71260 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -1,9 +1,8 @@
 package com.zy.common.utils;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.service.BasDevpService;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.utils.Utils;
 import com.zy.common.model.NavigateNode;
@@ -12,6 +11,34 @@
  * 搴撲綅缂栧彿鍜孉*绠楁硶鐨剎y杞磋浆鎹㈠伐鍏风被
  */
 public class NavigatePositionConvert {
+
+    public static String xyToPosition(int x, int y, int z) {
+        String locNo = Utils.getLocNo(x, y, z);
+
+        //搴撲綅鍙疯浆灏忚溅浜岀淮鐮�
+        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+                .eq("loc_no", locNo)
+                .eq("status", 1));
+        if (locMast == null) {
+            return null;
+        }
+        return locMast.getQrCodeValue();
+    }
+
+    //灏忚溅鏉″舰鐮佽浆璺緞绠楁硶鑺傜偣
+    public static NavigateNode codeToNode(String code) {
+        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+                .eq("qr_code_value", code)
+                .eq("status", 1));
+        if (locMast == null) {
+            return null;
+        }
+        NavigateNode node = new NavigateNode(locMast.getRow1(), locMast.getBay1());
+        node.setZ(locMast.getLev1());
+        return node;
+    }
 
     //鍧愭爣缂栧彿杞瑇y杞�
     public static int[] positionToXY(String position) {
@@ -73,4 +100,10 @@
         return new int[]{col, row};
     }
 
+    public static boolean equalsNode(NavigateNode node1, NavigateNode node2) {
+        if(node1.getX() ==  node2.getX() && node1.getY() == node2.getY() && node1.getZ() == node2.getZ()) {
+            return true;
+        }
+        return false;
+    }
 }

--
Gitblit v1.9.1