Junjie
2026-04-13 2cb43c8bcc1f5b7e6807dfe16bc9e08109bf7833
src/main/java/com/zy/core/thread/impl/ZyStationThread.java
@@ -9,6 +9,7 @@
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;
@@ -20,6 +21,7 @@
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;
@@ -27,11 +29,11 @@
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.network.entity.ZyStationStatusEntity;
import com.zy.core.task.DeviceAsyncLogPublisher;
import java.text.MessageFormat;
import java.util.*;
import com.zy.core.utils.DeviceLogRedisKeyBuilder;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -43,16 +45,20 @@
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 = new RecentStationArrivalTracker();
    private final RecentStationArrivalTracker recentArrivalTracker;
    private final DeviceAsyncLogPublisher devpAsyncLogPublisher;
    public ZyStationThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
        this.deviceConfig = deviceConfig;
        this.redisUtil = redisUtil;
        this.recentArrivalTracker = new RecentStationArrivalTracker(redisUtil);
        this.devpAsyncLogPublisher = SpringUtils.getBean(DeviceAsyncLogPublisher.class);
    }
    @Override
@@ -126,6 +132,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())) {
@@ -144,34 +151,62 @@
                    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()
                            && redisUtil.get(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getStationId()) == null
                    ) {
                        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) {
            //保存数据记录
            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
@@ -200,6 +235,11 @@
    }
    @Override
    public List<Integer> getAllTaskNoList() {
        return taskNoList;
    }
    @Override
    public StationCommand getCommand(StationCommandType commandType, Integer taskNo, Integer stationId, Integer targetStationId, Integer palletSize) {
        StationCommand stationCommand = new StationCommand();
        stationCommand.setTaskNo(taskNo);