#

ytfl

昨天 f4603a10d8519827608636c5e7980b2d6d0be8e3

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

@@ -10,8 +10,10 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.DeviceDataLogService;
import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -25,6 +27,7 @@
import lombok.extern.slf4j.Slf4j;

import java.text.MessageFormat;
import java.util.Base64;
import java.util.Date;

/**
@@ -200,11 +203,36 @@
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setAckFinish((short)1);
                        if (write(crnCommand)) {
                            log.info(crnProtocol.getCrnNo()+"号堆垛机任务等待wcs确认，当前状态"+crnProtocol.getStatusType());
                            resetFlag = false;
                        }
                    }
                }

                if (crnProtocol.getAlarm() > 0) {
                    crnProtocol.setLastCommandTime(-1L);
                }

                if (crnProtocol.getAlarm() == 0 && crnProtocol.getLastCommandTime() == -1) {
                    crnProtocol.setLastCommandTime(System.currentTimeMillis());
                }

                if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 1) {
                    //采集时间超过5s，保存一次数据记录
                    //保存数据记录
                    DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                    DeviceDataLog deviceDataLog = new DeviceDataLog();
                    deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
                    deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
                    deviceDataLog.setType("crn");
                    deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
                    deviceDataLog.setCreateTime(new Date());
                    deviceDataLogService.insert(deviceDataLog);

                    //更新采集时间
                    crnProtocol.setDeviceDataLog(System.currentTimeMillis());
                }

                try {
                    // 根据实时信息更新数据库
                    BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);