From 1eee1c2af23940a6c2af5b519b65bdd1e7b4ac49 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 02 九月 2025 14:17:29 +0800
Subject: [PATCH] 去除多于代码，取消许可证校验
---
src/main/java/com/zy/asrs/utils/Utils.java | 80 +++++++--------------------------------
1 files changed, 15 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 07c66a4..fe43a12 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -2,11 +2,8 @@
import com.core.common.Arith;
import com.core.common.Cools;
-import com.zy.core.properties.SlaveProperties;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
/**
* Created by vincent on 2020/8/27
@@ -132,53 +129,12 @@
}
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] - 30;
- rgvPosNew[1] = rgvPosNew[1];
- break;
- case 112:
- case 113:
- case 114:
- case 115:
- rgvPosNew[0] = rgvPosNew[0] + 10;
- 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] + 30;
- break;
- case 134:
- rgvPosNew[0] = rgvPosNew[0];
- rgvPosNew[1] = rgvPosNew[1] - 10;
- break;
+ if (devNo>=1083){
+ rgvPosNew[0] = rgvPosNew[0] + 34;
+ } else if (devNo>=1044){
+ rgvPosNew[1] = rgvPosNew[1] -30;
+ } else {
+ rgvPosNew[1] = rgvPosNew[1]+30;
}
return rgvPosNew;
@@ -189,32 +145,26 @@
// 绫诲瀷璇存槑锛�0-鐩寸嚎锛�1-鍦嗗姬锛堥渶瑕佸渾蹇冨潗鏍囷級
Object[][] intervals = {
// 鐩寸嚎鍖洪棿锛�0-134400锛�
- {0.0, 134400.0, 0, 390.0, 775.0, 25.0, 775.0},
+ {0.0, 296680.0, 0, 400.0, 750.0, 1000.0, 750.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�-杞集-133锛変繚鎸佽礉濉炲皵鏇茬嚎
- {134400.0, 134900.0, 1, 25.0, 775.0, 65.0, 882.0, 25.0, 882.0},
+ {296680.0, 450865.0, 2, 1000.0, 750.0, 1000.0, 700.0, 950.0, 725.0},
// 鐩寸嚎鍖洪棿
- {134900.0, 680103.0,0, 65.0, 885.0, 1115.0, 882.0},
-
-// // 寮х嚎鍖洪棿锛堟嫄鐐�116-115锛夛紝鎺у埗鐐瑰亣璁句负(1125, 882)
-// {680103, 731550, 1115, 882, 1215, 775, 1125, 882},
-
- // 鍦嗗姬鍖洪棿锛堟嫄鐐�116-115锛夋柊鍙傛暟锛氬渾蹇�(1115,775)
- {680103.0, 731550.0, 2, 1115.0, 882.0, 1215.0, 775.0, 1115.0, 775.0}, // 淇缁堢偣鍧愭爣
+ {450865.0, 950000.0,0, 1000.0, 700.0, 100.0, 700.0},
// 鐩寸嚎鍖洪棿
- {731550.0, 972950.0,0, 1215.0, 775.0, 1215.0, 125.0},
+ {950000.0, 1473370.0,0, 100.0, 700.0, 100.0, -40.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�112-椤剁偣锛夛紝鎺у埗鐐瑰亣璁句负(1215, 80)
- {972950.0, 1016193.0,0, 1215.0, 125.0, 1164.0, 80.0},
+ {1473370.0, 1550588.0,2, 100.0, -40.0, 50.0, -40.0,75.0,-15.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�-椤剁偣-111锛夛紝鎺у埗鐐瑰亣璁句负(1164, 125)
- {1016193.0, 1063563.0,0, 1164.0, 80.0, 1115.0, 125.0},
+// {1016193.0, 1063563.0,0, 1164.0, 80.0, 1115.0, 125.0},
// 鐩寸嚎鍖洪棿
- {1063563.0, 1315250.0,0, 1115.0, 150.0, 1115.0, 720.0},
+ {1550588.0, 2100000.0,0, 50.0, -40.0, 50.0, 750.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�101-杞集锛夛紝鎺у埗鐐瑰亣璁句负(1115, 750)
- {1315250.0, 1322829.0,0, 1115.0, 720.0, 1100.0, 750.0},
+// {2068254.0, 2110201.0,2, 1115.0, 720.0, 1100.0, 750.0,0.0,0.0},
// 鐩寸嚎鍖洪棿
- {1322829.0, 1737000.0,0, 1090.0, 775.0, 390.0, 775.0},
+ {2100000.0, 2318250.0,0, 50.0, 750.0, 400.0, 750.0},
};
for (Object[] interval : intervals) {
--
Gitblit v1.9.1