#

zjj

2024-05-23 2a35d8deefb89c4b463fdbafe79f2c7bd294621d

 src/main/java/com/zy/core/thread/SiemensRgvThread.java

@@ -9,8 +9,10 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasRgv;

import com.zy.asrs.service.BasRgvErrService;
import com.zy.asrs.service.BasRgvService;

import com.zy.common.utils.News;
import com.zy.core.RgvThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -136,7 +138,7 @@
        rgvProtocol.setStatus((short)-1);
        rgvProtocol.setTaskNo1((short)0);
        rgvProtocol.setStatus1((short)-1);
        rgvProtocol.setLoaded1((short)0);
        rgvProtocol.setLoaded1(false);
        rgvProtocol.setWalkPos((short)0);
        rgvProtocol.setRgvPos(0);
//        rgvProtocol.setTaskNo2((short)0);
@@ -146,6 +148,8 @@
        rgvProtocol.setxSpeed((short) 0);
        rgvProtocol.setxDistance((short) 0);
        rgvProtocol.setxDuration((short) 0);
        rgvProtocol.setSouSta((short)0);
        rgvProtocol.setEndSta((short)0);
    }

    @Override
@@ -186,10 +190,17 @@
                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                rgvProtocol.setSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                rgvProtocol.setRgvPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 14));
//                rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransBool(result.Content,18));


                OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
                if (rgvProtocol.getAlarm() > 0 ){
                    BasRgvErrService basRgvErrService = SpringUtils.getBean(BasRgvErrService.class);
                    News.error("RGV 异常 ===>> [id:{}] [ip:{}],报警代码:{},报警文本:{}",slave.getId(), slave.getIp(),rgvProtocol.getAlarm(),basRgvErrService.selectById(rgvProtocol.getAlarm()).getErrName());
                }else {
                    News.info("RGV状态正常==>[id:{}]",slave.getId());
                }

                // 工位1复位信号
//                if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)