#

Junjie

2026-01-12 f6e1228dda1a417774482aa4f838af14171284af

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

@@ -30,6 +30,8 @@

import java.text.MessageFormat;
import java.util.Date;
import com.zy.asrs.entity.BasRgvErrLog;
import com.zy.asrs.service.BasRgvErrLogService;

@Data
@Slf4j
@@ -141,6 +143,41 @@
            rgvProtocol.setDeviceDataLog(System.currentTimeMillis());
        }

        try {
            BasRgvErrLogService errLogService = SpringUtils.getBean(BasRgvErrLogService.class);
            if (errLogService != null) {
                String errFlagKey = RedisKeyType.DEVICE_ERR_ACTIVE_RGV.key + rgvProtocol.getRgvNo();
                Object active = redisUtil.get(errFlagKey);
                if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm() > 0) {
                    if (active == null) {
                        BasRgvErrLog log = new BasRgvErrLog();
                        log.setTaskNo(rgvProtocol.getTaskNo());
                        log.setStartTime(new Date());
                        log.setRgvNo(rgvProtocol.getRgvNo());
                        log.setErrCode(rgvProtocol.getAlarm());
                        log.setStatus(1);
                        log.setCreateTime(new Date());
                        log.setSystemStatus(JSON.toJSONString(rgvProtocol));
                        errLogService.insert(log);
                        if (log.getId() != null) {
                            redisUtil.set(errFlagKey, log.getId(), 60 * 60 * 24);
                        }
                    }
                } else {
                    if (active != null) {
                        Long id = Long.valueOf(String.valueOf(active));
                        BasRgvErrLog update = new BasRgvErrLog();
                        update.setId(id);
                        update.setEndTime(new Date());
                        update.setStatus(2);
                        update.setUpdateTime(new Date());
                        errLogService.updateById(update);
                        redisUtil.del(errFlagKey);
                    }
                }
            }
        } catch (Exception ignore) {}

        BasRgvService basRgvService = null;
        try {
            basRgvService = SpringUtils.getBean(BasRgvService.class);