From 428afb64e7fc9b7c3701eacab98086fb622cca7b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 06 十一月 2025 09:30:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index d6d78f9..ac5bec5 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -430,7 +430,7 @@
return map.get(RgvPos);
}
- public Integer getRgvPosI2() {
+ public Integer getRgvPosI1() {
// key: 绔欑偣鍙� value: 鍩哄噯鐗╃悊浣嶇疆
Map<Integer, Integer> posMap = new HashMap<>();
posMap.put(1004, 6534);
@@ -442,16 +442,8 @@
posMap.put(1024, 219684);
posMap.put(1028, 246724);
posMap.put(1031, 288194);
- posMap.put(2003, 314954);
- posMap.put(2006, 288094);
- posMap.put(2009, 246574);
- posMap.put(2012, 219584);
- posMap.put(2015, 177934);
- posMap.put(2018, 138126);
- posMap.put(2021, 102124);
- posMap.put(2024, 75174);
- posMap.put(2027, 33748);
- posMap.put(2030, 6449);
+ posMap.put(1035, 314954);
+
int tolerance = 200; // 鍏佽璇樊鑼冨洿
@@ -466,6 +458,31 @@
return 0; // 娌″尮閰嶅埌绔欑偣
}
+ public Integer getRgvPosI2() {
+ // key: 绔欑偣鍙� value: 鍩哄噯鐗╃悊浣嶇疆
+ Map<Integer, Integer> posMap = new HashMap<>();
+ posMap.put(2030, 314954);
+ posMap.put(2027, 288094);
+ posMap.put(2024, 246574);
+ posMap.put(2021, 219584);
+ posMap.put(2018, 177934);
+ posMap.put(2015, 138126);
+ posMap.put(2012, 102124);
+ posMap.put(2009, 75174);
+ posMap.put(2006, 33748);
+ posMap.put(2003, 6449);
+ int tolerance = 500; // 鍏佽璇樊鑼冨洿
+
+ for (Map.Entry<Integer, Integer> entry : posMap.entrySet()) {
+ int site = entry.getKey();
+ int basePos = entry.getValue();
+ if (Math.abs(RgvPos - basePos) <= tolerance) {
+ return site;
+ }
+ }
+
+ return 0; // 娌″尮閰嶅埌绔欑偣
+ }
@Override
--
Gitblit v1.9.1