#

Junjie

昨天 b1684ab5e4538641c9a13520a3236013492c334c

 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,7 +100,7 @@
                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) {
                if (crnStatus.getTaskReceive() == 1) {
                    OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.0", (short) 18);
                    if (taskResult.IsSuccess) {
                        short taskNo = siemensNet.getByteTransform().TransInt16(taskResult.Content, 0);
@@ -109,6 +112,16 @@
                        short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 12);
                        short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 14);
                        short confirm = siemensNet.getByteTransform().TransInt16(taskResult.Content, 16);
                        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);

                        if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                            short[] array = new short[9];
@@ -122,17 +135,30 @@
                            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);
                                redisUtil.set(RedisKeyType.CLEAR_DUAL_CRN_TASK_LIMIT.key + deviceConfig.getDeviceNo(), "lock", 3);
                            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));
                                }
                            }
                        }
                    }
                }

                if ((crnStatus.getStatusTwo() == 0 || crnStatus.getStatusTwo() == 20) && crnStatus.getTaskReceiveTwo() == 0) {
                if (crnStatus.getTaskReceiveTwo() == 1) {
                    OperateResultExOne<byte[]> taskResult = siemensNet.Read("DB100.18", (short) 18);
                    if (taskResult.IsSuccess) {
                        short taskNo = siemensNet.getByteTransform().TransInt16(taskResult.Content, 0);
@@ -144,6 +170,16 @@
                        short destinationPosY = siemensNet.getByteTransform().TransInt16(taskResult.Content, 12);
                        short destinationPosZ = siemensNet.getByteTransform().TransInt16(taskResult.Content, 14);
                        short confirm = siemensNet.getByteTransform().TransInt16(taskResult.Content, 16);
                        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);

                        if(taskNo != 0 || taskMode != 0 || sourcePosX != 0 || sourcePosY != 0 || sourcePosZ != 0 || destinationPosX != 0 || destinationPosY != 0 || destinationPosZ != 0 || confirm != 0) {
                            short[] array = new short[9];
@@ -157,10 +193,24 @@
                            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));
                                }
                            }
                        }
                    }