From b256cdb895234a3e68da88310325b5eb38600777 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期一, 16 三月 2026 10:27:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyStationRealConnect.java | 66 +++++++--------
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 125 +++++++++++++++++-------------
2 files changed, 101 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index 0568d82..6608a6e 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -108,23 +108,32 @@
}
int writeAck = 0;
+ boolean commandResult = false;
do {
- OperateResult resultAck = siemensNet.Write("DB100.0", (short) 0);
- if (resultAck.IsSuccess) {
- Thread.sleep(200);
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 2);
- short ack = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
- if (ack != 0) {
- writeAck++;
- } else {
- News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", command.getCrnNo(), "ack澶嶄綅瀹屾垚");
- 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++;
+ Thread.sleep(200);
} while (writeAck < 5);
+ if (!commandResult) {
+ response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "浠诲姟鐘舵�佷綅寮傚父");
+ 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();
@@ -134,62 +143,68 @@
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 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 {
- 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);
- OperateResult confirmResult = siemensNet.Write("DB100.18", (short) 1);
- if (!confirmResult.IsSuccess) {
+ 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("鍛戒护涓嬪彂鎴愬姛");
- } 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("鍛戒护涓嬪彂澶辫触");
- }
-
- if (!Cools.isEmpty(command.getLocNo())){
- OperateResult resultAck = siemensNet.Write("DB110." + command.getIndex() * 2, command.getValue());
- if (resultAck.IsSuccess) {
- News.info("搴撲綅鐧借壊鐏懡浠や笅鍙慬locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- } else {
- News.error("搴撲綅鐧借壊鐏懡浠や笅鍙戝け璐locNo:{}] >>>>> {}", command.getLocNo(), command.getValue());
- }
- }
-
+ 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("鍛戒护涓嬪彂鎴愬姛");
return response;
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
index fe83d45..1256513 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
@@ -184,56 +184,52 @@
@Override
public CommandResponse sendCommand(Integer deviceNo, StationCommand command) {
CommandResponse commandResponse = new CommandResponse(false);
- if (null == command) {
- commandResponse.setMessage("鍛戒护涓虹┖");
- return commandResponse;
- }
+ try {
+ if (null == command) {
+ commandResponse.setMessage("鍛戒护涓虹┖");
+ return commandResponse;
+ }
- int index = findIndex(command.getStationId());
- if (index < 0) {
- commandResponse.setMessage("绔欑偣涓嶅瓨鍦�");
- return commandResponse;
- }
+ int index = findIndex(command.getStationId());
+ if (index < 0) {
+ commandResponse.setMessage("绔欑偣涓嶅瓨鍦�");
+ return commandResponse;
+ }
- OperateResult write = null;
- OperateResult write1 = null;
- // 浠诲姟涓嬪彂娆℃暟
- int writeCount = 0;
- do {
+ boolean commandSendResult = false;
+ // 浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
// short[] data = new short[2];
// data[0] = command.getTaskNo();
// data[1] = command.getTargetStaNo().shortValue();
- write = siemensNet.Write("DB100." + index * 6, command.getTaskNo());
- write1 =siemensNet.Write("DB100." + (index * 6+4), command.getTargetStaNo().shortValue());
- if (write.IsSuccess&&write1.IsSuccess) {
- log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傜珯鐐圭紪鍙�={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", command.getStationId(), JSON.toJSON(command),
- writeCount);
- commandResponse.setResult(true);
- break;
- } else {
+ OperateResult write = siemensNet.Write("DB100." + index * 6, command.getTaskNo());
+ OperateResult write1 = siemensNet.Write("DB100." + (index * 6 + 4), command.getTargetStaNo().shortValue());
+ if (write.IsSuccess && write1.IsSuccess) {
+ commandSendResult = true;
+ break;
+ }
writeCount++;
+ Thread.sleep(300);
+ } while (writeCount < 5);
+
+ if(!commandSendResult) {
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傜珯鐐圭紪鍙�={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", command.getStationId(), JSON.toJSON(command),
writeCount);
- commandResponse.setResult(false);
+ commandResponse.setMessage("鍐欏叆鍛戒护澶辫触");
+ return commandResponse;
}
- } while (writeCount < 5);
- if (write == null) {
- commandResponse.setMessage("鍐欏叆鍛戒护澶辫触");
- return commandResponse;
- }
-
- if (!write.IsSuccess) {
- ZyStationStatusEntity staProtocol = findStatusEntity(command.getStationId());
- OutputQueue.DEVP.offer(MessageFormat.format("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傜珯鐐圭紪鍙�={1}锛岀珯鐐规暟鎹�={2}", command.getStationId(),
- JSON.toJSON(staProtocol)));
- News.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傜珯鐐圭紪鍙�={}锛岀珯鐐规暟鎹�={}", command.getStationId(), JSON.toJSON(staProtocol));
- } else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}",
DateUtils.convert(new Date()), command.getStationId(), JSON.toJSON(command)));
News.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", command.getStationId(),
JSON.toJSON(command));
+ commandResponse.setResult(true);
+ commandResponse.setMessage("鍛戒护涓嬪彂鎴愬姛");
+ return commandResponse;
+ } catch (Exception e) {
+ e.printStackTrace();
}
return commandResponse;
}
--
Gitblit v1.9.1