From e47fb4b03ccdb0eee776814826a61ae4014454cd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 19:38:35 +0800
Subject: [PATCH] 部署服务器
---
src/main/java/com/zy/asrs/utils/Utils.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 910dd07..eb4d949 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
@@ -189,32 +186,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, 350.0, 700.0, 1200.0, 700.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�-杞集-133锛変繚鎸佽礉濉炲皵鏇茬嚎
- {134400.0, 134900.0, 1, 25.0, 775.0, 65.0, 882.0, 25.0, 882.0},
+ {296680.0, 450865.0, 2, 1200.0, 700.0, 1200.0, 800.0, 1150.0, 650.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, 945407.0,0, 100.0, 800.0, 1200.0, 800.0},
// 鐩寸嚎鍖洪棿
- {731550.0, 972950.0,0, 1215.0, 775.0, 1215.0, 125.0},
+ {450865.0, 1473370.0,0, 100.0, 800.0, 100.0, 100.0},
// 寮х嚎鍖洪棿锛堟嫄鐐�112-椤剁偣锛夛紝鎺у埗鐐瑰亣璁句负(1215, 80)
- {972950.0, 1016193.0,0, 1215.0, 125.0, 1164.0, 80.0},
+ {1473370.0, 1550588.0,2, 0.0, 0.0, 100.0, 100.0,50.0,50.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, 2068254.0,0, 0.0, 0.0, 0.0, 700.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},
+ {2110201.0, 2318250.0,0, 0.0, 700.0, 350.0, 700.0},
};
for (Object[] interval : intervals) {
--
Gitblit v1.9.1