From c60cfa9037592af51f47cccf1c063ebc64923394 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 29 七月 2023 10:11:38 +0800
Subject: [PATCH] 牛眼坐标与WCS系统坐标转换公式

---
 src/main/java/com/zy/common/utils/NavigatePositionConvert.java |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index 47d2b93..3bd0ac9 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -22,23 +22,29 @@
         return newPosition;
     }
 
-    //xy杞磋浆鍧愭爣缂栧彿
-    public static Short xyToPosition(int x, int y) {
-        StringBuffer sb = new StringBuffer();
-        sb.append(x);
-        if (x < 10) {
-            sb.append("00");
-        } else if (x < 100) {
-            sb.append("0");
-        }
-        sb.append(y);
-        return Short.parseShort(sb.toString());
+    //鐗涚溂鍧愭爣杞琖CS搴撲綅鍙�
+    public static String xyzToLocNo(int x, int y, int z) {
+        int[] ints = NyXyzToWCSXyz(x, y, z);
+        String locNo = Utils.getLocNo(ints[0],ints[1],ints[2]);
+        return locNo;
     }
 
-    //xyz杞磋浆搴撲綅鍙�
-    public static String xyzToLocNo(int x, int y, int z) {
-        String locNo = Utils.getLocNo(x, y, z);
-        return locNo;
+    //WCS绯荤粺鍧愭爣杞墰鐪煎潗鏍�
+    public static int[] WCSXyzToNyXyz(int x, int y, int z) {
+        //WCS绯荤粺Y杞� => 鐗涚溂X杞磋浆鎹㈠叕寮�
+        int x1 = Math.abs(y - 61) + 11;
+        //WCS绯荤粺X杞� => 鐗涚溂Y杞磋浆鎹㈠叕寮�
+        int y1 = x + 10;
+        return new int[]{x1, y1, z};
+    }
+
+    //鐗涚溂鍧愭爣杞琖CS绯荤粺鍧愭爣
+    public static int[] NyXyzToWCSXyz(int x, int y, int z) {
+        //鐗涚溂X杞� => WCS绯荤粺Y杞村叕寮�
+        int y1 = Math.abs(x - 11 - 61);
+        //鐗涚溂Y杞� => WCS绯荤粺X杞村叕寮�
+        int x1 = y - 10;
+        return new int[]{x1, y1, z};
     }
 
     //xyz杞磋浆鍧愭爣缂栧彿
@@ -75,15 +81,6 @@
             return Short.parseShort(basDevp.getQrCodeValue());
         }
         return Short.parseShort(locMast.getQrCodeValue());
-    }
-
-    //杞崲琛屽彿锛屽疄闄呬腑鏈�搴曞眰鍙兘鏄涓�琛岋紝鍦ㄦ暟缁勪腑鏈�搴曞眰鏄渶鍚庝竴琛岋紝鍥犳闇�瑕佽繘琛岃浆鎹㈡墠鍙互鍖归厤鏁版嵁
-    public static int covertRow(int row) {
-        NavigateMapData mapData = new NavigateMapData();
-        int[][] data = mapData.getData();
-        //瀹為檯琛屾暟
-        int realRow = data.length - 1;
-        return realRow - row;
     }
 
     public static int[] coverPosition(int col,int row) {

--
Gitblit v1.9.1