From 1c8455e647bfb059d52788afaa845c52e7d6213f Mon Sep 17 00:00:00 2001
From: Administrator <XS@163.COM>
Date: 星期三, 06 五月 2026 19:25:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java | 218 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 135 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
index 6904c7f..2809c5f 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
@@ -11,6 +11,7 @@
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.RedisKeyType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.CrnCommand;
@@ -109,7 +110,7 @@
Object lock = redisUtil.get(RedisKeyType.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo());
if (lock == null) {
OperateResult taskClearResult = siemensNet.Write("DB100.0", array);
- redisUtil.set(RedisKeyType.CLEAR_CRN_TASK_LIMIT.key + deviceConfig.getDeviceNo(), "lock", 1);
+ redisUtil.set(RedisKeyType.CLEAR_CRN_TASK_LIMIT.key + deviceConfig.getDeviceNo(), "lock", 3);
}
}
}
@@ -131,7 +132,7 @@
@Override
public CommandResponse sendCommand(CrnCommand command) {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- redisUtil.set(RedisKeyType.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 2);
+ redisUtil.set(RedisKeyType.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 10);
CommandResponse response = new CommandResponse(false);
try {
if (null == command) {
@@ -140,29 +141,15 @@
return response;
}
- int writeAck = 0;
- boolean commandResult = false;
- do {
- OperateResultExOne<byte[]> commandReadResult = siemensNet.Read("DB100.0", (short) 2);
- if (commandReadResult.IsSuccess) {
- short commandRead = siemensNet.getByteTransform().TransInt16(commandReadResult.Content, 0);
- if (commandRead == 1) {
- Thread.sleep(500);
- }else {
- commandResult = true;
- break;
- }
- writeAck++;
- }
- } while (writeAck < 5);
-
- if (!commandResult) {
- response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "浠诲姟鐘舵�佷綅寮傚父");
+ boolean commandAreaClearResult = clearCommandArea();
+ if (!commandAreaClearResult) {
+ News.error("鍫嗗灈鏈哄懡浠ゅ尯娓呯┖澶辫触 ===>> [id:{}]", command.getCrnNo());
+ response.setMessage("鍫嗗灈鏈哄懡浠ゅ尯娓呯┖澶辫触");
return response;
}
short[] array = new short[9];
- array[0] = (short) 0;
+ array[0] = command.getAckFinish().shortValue();
array[1] = command.getTaskNo().shortValue();
array[2] = command.getTaskMode().shortValue();
array[3] = command.getSourcePosX().shortValue();
@@ -172,85 +159,150 @@
array[7] = command.getDestinationPosY().shortValue();
array[8] = command.getDestinationPosZ().shortValue();
- OperateResult result = siemensNet.Write("DB100.0", array);
- if (!result.IsSuccess) {
- response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "浠诲姟鐘舵�佷綅寮傚父");
- return response;
- }
-
int idx = 0;
- boolean contentFlag = false;
+ boolean commandDataResult = false;
do {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
- if (resultRead.IsSuccess) {
- short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
- short taskMode = siemensNet.getByteTransform().TransInt16(resultRead.Content, 4);
- short sourcePosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 6);
- short sourcePosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 8);
- short sourcePosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 10);
- short destinationPosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 12);
- short destinationPosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 14);
- short destinationPosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 16);
- if (taskNo == 0 || taskMode == 0 || sourcePosX == 0 || sourcePosY == 0 || sourcePosZ == 0 || destinationPosX == 0 || destinationPosY == 0 || destinationPosZ == 0) {
- result = siemensNet.Write("DB100.0", array);
- } else {
- contentFlag = true;
- break;
- }
- }
- idx++;
- Thread.sleep(500);
- } while (idx < 5);
-
- if(!contentFlag) {
- News.error("鍫嗗灈鏈哄啓鍏ヤ换鍔℃暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
- response.setMessage("鍫嗗灈鏈哄啓鍏ヤ换鍔℃暟鎹け璐�");
- return response;
- }
-
- int confirmIdx = 0;
- boolean confirmFlag = false;
- do {
- OperateResult confirmResult = siemensNet.Write("DB100.18", (short) 1);
- if (!confirmResult.IsSuccess) {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.18", (short) 2);
+ OperateResult result = siemensNet.Write("DB100.0", array);
+ if (result.IsSuccess) {
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
if (resultRead.IsSuccess) {
- short confirm = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
- if(confirm == 0) {
- confirmResult = siemensNet.Write("DB100.18", (short) 1);
- }else {
- confirmFlag = true;
+ short taskNo = siemensNet.getByteTransform().TransInt16(resultRead.Content, 2);
+ short taskMode = siemensNet.getByteTransform().TransInt16(resultRead.Content, 4);
+ short sourcePosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 6);
+ short sourcePosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 8);
+ short sourcePosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 10);
+ short destinationPosX = siemensNet.getByteTransform().TransInt16(resultRead.Content, 12);
+ short destinationPosY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 14);
+ short destinationPosZ = siemensNet.getByteTransform().TransInt16(resultRead.Content, 16);
+ if (taskNo != command.getTaskNo().shortValue()
+ || taskMode != command.getTaskMode().shortValue()
+ || sourcePosX != command.getSourcePosX().shortValue()
+ || sourcePosY != command.getSourcePosY().shortValue()
+ || sourcePosZ != command.getSourcePosZ().shortValue()
+ || destinationPosX != command.getDestinationPosX().shortValue()
+ || destinationPosY != command.getDestinationPosY().shortValue()
+ || destinationPosZ != command.getDestinationPosZ().shortValue()) {
+ result = siemensNet.Write("DB100.0", array);
+ } else {
+ commandDataResult = true;
break;
}
}
}
- confirmIdx++;
- Thread.sleep(500);
- } while (confirmIdx < 5);
+ idx++;
+ Thread.sleep(200);
+ } while (idx < 5);
- if(!confirmFlag) {
+ if (!commandDataResult) {
+ response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "鍫嗗灈鏈哄啓鍏ヤ换鍔℃暟鎹け璐�");
+ return response;
+ }
+
+ int writeConfirmIdx = 0;
+ boolean commandConfirmResult = false;
+ do {
+ OperateResult result = siemensNet.Write("DB100.18", (short) 1);
+ if (result.IsSuccess) {
+ OperateResultExOne<byte[]> commandReadResult = siemensNet.Read("DB100.18", (short) 2);
+ if (commandReadResult.IsSuccess) {
+ short commandRead = siemensNet.getByteTransform().TransInt16(commandReadResult.Content, 0);
+ if (commandRead == 0) {
+ Thread.sleep(500);
+ }else {
+ commandConfirmResult = true;
+ break;
+ }
+ }
+ }
+ writeConfirmIdx++;
+ Thread.sleep(200);
+ } while (writeConfirmIdx < 5);
+
+ if (!commandConfirmResult) {
News.error("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
response.setMessage("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐�");
return response;
}
- if (result != null && result.IsSuccess) {
- News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), JSON.toJSON(command));
- 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.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 1);
- } else {
- News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}]", command.getCrnNo());
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}]", DateUtils.convert(new Date()), command.getCrnNo()));
- response.setResult(false);
- response.setMessage("鍛戒护涓嬪彂澶辫触");
- }
-
+ News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), JSON.toJSON(command));
+ 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.CRN_SEND_COMMAND_LOCK.key + deviceConfig.getDeviceNo(), "lock", 5);
return response;
} catch (Exception e) {
e.printStackTrace();
}
return response;
}
+
+ private boolean clearCommandArea() throws InterruptedException {
+ boolean confirmClearResult = clearCommandConfirm();
+ if (!confirmClearResult) {
+ return false;
+ }
+
+ short[] array = new short[10];
+
+ int clearIdx = 0;
+ do {
+ OperateResult result = siemensNet.Write("DB100.0", array);
+ if (result.IsSuccess) {
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
+ if (resultRead.IsSuccess && isCommandAreaEmpty(resultRead.Content)) {
+ return true;
+ }
+ }
+
+ clearIdx++;
+ Thread.sleep(200);
+ } while (clearIdx < 5);
+
+ return false;
+ }
+
+ private boolean clearCommandConfirm() throws InterruptedException {
+ int clearConfirmIdx = 0;
+ do {
+ OperateResult result = siemensNet.Write("DB100.18", (short) 0);
+ if (result.IsSuccess) {
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.18", (short) 2);
+ if (resultRead.IsSuccess) {
+ short confirm = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
+ if (confirm == 0) {
+ return true;
+ }
+ }
+ }
+
+ clearConfirmIdx++;
+ Thread.sleep(200);
+ } while (clearConfirmIdx < 5);
+
+ return false;
+ }
+
+ private boolean isCommandAreaEmpty(byte[] content) {
+ short ackFinish = siemensNet.getByteTransform().TransInt16(content, 0);
+ short taskNo = siemensNet.getByteTransform().TransInt16(content, 2);
+ short taskMode = siemensNet.getByteTransform().TransInt16(content, 4);
+ short sourcePosX = siemensNet.getByteTransform().TransInt16(content, 6);
+ short sourcePosY = siemensNet.getByteTransform().TransInt16(content, 8);
+ short sourcePosZ = siemensNet.getByteTransform().TransInt16(content, 10);
+ short destinationPosX = siemensNet.getByteTransform().TransInt16(content, 12);
+ short destinationPosY = siemensNet.getByteTransform().TransInt16(content, 14);
+ short destinationPosZ = siemensNet.getByteTransform().TransInt16(content, 16);
+ short confirm = siemensNet.getByteTransform().TransInt16(content, 18);
+
+ return ackFinish == 0
+ && taskNo == 0
+ && taskMode == 0
+ && sourcePosX == 0
+ && sourcePosY == 0
+ && sourcePosZ == 0
+ && destinationPosX == 0
+ && destinationPosY == 0
+ && destinationPosZ == 0
+ && confirm == 0;
+ }
}
--
Gitblit v1.9.1