From c91135bbdc3451935cff3419992cb84c2d4f4a6a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 09:15:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
index d73416b..3f59abd 100644
--- a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
+++ b/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;
@@ -97,7 +99,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);
@@ -122,6 +124,11 @@
array[7] = (short) 0;
array[8] = (short) 0;
+ boolean clear = false;
+ if (taskMode == DualCrnTaskModeType.CONFIRM.id && crnStatus.getStatus() == 0) {
+
+ }
+
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
Object lock = redisUtil.get(RedisKeyType.DUAL_CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
if (lock == null) {
@@ -132,7 +139,7 @@
}
}
- 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);
@@ -161,6 +168,7 @@
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);
}
}
}
--
Gitblit v1.9.1