From 03c3ae747f82ad22c761c79e7b1c0e0031c57d41 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 四月 2026 20:28:35 +0800
Subject: [PATCH] #出库站点命令下发
---
src/main/java/com/zy/core/thread/impl/ZyStationThread.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
index 2fb578d..cea0f43 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -8,6 +8,8 @@
import com.zy.asrs.utils.Utils;
import com.zy.core.network.DeviceConnectPool;
import com.zy.core.thread.StationThread;
+import com.zy.core.thread.support.RecentStationArrivalTracker;
+import com.zy.core.thread.support.StationErrLogSupport;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
@@ -42,15 +44,18 @@
public class ZyStationThread implements Runnable, StationThread {
private List<StationProtocol> statusList = new ArrayList<>();
+ private volatile List<Integer> taskNoList = new ArrayList<>();
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
private ZyStationConnectDriver zyStationConnectDriver;
private int deviceLogCollectTime = 200;
private long deviceDataLogTime = System.currentTimeMillis();
+ private final RecentStationArrivalTracker recentArrivalTracker;
public ZyStationThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
this.redisUtil = redisUtil;
+ this.recentArrivalTracker = new RecentStationArrivalTracker(redisUtil);
}
@Override
@@ -124,6 +129,7 @@
}
List<ZyStationStatusEntity> zyStationStatusEntities = zyStationConnectDriver.getStatus();
+ LinkedHashSet<Integer> taskNoSet = new LinkedHashSet<>();
for (ZyStationStatusEntity statusEntity : zyStationStatusEntities) {
for (StationProtocol stationProtocol : statusList) {
if(stationProtocol.getStationId().equals(statusEntity.getStationId())) {
@@ -142,6 +148,11 @@
stationProtocol.setRunBlock(statusEntity.isRunBlock());
stationProtocol.setEnableIn(statusEntity.isEnableIn());
stationProtocol.setWeight(statusEntity.getWeight());
+ stationProtocol.setIoMode(statusEntity.getIoMode());
+ if (statusEntity.getTaskNo() != null && statusEntity.getTaskNo() > 0) {
+ taskNoSet.add(statusEntity.getTaskNo());
+ }
+ recentArrivalTracker.observe(statusEntity.getStationId(), statusEntity.getTaskNo(), statusEntity.isLoading());
}
if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
@@ -153,8 +164,10 @@
}
}
}
+ taskNoList = new ArrayList<>(taskNoSet);
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
+ StationErrLogSupport.sync(deviceConfig, redisUtil, statusList);
if (System.currentTimeMillis() - deviceDataLogTime > deviceLogCollectTime) {
//淇濆瓨鏁版嵁璁板綍
@@ -189,6 +202,16 @@
@Override
public List<StationProtocol> getStatus() {
return statusList;
+ }
+
+ @Override
+ public boolean hasRecentArrival(Integer stationId, Integer taskNo) {
+ return recentArrivalTracker.hasRecentArrival(stationId, taskNo);
+ }
+
+ @Override
+ public List<Integer> getAllTaskNoList() {
+ return taskNoList;
}
@Override
@@ -259,4 +282,9 @@
public byte[] readOriginCommand(String address, int length) {
return zyStationConnectDriver.readOriginCommand(address, length);
}
+
+ @Override
+ public boolean clearPath(Integer taskNo) {
+ return false;
+ }
}
--
Gitblit v1.9.1