#

cpT

8 天以前 a01ad047b6b51da1c1d93a38a1bbf993d8709583

 src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java

@@ -6,9 +6,12 @@
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.network.api.ZyCrnConnectApi;
@@ -51,7 +54,7 @@
    @Override
    public ZyCrnStatusEntity getStatus() {
        try {
            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 62);
            if (result.IsSuccess) {
                ZyCrnStatusEntity crnStatus = new ZyCrnStatusEntity();
                crnStatus.setCrnNo(deviceConfig.getDeviceNo());
@@ -74,6 +77,42 @@
                crnStatus.setYDistance((double) siemensNet.getByteTransform().TransSingle(result.Content, 44));
                crnStatus.setXDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 48));
                crnStatus.setYDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 52));
                crnStatus.setTaskReceive((int) siemensNet.getByteTransform().TransInt16(result.Content, 60));

                if (crnStatus.getStatus() == 0 && crnStatus.getTaskReceive() == 0) {
                    OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.0", (short) 20);
                    if (taskResult.IsSuccess) {
                        short taskNo = siemensNet.getByteTransform().TransInt16(taskResult.Content, 2);
                        short taskMode = siemensNet.getByteTransform().TransInt16(taskResult.Content, 4);
                        short sourcePosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 6);
                        short sourcePosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 8);
                        short sourcePosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 10);
                        short destinationPosX = siemensNet.getByteTransform().TransInt16(taskResult.Content, 12);
                        short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 14);
                        short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 16);
                        short confirm = siemensNet.getByteTransform().TransInt16(taskResult.Content, 18);

                        if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                            short[] array = new short[10];
                            array[0] = (short) 0;
                            array[1] = (short) 0;
                            array[2] = (short) 0;
                            array[3] = (short) 0;
                            array[4] = (short) 0;
                            array[5] = (short) 0;
                            array[6] = (short) 0;
                            array[7] = (short) 0;
                            array[8] = (short) 0;
                            array[9] = (short) 0;

                            RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
                            Object lock = redisUtil.get(RedisKeyType.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
                            if (lock == null) {
                                OperateResult taskClearResult = siemensNet.Write("DB100.0", array);
                            }
                        }
                    }
                }

                return crnStatus;
            } else {
@@ -90,6 +129,8 @@

    @Override
    public CommandResponse sendCommand(CrnCommand command) {
        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
        redisUtil.set(RedisKeyType.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 5);
        CommandResponse response = new CommandResponse(false);
        try {
            if (null == command) {