From 3cf23392ce90c0a99835afe2db3a81206e093819 Mon Sep 17 00:00:00 2001 From: L <L@132> Date: 星期四, 25 九月 2025 10:02:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java index 0e2be39..71d4c4e 100644 --- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java @@ -3,6 +3,9 @@ import com.zy.asrs.entity.BasDevp; import lombok.Data; +import java.util.HashMap; +import java.util.Map; + /** * 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅 * Created by vincent on 2020/8/6 @@ -131,5 +134,32 @@ } return null; } +// public Integer getNearbySta() { +// if (getNearbySta == null) return 0; +// +// // key: 绔欑偣鍙� value: 鍩哄噯鐗╃悊浣嶇疆 +// Map<Integer, Integer> posMap = new HashMap<>(); +// posMap.put(1004, 6534); +// posMap.put(1007, 33634); +// posMap.put(1010, 75174); +// posMap.put(1014, 102124); +// posMap.put(1018, 138224); +// posMap.put(1021, 178034); +// posMap.put(1024, 219684); +// posMap.put(1028, 246724); +// posMap.put(1031, 288194); +// posMap.put(1035, 315204); +// int tolerance = 50; // 鍏佽璇樊鑼冨洿 +// +// for (Map.Entry<Integer, Integer> entry : posMap.entrySet()) { +// int site = entry.getKey(); +// int basePos = entry.getValue(); +// if (Math.abs(getNearbySta - basePos) <= tolerance) { +// return site; +// } +// } +// +// return 0; // 娌″尮閰嶅埌绔欑偣 +// } } -- Gitblit v1.9.1