#

ytfl

2025-08-15 dafbc5b30eb90edd1c87e4ce57aaf61045e41a7b

 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;

/**
@@ -205,6 +208,22 @@
                    }
                }

                if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 5) {
                    //采集时间超过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);
@@ -278,7 +297,38 @@
//        array[9] = command.getSourceStaNo();
//        array[10] = command.getDestinationStaNo();
        array[9] = command.getCommand();
        OperateResult result = siemensNet.Write("DB100.0", array);

        OperateResult result = null;
        int idx = 0;
        do {
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
            if (resultRead.IsSuccess) {
                if (command.getAckFinish() == 0) {
                    short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
                    short taskMode = siemensNet.getByteTransform().TransInt16(resultRead.Content, 4);
                    short sourcePosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 6);
                    short sourcePosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 8);
                    short sourcePosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 10);
                    short destinationPosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 12);
                    short destinationPosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 14);
                    short destinationPosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 16);
                    if(taskNo == 0 || taskMode == 0 || sourcePosX == 0 || sourcePosY == 0 || sourcePosZ == 0 || destinationPosX == 0 || destinationPosY == 0 || destinationPosZ == 0) {
                        result = siemensNet.Write("DB100.0", array);
                    }else {
                        break;
                    }
                }else {
                    short ackFinish = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
                    if(ackFinish != command.getAckFinish()) {
                        result = siemensNet.Write("DB100.0", array);
                    }else {
                        break;
                    }
                }
            }
            idx++;
            Thread.sleep(500L);
        } while (idx < 5);

        if (command.getAckFinish() == 0) {
            short commandFinish = 1;
@@ -298,6 +348,7 @@
            } while (i < 5);
        }

        this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
        try {
            // 日志记录
            BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
@@ -333,7 +384,6 @@
            return false;
        }
    }


    @Override
    public void close() {