From 5d1df2b22fd4e0b31f80385664393cd3d73a21ed Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 19 八月 2025 09:58:39 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/Utils.java | 136 +++++++++++++++++---------------------------
1 files changed, 53 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a98d157..0b35a96 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -132,100 +132,70 @@
}
public static double[] getRgvPosNew(Integer devNo,double a, double b) {
double[] rgvPosNew = getRgvPosNew(a, b);
-// switch (devNo){
-// case 101:
-// case 102:
-// case 103:
-// case 104:
-// case 105:
-// case 106:
-// case 107:
-// case 108:
-// case 109:
-// case 110:
-// case 111:
-// rgvPosNew[0] = rgvPosNew[0] - 50;
-// rgvPosNew[1] = rgvPosNew[1];
-// break;
-// case 112:
-// case 113:
-// case 114:
-// case 115:
-// rgvPosNew[0] = rgvPosNew[0] + 30;
-// rgvPosNew[1] = rgvPosNew[1];
-// break;
-// case 116:
-// case 117:
-// case 118:
-// case 119:
-// case 120:
-// case 121:
-// case 122:
-// case 123:
-// case 124:
-// case 125:
-// case 126:
-// case 127:
-// case 128:
-// case 129:
-// case 130:
-// case 131:
-// case 132:
-// case 133:
-// rgvPosNew[0] = rgvPosNew[0];
-// rgvPosNew[1] = rgvPosNew[1] + 70;
-// break;
-// case 134:
-// rgvPosNew[0] = rgvPosNew[0];
-// rgvPosNew[1] = rgvPosNew[1] - 30;
-// break;
-// }
+ switch (devNo){
+ case 101:
+ case 102:
+ case 103:
+ case 104:
+ case 105:
+ case 106:
+ case 107:
+ case 108:
+ case 109:
+ case 110:
+ case 111:
+ rgvPosNew[0] = rgvPosNew[0] - 70;
+ break;
+ case 112:
+ case 113:
+ case 114:
+ case 115:
+ rgvPosNew[0] = rgvPosNew[0] + 50;
+ break;
+ case 116:
+ case 117:
+ case 118:
+ case 119:
+ case 120:
+ case 121:
+ case 122:
+ case 123:
+ case 124:
+ case 125:
+ case 126:
+ case 127:
+ case 128:
+ case 129:
+ case 130:
+ case 131:
+ case 132:
+ case 133:
+ rgvPosNew[1] = rgvPosNew[1] + 50;
+ break;
+ case 134:
+ rgvPosNew[1] = rgvPosNew[1] - 70;
+ break;
+ }
return rgvPosNew;
}
public static double[] getRgvPosNew(double a, double b) {
- // 瀹氫箟鍖洪棿鍙婂搴旂殑鍑犱綍鍙傛暟锛堟柊澧炲渾寮у弬鏁帮級
- // 缁撴瀯锛歿start, end, 绫诲瀷, 鍙傛暟...}
- // 绫诲瀷璇存槑锛�0-鐩寸嚎锛�1-鍦嗗姬锛堥渶瑕佸渾蹇冨潗鏍囷級
Object[][] intervals = {
+// // 寮х嚎鍖洪棿锛堟嫄鐐�116-115锛夛紝鎺у埗鐐瑰亣璁句负(1125, 882)
+// {680103, 731550, 1115, 882, 1215, 775, 1125, 882},
// 鐩寸嚎鍖洪棿锛�0-134400锛�
// {璧风偣, 缁堢偣, 绫诲瀷, x1, y1, x2, y2,
{0.0, 120000.0, 0, 390.0, 750.0, 60.0, 750.0},
-// // 寮х嚎鍖洪棿锛侊紒锛佺洿绾垮尯闂达紒锛侊紒
-// {120000.0, 127500.0, 2, 60.0, 750.0, 10.0, 800.0, 10.0, 750.0}, // 淇缁堢偣鍧愭爣
- {120000.0, 127500.0, 2, 60.0, 750.0, 10.0, 800.0, 60.0, 800.0}, // 淇缁堢偣鍧愭爣
-// {120000.0, 127500.0, 0, 25.0, 775.0, 45.0, 822.0},
- // 寮х嚎鍖洪棿锛侊紒锛佺洿绾垮尯闂达紒锛侊紒
-// {127500.0, 134900.0, 2, 10.0, 800.0, 60.0, 850.0, 10.0, 850.0}, // 淇缁堢偣鍧愭爣
- {127500.0, 134900.0, 2, 10.0, 800.0, 60.0, 850.0, 60.0, 800.0}, // 淇缁堢偣鍧愭爣
-// {127500.0, 134900.0, 0, 45.0, 822.0, 65.0, 882.0},
- // 鐩寸嚎鍖洪棿
- {134900.0, 680103.0,0, 60.0, 850.0, 1100.0, 850.0},
-
-// // 寮х嚎鍖洪棿锛堟嫄鐐�116-115锛夛紝鎺у埗鐐瑰亣璁句负(1125, 882)
-// {680103, 731550, 1115, 882, 1215, 775, 1125, 882},
-
// 鍦嗗姬鍖洪棿锛堟嫄鐐�116-115锛夋柊鍙傛暟锛氬渾蹇�(1115,775)
-// {680103.0, 731550.0, 2, 1100.0, 850.0, 1200.0, 750.0, 1200.0, 850.0}, // 淇缁堢偣鍧愭爣
- {680103.0, 731550.0, 2, 1100.0, 850.0, 1200.0, 750.0, 1100.0, 750.0}, // 淇缁堢偣鍧愭爣
-
- // 鐩寸嚎鍖洪棿
+ {120000.0, 127500.0, 2, 60.0, 750.0, 10.0, 800.0, 60.0, 800.0}, // 淇缁堢偣鍧愭爣
+ {127500.0, 134900.0, 2, 10.0, 800.0, 60.0, 850.0, 60.0, 800.0},
+ {134900.0, 680103.0,0, 60.0, 850.0, 1100.0, 850.0},
+ {680103.0, 731550.0, 2, 1100.0, 850.0, 1200.0, 750.0, 1100.0, 750.0},
{731550.0, 972950.0,0, 1200.0, 750.0, 1200.0, 100.0},
- // 寮х嚎鍖洪棿锛堟嫄鐐�112-椤剁偣锛夛紝鎺у埗鐐瑰亣璁句负(1215, 80)锛侊紒锛佺洿绾垮尯闂达紒锛侊紒
-// {972950.0, 1016193.0, 2, 1200.0, 100.0, 1150.0, 50.0, 1200.0, 50.0}, // 淇缁堢偣鍧愭爣
- {972950.0, 1016193.0, 2, 1200.0, 100.0, 1150.0, 50.0, 1150.0, 100.0}, // 淇缁堢偣鍧愭爣
-// {972950.0, 1016193.0,0, 1215.0, 125.0, 1164.0, 80.0},
- // 寮х嚎鍖洪棿锛堟嫄鐐�-椤剁偣-111锛夛紝鎺у埗鐐瑰亣璁句负(1164, 125)锛侊紒锛佺洿绾垮尯闂达紒锛侊紒
-// {1016193.0, 1063563.0, 2, 1150.0, 50.0, 1100.0, 100.0, 1100.0, 50.0}, // 淇缁堢偣鍧愭爣
- {1016193.0, 1063563.0, 2, 1150.0, 50.0, 1100.0, 100.0, 1150.0, 100.0}, // 淇缁堢偣鍧愭爣
-// {1016193.0, 1063563.0,0, 1164.0, 80.0, 1115.0, 125.0},
- // 鐩寸嚎鍖洪棿
+ {972950.0, 1016193.0, 2, 1200.0, 100.0, 1150.0, 50.0, 1150.0, 100.0},
+ {1016193.0, 1063563.0, 2, 1150.0, 50.0, 1100.0, 100.0, 1150.0, 100.0},
{1063563.0, 1315250.0,0, 1100.0, 100.0, 1100.0, 700.0},
- // 寮х嚎鍖洪棿锛堟嫄鐐�101-杞集锛夛紝鎺у埗鐐瑰亣璁句负(1115, 750)
-// {1315250.0, 1322829.0, 2, 1100.0, 700.0, 1050.0, 750.0, 1100.0, 750.0}, // 淇缁堢偣鍧愭爣
- {1315250.0, 1322829.0, 2, 1100.0, 700.0, 1050.0, 750.0, 1050.0, 700.0}, // 淇缁堢偣鍧愭爣
-// {1315250.0, 1322829.0,0, 1115.0, 720.0, 1100.0, 750.0},
- // 鐩寸嚎鍖洪棿
+ {1315250.0, 1322829.0, 2, 1100.0, 700.0, 1050.0, 750.0, 1050.0, 700.0},
{1322829.0, 1737000.0,0, 1050.0, 750.0, 390.0, 750.0},
};
--
Gitblit v1.9.1