From d6dddbf5463a95a8d4af39658be720540bd9c3f4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 02 四月 2026 12:39:02 +0800
Subject: [PATCH] #检测站点到位信号
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 49 ++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/WrkAnalysisStationArrivalScanner.java | 62 ------------------------------
src/main/java/com/zy/core/plugin/GslProcess.java | 1
3 files changed, 51 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkAnalysisStationArrivalScanner.java b/src/main/java/com/zy/asrs/task/WrkAnalysisStationArrivalScanner.java
index cf33ff0..d34579b 100644
--- a/src/main/java/com/zy/asrs/task/WrkAnalysisStationArrivalScanner.java
+++ b/src/main/java/com/zy/asrs/task/WrkAnalysisStationArrivalScanner.java
@@ -1,40 +1,15 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zy.asrs.entity.BasStation;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasStationService;
-import com.zy.asrs.service.WrkAnalysisService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.core.News;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.enums.WrkStsType;
-import com.zy.core.model.protocol.StationProtocol;
-import com.zy.core.thread.StationThread;
import com.zy.core.utils.StationOperateProcessUtils;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
@Component
public class WrkAnalysisStationArrivalScanner {
- private final WrkMastService wrkMastService;
- private final BasStationService basStationService;
- private final WrkAnalysisService wrkAnalysisService;
private final StationOperateProcessUtils stationOperateProcessUtils;
- public WrkAnalysisStationArrivalScanner(WrkMastService wrkMastService,
- BasStationService basStationService,
- WrkAnalysisService wrkAnalysisService,
- StationOperateProcessUtils stationOperateProcessUtils) {
- this.wrkMastService = wrkMastService;
- this.basStationService = basStationService;
- this.wrkAnalysisService = wrkAnalysisService;
+ public WrkAnalysisStationArrivalScanner(StationOperateProcessUtils stationOperateProcessUtils) {
this.stationOperateProcessUtils = stationOperateProcessUtils;
}
@@ -42,40 +17,5 @@
public void scanOutboundStationFlow() {
stationOperateProcessUtils.stationOutExecuteFinish();
stationOperateProcessUtils.checkTaskToComplete();
- }
-
- @Scheduled(fixedDelay = 1000L)
- public void scanInboundStationArrival() {
- List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
- .eq("io_type", 1)
- .eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts)
- .isNotNull("sta_no"));
- for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast == null || wrkMast.getWrkNo() == null || wrkMast.getStaNo() == null) {
- continue;
- }
- BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>()
- .eq("station_id", wrkMast.getStaNo())
- .last("limit 1"));
- if (basStation == null || basStation.getDeviceNo() == null) {
- continue;
- }
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
- Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
- StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
- boolean arrived = stationProtocol != null
- && wrkMast.getWrkNo().equals(stationProtocol.getTaskNo())
- && stationProtocol.isLoading();
- if (!arrived && !stationThread.hasRecentArrival(basStation.getStationId(), wrkMast.getWrkNo())) {
- continue;
- }
- boolean updated = wrkAnalysisService.completeInboundStationRun(wrkMast, new Date());
- if (updated) {
- News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿鍛戒腑锛屽伐浣滃彿={}锛岀洰鏍囩珯={}", wrkMast.getWrkNo(), wrkMast.getStaNo());
- }
- }
}
}
diff --git a/src/main/java/com/zy/core/plugin/GslProcess.java b/src/main/java/com/zy/core/plugin/GslProcess.java
index 2773a4e..7c97960 100644
--- a/src/main/java/com/zy/core/plugin/GslProcess.java
+++ b/src/main/java/com/zy/core/plugin/GslProcess.java
@@ -73,6 +73,7 @@
submitCrnTask("crnIoExecuteFinish", DISPATCH_INTERVAL_MS, crnOperateUtils::crnIoExecuteFinish);
submitStationTask("stationInExecute", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::stationInExecute);
submitStationTask("crnStationOutExecute", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::crnStationOutExecute);
+ submitStationTask("scanInboundStationArrival", DISPATCH_INTERVAL_MS, stationOperateProcessUtils::scanInboundStationArrival);
submitStationTask("checkStationOutOrder", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationOutOrder);
submitStationTask("watchCircleStation", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::watchCircleStation);
submitStationTask("checkStationRunBlock", MAINTENANCE_INTERVAL_MS, stationOperateProcessUtils::checkStationRunBlock);
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 34c170d..138a68a 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -1,10 +1,18 @@
package com.zy.core.utils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasStationService;
+import com.zy.asrs.service.WrkAnalysisService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.core.News;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
import com.zy.core.enums.WrkIoType;
import com.zy.core.enums.WrkStsType;
+import com.zy.core.model.protocol.StationProtocol;
+import com.zy.core.thread.StationThread;
import com.zy.core.utils.station.StationDispatchLoadSupport;
import com.zy.core.utils.station.StationOutboundDispatchProcessor;
import com.zy.core.utils.station.StationRegularDispatchProcessor;
@@ -16,12 +24,18 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
@Component
public class StationOperateProcessUtils {
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private BasStationService basStationService;
+ @Autowired
+ private WrkAnalysisService wrkAnalysisService;
@Autowired
private StationRegularDispatchProcessor stationRegularDispatchProcessor;
@Autowired
@@ -51,6 +65,41 @@
stationRegularDispatchProcessor.stationOutExecuteFinish();
}
+ // 妫�娴嬪叆搴撲换鍔℃槸鍚﹀埌杈剧珯鍙板苟杞负绔欏彴杩愯瀹屾垚
+ public synchronized void scanInboundStationArrival() {
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
+ .eq("io_type", 1)
+ .eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts)
+ .isNotNull("sta_no"));
+ for (WrkMast wrkMast : wrkMasts) {
+ if (wrkMast == null || wrkMast.getWrkNo() == null || wrkMast.getStaNo() == null) {
+ continue;
+ }
+ BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>()
+ .eq("station_id", wrkMast.getStaNo())
+ .last("limit 1"));
+ if (basStation == null || basStation.getDeviceNo() == null) {
+ continue;
+ }
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basStation.getDeviceNo());
+ if (stationThread == null) {
+ continue;
+ }
+ Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
+ StationProtocol stationProtocol = statusMap == null ? null : statusMap.get(basStation.getStationId());
+ boolean arrived = stationProtocol != null
+ && wrkMast.getWrkNo().equals(stationProtocol.getTaskNo())
+ && stationProtocol.isLoading();
+ if (!arrived && !stationThread.hasRecentArrival(basStation.getStationId(), wrkMast.getWrkNo())) {
+ continue;
+ }
+ boolean updated = wrkAnalysisService.completeInboundStationRun(wrkMast, new Date());
+ if (updated) {
+ News.info("鍏ュ簱绔欑偣鍒拌揪鎵弿鍛戒腑锛屽伐浣滃彿={}锛岀洰鏍囩珯={}", wrkMast.getWrkNo(), wrkMast.getStaNo());
+ }
+ }
+ }
+
// 妫�娴嬩换鍔¤浆瀹屾垚
public synchronized void checkTaskToComplete() {
stationRegularDispatchProcessor.checkTaskToComplete();
--
Gitblit v1.9.1