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 | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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 62ea5a9..cea0f43 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -1,12 +1,15 @@
package com.zy.core.thread.impl;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
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;
@@ -18,7 +21,6 @@
import com.zy.core.network.ZyStationConnectDriver;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
-import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.StationCommandType;
import com.zy.core.model.CommandResponse;
@@ -30,6 +32,7 @@
import java.text.MessageFormat;
import java.util.*;
+import com.zy.core.utils.DeviceLogRedisKeyBuilder;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -41,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
@@ -109,7 +115,7 @@
}
BasDevp basDevp = basDevpService
- .selectOne(new EntityWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
+ .getOne(new QueryWrapper<BasDevp>().eq("devp_no", deviceConfig.getDeviceNo()));
if (basDevp == null) {
return;
}
@@ -123,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())) {
@@ -141,11 +148,26 @@
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())) {
+ if (stationProtocol.isAutoing()
+ && !stationProtocol.isLoading()
+ ) {
+ stationProtocol.setSystemWarning("");
+ }
}
}
}
+ 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) {
//淇濆瓨鏁版嵁璁板綍
@@ -156,7 +178,7 @@
deviceDataLog.setDeviceNo(deviceConfig.getDeviceNo());
deviceDataLog.setCreateTime(new Date());
- redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
+ redisUtil.set(DeviceLogRedisKeyBuilder.build(deviceDataLog), deviceDataLog, 60 * 60 * 24);
//鏇存柊閲囬泦鏃堕棿
deviceDataLogTime = System.currentTimeMillis();
}
@@ -180,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
@@ -227,7 +259,7 @@
JSON.toJSONString(commandResponse)
);
if (optService != null) {
- optService.insert(basStationOpt);
+ optService.save(basStationOpt);
}
}
}
@@ -250,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