From b2e425f75547358843f3a39a827289cd4a29a476 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 11 二月 2026 10:54:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 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 3f59abd..344a2f3 100644
--- a/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyDualCrnRealConnect.java
@@ -27,6 +27,7 @@
import java.text.MessageFormat;
import java.util.Date;
+import java.util.HashMap;
public class ZyDualCrnRealConnect implements ZyDualCrnConnectApi {
@@ -111,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];
@@ -125,15 +136,22 @@
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;
}
- 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);
+ 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));
+ }
}
}
}
@@ -151,6 +169,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];
@@ -164,11 +192,23 @@
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);
- redisUtil.set(RedisKeyType.CLEAR_DUAL_CRN_TASK_LIMIT.key + deviceConfig.getDeviceNo(), "lock", 3);
+ 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) {
+ 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));
+ }
}
}
}
--
Gitblit v1.9.1