#

skyouc

15 小时以前 42ce8de4d9c1608cf9230a996d5887c24a86c1f6

#

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

@@ -125,15 +125,21 @@
                            array[8] = (short) 0;

                            boolean clear = false;
                            if (taskMode == DualCrnTaskModeType.CONFIRM.id && crnStatus.getStatus() == 0) {

                            if (taskMode == DualCrnTaskModeType.CONFIRM.id) {
                                if (crnStatus.getStatus() == 0) {
                                    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);
                                }
                            }
                        }
                    }
@@ -164,6 +170,16 @@
                            array[7] = (short) 0;
                            array[8] = (short) 0;

                            boolean clear = false;
                            if (taskMode == DualCrnTaskModeType.CONFIRM.id) {
                                if (crnStatus.getStatusTwo() == 0) {
                                    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) {
@@ -173,6 +189,7 @@
                        }
                    }
                }
                }

                return crnStatus;
            } else {