From 713e7cec14fc6ba8220721aae7c01f29ed4e6747 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 15 三月 2026 18:04:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java | 94 +++++++++++++++++++++-------------------------
1 files changed, 43 insertions(+), 51 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 88a3c8f..893f288 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnV2RealConnect.java
@@ -143,17 +143,21 @@
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;
+ OperateResult result = siemensNet.Write("DB100.0", (short) 0);
+ if (result.IsSuccess) {
+ 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++;
}
+ writeAck++;
+ Thread.sleep(200);
} while (writeAck < 5);
if (!commandResult) {
@@ -162,7 +166,7 @@
}
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,39 +176,35 @@
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;
+ OperateResult result = siemensNet.Write("DB100.0", array);
+ if (result.IsSuccess) {
+ 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 {
+ commandDataResult = true;
+ break;
+ }
}
}
idx++;
- Thread.sleep(500);
+ Thread.sleep(200);
} while (idx < 5);
- if(!contentFlag) {
- News.error("鍫嗗灈鏈哄啓鍏ヤ换鍔℃暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
- response.setMessage("鍫嗗灈鏈哄啓鍏ヤ换鍔℃暟鎹け璐�");
+ if (!commandDataResult) {
+ response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "鍫嗗灈鏈哄啓鍏ヤ换鍔℃暟鎹け璐�");
return response;
}
@@ -217,7 +217,7 @@
if (resultRead.IsSuccess) {
short confirm = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
if(confirm == 0) {
- confirmResult = siemensNet.Write("DB100.18", (short) 1);
+ Thread.sleep(500);
}else {
confirmFlag = true;
break;
@@ -225,7 +225,7 @@
}
}
confirmIdx++;
- Thread.sleep(500);
+ Thread.sleep(200);
} while (confirmIdx < 5);
if(!confirmFlag) {
@@ -234,19 +234,11 @@
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", 5);
- } 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();
--
Gitblit v1.9.1