#

Junjie

14 小时以前 c1f7adc8ff0f533c161c4a374d64282b250e72b8

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

@@ -17,6 +17,8 @@
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.DualCrnTaskModeType;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.DualCrnCommand;
@@ -25,6 +27,7 @@

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

public class ZyDualCrnRealConnect implements ZyDualCrnConnectApi {

@@ -97,20 +100,33 @@
                crnStatus.setXDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 62));
                crnStatus.setYDuration((double) siemensNet.getByteTransform().TransSingle(result.Content, 66));

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

                        if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                    int hasData = 0;
                    if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                        hasData = 1;
                        if (crnStatus.getTaskReceive() == 1) {
                            HashMap<String, Object> map = new HashMap<>();
                            map.put("taskNo", taskNo);
                            map.put("taskMode", taskMode);
                            map.put("sourcePosX", sourcePosX);
                            map.put("sourcePosY", sourcePosY);
                            map.put("sourcePosZ", sourcePosZ);
                            map.put("destinationPosX", destinationPosX);
                            map.put("destinationPosY", destinationPosY);
                            map.put("destinationPosZ", destinationPosZ);
                            map.put("confirm", confirm);

                            short[] array = new short[9];
                            array[0] = (short) 0;
                            array[1] = (short) 0;
@@ -122,29 +138,57 @@
                            array[7] = (short) 0;
                            array[8] = (short) 0;

                            RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
                            Object lock = redisUtil.get(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
                            if (lock == null) {
                                OperateResult taskClearResult = siemensNet.Write("DB100.0", array);
                            boolean clear = false;
                            if (taskMode == DualCrnTaskModeType.CONFIRM.id) {
//                                if (crnStatus.getStatus() == 0) {
//                                    clear = true;
//                                }
                                clear = true;
                            } else {
                                clear = true;
                            }

                            if (clear) {
                                RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
                                Object lock = redisUtil.get(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
                                if (lock == null) {
                                    OperateResult taskClearResult = siemensNet.Write("DB100.0", array);
                                    redisUtil.set(RedisKeyType.CLEAR_DUAL_CRN_TASK_LIMIT.key + deviceConfig.getDeviceNo(), "lock", 3);
                                    News.info("双工位堆垛机:{}号{}工位命令区域清空，原始数据:{}", deviceConfig.getDeviceNo(), 1, JSON.toJSONString(map));
                                }
                            }
                        }
                    }
                    crnStatus.setTaskSend(hasData);
                }

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

                        if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                    int hasData = 0;
                    if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                        hasData = 1;
                        if (crnStatus.getTaskReceiveTwo() == 1) {
                            HashMap<String, Object> map = new HashMap<>();
                            map.put("taskNo", taskNo);
                            map.put("taskMode", taskMode);
                            map.put("sourcePosX", sourcePosX);
                            map.put("sourcePosY", sourcePosY);
                            map.put("sourcePosZ", sourcePosZ);
                            map.put("destinationPosX", destinationPosX);
                            map.put("destinationPosY", destinationPosY);
                            map.put("destinationPosZ", destinationPosZ);
                            map.put("confirm", confirm);

                            short[] array = new short[9];
                            array[0] = (short) 0;
                            array[1] = (short) 0;
@@ -156,13 +200,28 @@
                            array[7] = (short) 0;
                            array[8] = (short) 0;

                            RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
                            Object lock = redisUtil.get(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
                            if (lock == null) {
                                OperateResult taskClearResult = siemensNet.Write("DB100.18", array);
                            boolean clear = false;
                            if (taskMode == DualCrnTaskModeType.CONFIRM.id) {
//                                if (crnStatus.getStatusTwo() == 0) {
//                                    clear = true;
//                                }
                                clear = true;
                            } else {
                                clear = true;
                            }

                            if (clear) {
                                RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
                                Object lock = redisUtil.get(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
                                if (lock == null) {
                                    OperateResult taskClearResult = siemensNet.Write("DB100.18", array);
                                    redisUtil.set(RedisKeyType.CLEAR_DUAL_CRN_TASK_LIMIT.key + deviceConfig.getDeviceNo(), "lock", 3);
                                    News.info("双工位堆垛机:{}号{}工位命令区域清空，原始数据:{}", deviceConfig.getDeviceNo(), 2, JSON.toJSONString(map));
                                }
                            }
                        }
                    }
                    crnStatus.setTaskSendTwo(hasData);
                }

                return crnStatus;
@@ -181,7 +240,7 @@
    @Override
    public CommandResponse sendCommand(DualCrnCommand command) {
        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
        redisUtil.set(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 5);
        redisUtil.set(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 10);
        CommandResponse response = new CommandResponse(false);
         try {
             if (null == command) {
@@ -260,6 +319,7 @@
                 OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), command.getCrnNo(), JSON.toJSON(command)));
                 response.setResult(true);
                 response.setMessage("命令下发成功");
                 redisUtil.set(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 5);
             } else {
                 News.error("双工位堆垛机写入堆垛机plc数据失败 ===>> [id:{}]", command.getCrnNo());
                 OutputQueue.CRN.offer(MessageFormat.format("【{0}】写入堆垛机plc数据失败 ===>> [id:{1}]", DateUtils.convert(new Date()), command.getCrnNo()));