*
L
2026-04-23 16c2b2af2ac3c9c4bc2496a171d041a48514906e
src/main/java/com/zy/core/thread/RgvThread.java
@@ -5,7 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCircularShuttle;
@@ -156,7 +156,7 @@
                    try {
                        // 根据实时信息更新数据库
                        BasCircularShuttleService basCircularShuttleService = SpringUtils.getBean(BasCircularShuttleService.class);
                        BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_no",  slave.getId()));
                        BasCircularShuttle basCircularShuttle = basCircularShuttleService.getOne(new QueryWrapper<BasCircularShuttle>().eq("rgv_no",  slave.getId()));
                        if (basCircularShuttle.getStatus() != 0){
                            continue;
                        }
@@ -340,7 +340,7 @@
                        if (!alarmChangeSign && !alarmList.isEmpty()){
                            BasRgvErrLogService basRgvErrLogService = SpringUtils.getBean(BasRgvErrLogService.class);
                            BasRgvErrLog basRgvErrLog = new BasRgvErrLog(rgvProtocol.getAlarmList(), rgvProtocol.getTaskNo1(), rgvProtocol.getRgvNo());
                            basRgvErrLogService.insert(basRgvErrLog);
                            basRgvErrLogService.save(basRgvErrLog);
                        }
                    } catch (Exception e){
                        log.error("RGV异常信息保存失败!!");
@@ -371,7 +371,7 @@
            BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
            BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosInt(), command);
            log.info(rgvProtocol.getRgvNo()+"号小车写入命令定位值:"+rgvProtocol.getRgvPosInt());
            basRgvOptService.insert(basRgvOpt);
            basRgvOptService.save(basRgvOpt);
        }catch (Exception e){
            log.error("RGV写入命令保存失败!!");
        }
@@ -380,7 +380,7 @@
        try{
            BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
            BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosI(), command);
            basRgvOptService.insert(basRgvOpt);
            basRgvOptService.save(basRgvOpt);
        }catch (Exception e){
            log.error("RGV写入命令保存失败!!");
        }
@@ -432,7 +432,7 @@
                    new Date(),
                    null
            );
            bean.insert(basRgvOpt);
            bean.save(basRgvOpt);
        } catch (Exception ignore) {}
        if (result != null && result.IsSuccess) {
@@ -494,7 +494,7 @@
                    new Date(),
                    null
            );
            bean.insert(basRgvOpt);
            bean.save(basRgvOpt);
        } catch (Exception ignore) {}
        if (result != null && result.IsSuccess) {
@@ -579,7 +579,7 @@
                    new Date(),
                    null
            );
            bean.insert(basRgvOpt);
            bean.save(basRgvOpt);
        } catch (Exception ignore) {}
        if (result != null && result.IsSuccess) {