From 720e0926fa1c94b952c26e111206c5d6e1ed5ba2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 21 四月 2026 15:59:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master
---
src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java b/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
index 63d81b4..81d4c8d 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationV3Thread.java
@@ -30,9 +30,9 @@
import com.zy.core.network.DeviceConnectPool;
import com.zy.core.network.ZyStationConnectDriver;
import com.zy.core.network.entity.ZyStationStatusEntity;
+import com.zy.core.task.DeviceAsyncLogPublisher;
import com.zy.core.thread.support.RecentStationArrivalTracker;
import com.zy.core.thread.support.StationErrLogSupport;
-import com.zy.core.utils.DeviceLogRedisKeyBuilder;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -59,11 +59,13 @@
private long deviceDataLogTime = System.currentTimeMillis();
private ExecutorService executor = Executors.newFixedThreadPool(9999);
private final RecentStationArrivalTracker recentArrivalTracker;
+ private final DeviceAsyncLogPublisher devpAsyncLogPublisher;
public ZyStationV3Thread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
this.deviceConfig = deviceConfig;
this.redisUtil = redisUtil;
this.recentArrivalTracker = new RecentStationArrivalTracker(redisUtil);
+ this.devpAsyncLogPublisher = SpringUtils.getBean(DeviceAsyncLogPublisher.class);
}
@Override
@@ -164,6 +166,7 @@
if (!Cools.isEmpty(stationProtocol.getSystemWarning())) {
if (stationProtocol.isAutoing()
&& !stationProtocol.isLoading()
+ && redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId()) == null
) {
stationProtocol.setSystemWarning("");
}
@@ -176,18 +179,41 @@
StationErrLogSupport.sync(deviceConfig, redisUtil, statusList);
if (System.currentTimeMillis() - deviceDataLogTime > deviceLogCollectTime) {
- DeviceDataLog deviceDataLog = new DeviceDataLog();
- deviceDataLog.setOriginData(JSON.toJSONString(zyStationStatusEntities));
- deviceDataLog.setWcsData(JSON.toJSONString(statusList));
- deviceDataLog.setType(String.valueOf(SlaveType.Devp));
- deviceDataLog.setDeviceNo(deviceConfig.getDeviceNo());
- deviceDataLog.setCreateTime(new Date());
-
- redisUtil.set(DeviceLogRedisKeyBuilder.build(deviceDataLog), deviceDataLog, 60 * 60 * 24);
+ Date createTime = new Date();
+ HashMap<Integer, ZyStationStatusEntity> originDataMap = buildStationStatusMap(zyStationStatusEntities);
+ for (int i = 0; i < statusList.size(); i++) {
+ StationProtocol stationProtocol = statusList.get(i);
+ if (stationProtocol == null || stationProtocol.getStationId() == null) {
+ continue;
+ }
+ DeviceDataLog deviceDataLog = new DeviceDataLog();
+ ZyStationStatusEntity originEntity = originDataMap.get(stationProtocol.getStationId());
+ deviceDataLog.setOriginData(originEntity == null ? null : JSON.toJSONString(originEntity));
+ deviceDataLog.setWcsData(JSON.toJSONString(stationProtocol));
+ deviceDataLog.setType(String.valueOf(SlaveType.Devp));
+ deviceDataLog.setDeviceNo(deviceConfig.getDeviceNo());
+ deviceDataLog.setStationId(stationProtocol.getStationId());
+ deviceDataLog.setCreateTime(createTime);
+ devpAsyncLogPublisher.publishLatest(deviceDataLog);
+ }
deviceDataLogTime = System.currentTimeMillis();
}
}
+ private HashMap<Integer, ZyStationStatusEntity> buildStationStatusMap(List<ZyStationStatusEntity> zyStationStatusEntities) {
+ HashMap<Integer, ZyStationStatusEntity> map = new HashMap<>();
+ if (zyStationStatusEntities == null) {
+ return map;
+ }
+ for (ZyStationStatusEntity statusEntity : zyStationStatusEntities) {
+ if (statusEntity == null || statusEntity.getStationId() == null) {
+ continue;
+ }
+ map.put(statusEntity.getStationId(), statusEntity);
+ }
+ return map;
+ }
+
@Override
public boolean connect() {
zyStationConnectDriver = new ZyStationConnectDriver(deviceConfig, redisUtil);
--
Gitblit v1.9.1