From 03003f7fc3a601f7078ff01d2d04d93996adeef0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 12:47:14 +0800
Subject: [PATCH] #检测站点到位信号
---
src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java b/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
index 5ce0c68..f55f553 100644
--- a/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
+++ b/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
@@ -185,9 +185,13 @@
stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
if (stationThread != null) {
Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = statusMap.get(basStation.getStationId());
- if (stationProtocol != null && wrkNo.equals(stationProtocol.getTaskNo())) {
+ StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
+ boolean arrived = stationProtocol != null && wrkNo.equals(stationProtocol.getTaskNo());
+ if (arrived || stationThread.hasRecentArrival(basStation.getStationId(), wrkNo)) {
complete = true;
+ if (!arrived) {
+ News.info("杈撻�佺珯鐐瑰嚭搴撳埌杈惧垽瀹氫娇鐢ㄦ渶杩戝埌绔欒ˉ鍋匡紝宸ヤ綔鍙�={}锛岀洰鏍囩珯={}", wrkNo, targetStaNo);
+ }
}
}
}
--
Gitblit v1.9.1