#

Junjie

2025-11-18 42fd6bd4095414f7a78a2bb5d2c692c04119da2c

 src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java

@@ -10,13 +10,13 @@
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.DeviceDataLogService;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.Task;
@@ -173,18 +173,16 @@
            crnProtocol.setLastCommandTime(System.currentTimeMillis());
        }

        if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 1) {
            //采集时间超过1s，保存一次数据记录
        if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 200) {
            //保存数据记录
            DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
            DeviceDataLog deviceDataLog = new DeviceDataLog();
            deviceDataLog.setOriginData(JSON.toJSONString(crnStatus));
            deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
            deviceDataLog.setType(String.valueOf(SlaveType.Crn));
            deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
            deviceDataLog.setCreateTime(new Date());
            deviceDataLogService.insert(deviceDataLog);

            redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
            //更新采集时间
            crnProtocol.setDeviceDataLog(System.currentTimeMillis());
        }